Procházet zdrojové kódy

1、楼宇名称为空
2、任务创建人

sunyize před 2 roky
rodič
revize
1dd3a686b3

+ 7 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckTaskController.java

@@ -100,6 +100,13 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
         queryWrapper.orderByDesc("create_time");
         Page<SmsCheckTask> page = new Page<>(pageNo, pageSize);
         IPage<SmsCheckTask> pageList = taskService.page(page, queryWrapper);
+        List<SysUser> list = sysUserService.list();
+        Map<String, SysUser> userMap = list.stream().collect(Collectors.toMap(v -> v.getWorkNo(), Function.identity(), (o, n) -> o));
+
+        List<SmsCheckTask> records = pageList.getRecords();
+        for (SmsCheckTask record : records) {
+            record.setCreateBy(userMap.get(record.getCreateBy()).getRealname());
+        }
 
         // TODO
 //        List<SmsCheckTask> records = pageList.getRecords();

+ 6 - 1
tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/ImportCustomerDataTask.java

@@ -164,7 +164,12 @@ public class ImportCustomerDataTask implements Callable {
                     listErro.add(infoVo);
                     // TODO 重复处理,放校验里面?
 //				 return Result.error("客户[" + info.getCustomerNo() + "]已存在!");
-                } else {
+                } else if (byId.getType() == 4 && StringUtils.isBlank(infoVo.getFloorName())) {
+                    infoVo.setResult("0");
+                    compareNum.getAndIncrement();
+                    infoVo.setErrorMsg("楼宇名称为空");
+                    listErro.add(infoVo);
+                }else {
                     //customerCount++;
                     customerInfoService.save(info);
                     infoVo.setResult("1");