优化ugp接口

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java

@@ -283,8 +283,10 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
         }
         SuperviseRule superviseRule = superviseRuleService.getOne(new LambdaQueryWrapper<SuperviseRule>().eq(SuperviseRule::getAdminRegionCode,regionCode));
         List<Long> unitIds = new ArrayList<>();
-        unitIds.add(superviseRule.getSuperviseDeptId());
-        unitIds.add(superviseRule.getInspectionUnitId());
+        if(!ValidationUtil.isEmpty(superviseRule)) {
+            unitIds.add(superviseRule.getSuperviseDeptId());
+            unitIds.add(superviseRule.getInspectionUnitId());
+        }
         //新增企业审核任务信息
         taskService.saveOrUpdateTask(null, true, TaskTypeEnum.企业审核.getKey(), new Date(), model.getSequenceNbr(), TaskTypeEnum.企业审核.getKey(), unitIds);
         return this.updateById(company);

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/TaskServiceImpl.java

@@ -52,67 +52,69 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
      * @Param sequenceNbr 项目/问题处置的sequenceNbr
      * @return
      */
-    public void saveOrUpdateTask(String InitiationStatus, boolean status, String taskType, Date sendTime, Long sourceId, String type, List<Long> unitIds){
-        for(Long unitId: unitIds) {
-            Task task = new Task();
-            String title = "", taskStatus = "";
-            task.setTaskType(taskType);
-            if (!ValidationUtil.isEmpty(InitiationStatus)) {
-                title = ProjectInitiationEnum.getTaskNameMap.get(InitiationStatus);
-                taskStatus = ProjectInitiationEnum.getTaskStatusMap.get(InitiationStatus);
+    public void saveOrUpdateTask(String InitiationStatus, boolean status, String taskType, Date sendTime, Long sourceId, String type, List<Long> unitIds) {
+        if (!ValidationUtil.isEmpty(unitIds)) {
+            for (Long unitId : unitIds) {
+                Task task = new Task();
+                String title = "", taskStatus = "";
+                task.setTaskType(taskType);
+                if (!ValidationUtil.isEmpty(InitiationStatus)) {
+                    title = ProjectInitiationEnum.getTaskNameMap.get(InitiationStatus);
+                    taskStatus = ProjectInitiationEnum.getTaskStatusMap.get(InitiationStatus);
+                    if (ValidationUtil.isEmpty(title)) {
+                        //不是项目立项流程，是问题处置流程
+                        title = ProblemProcessEnum.getTaskNameMap.get(InitiationStatus);
+                        taskStatus = ProblemProcessEnum.getTaskStatusMap.get(InitiationStatus);
+                    }
+                }
+
                 if (ValidationUtil.isEmpty(title)) {
-                    //不是项目立项流程，是问题处置流程
-                    title = ProblemProcessEnum.getTaskNameMap.get(InitiationStatus);
-                    taskStatus = ProblemProcessEnum.getTaskStatusMap.get(InitiationStatus);
+                    //不是问题处置流程，企业注册任务
+                    title = CompanyExamineEnum.企业审核.getName();
+                    if (status) {
+                        taskStatus = CompanyExamineEnum.企业审核.getYes();
+                    } else {
+                        taskStatus = CompanyExamineEnum.企业审核.getNo();
+                    }
                 }
-            }
 
-            if (ValidationUtil.isEmpty(title)) {
-                //不是问题处置流程，企业注册任务
-                title = CompanyExamineEnum.企业审核.getName();
-                if (status) {
-                    taskStatus = CompanyExamineEnum.企业审核.getYes();
+                if (TaskTypeEnum.填报.getKey().equals(taskType)) {
+                    task.setTaskTypeLabel(TaskTypeEnum.填报.getName());
+                } else if (TaskTypeEnum.流程.getKey().equals(taskType)) {
+                    task.setTaskTypeLabel(TaskTypeEnum.流程.getName());
                 } else {
-                    taskStatus = CompanyExamineEnum.企业审核.getNo();
+                    task.setTaskTypeLabel(TaskTypeEnum.企业审核.getName());
                 }
-            }
 
-            if (TaskTypeEnum.填报.getKey().equals(taskType)) {
-                task.setTaskTypeLabel(TaskTypeEnum.填报.getName());
-            } else if (TaskTypeEnum.流程.getKey().equals(taskType)) {
-                task.setTaskTypeLabel(TaskTypeEnum.流程.getName());
-            } else {
-                task.setTaskTypeLabel(TaskTypeEnum.企业审核.getName());
-            }
+                task.setUnitId(unitId);
+                task.setTitle(title);
+                task.setStatus(status);
+                task.setSendTime(sendTime);
+                task.setSourceId(sourceId);
+                task.setType(type);
 
-            task.setUnitId(unitId);
-            task.setTitle(title);
-            task.setStatus(status);
-            task.setSendTime(sendTime);
-            task.setSourceId(sourceId);
-            task.setType(type);
-
-            if (status) {
-                //更新任务表 已办
-                LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(Task::getType, type)
-                        .eq(Task::getStatus, false)
-                        .eq(Task::getTitle, InitiationStatus)
-                        .eq(Task::getSourceId, sourceId)
-                        .eq(Task::getUnitId, unitId);
-                task = this.getOne(wrapper);
-                if(ValidationUtil.isEmpty(task)){
-                    return;
+                if (status) {
+                    //更新任务表 已办
+                    LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(Task::getType, type)
+                            .eq(Task::getStatus, false)
+                            .eq(Task::getTitle, InitiationStatus)
+                            .eq(Task::getSourceId, sourceId)
+                            .eq(Task::getUnitId, unitId);
+                    task = this.getOne(wrapper);
+                    if (ValidationUtil.isEmpty(task)) {
+                        return;
+                    }
+                    task.setStatusLabel(TaskTypeEnum.已办.getName());
+                    taskStatus = "已完成";
+                } else {
+                    //添加任务表 待办
+                    task.setStatusLabel(TaskTypeEnum.待办.getName());
                 }
-                task.setStatusLabel(TaskTypeEnum.已办.getName());
-                taskStatus = "已完成";
-            } else {
-                //添加任务表 待办
-                task.setStatusLabel(TaskTypeEnum.待办.getName());
-            }
-            task.setContent(title + ", " + taskStatus);
+                task.setContent(title + ", " + taskStatus);
 
-            this.saveOrUpdate(task);
+                this.saveOrUpdate(task);
+            }
         }
     }
 }