资料上传接口修改

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

@@ -76,22 +76,34 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
     }
 
     private void getProjectState(ProjectDto project) {
-        String state = "待审核",insDep = "",insPerson = "";
+        String state = "",insDep = "",insPerson = "";
         LambdaQueryWrapper<ProjectInitiation> lambdaQueryWrap = new LambdaQueryWrapper<>();
         lambdaQueryWrap.eq(ProjectInitiation::getInstanceId,project.getInstanceId())
-                .eq(ProjectInitiation ::getTaskName, ProjectInitiationEnum.平台审核.getName())
+//                .eq(ProjectInitiation ::getTaskName, ProjectInitiationEnum.平台审核.getName())
                 .orderByDesc(ProjectInitiation::getSequenceNbr);
 
         List<ProjectInitiation> projectInitiationList = projectInitiationService.list(lambdaQueryWrap);
         if(!ValidationUtil.isEmpty(projectInitiationList)){
             ProjectInitiation projectInitiation = projectInitiationList.iterator().next();
             JSONObject jsonObject = JSON.parseObject(projectInitiation.getContext());
-            if(!ValidationUtil.isEmpty(jsonObject)){
-                state = jsonObject.getString(XJConstant.PROCESS_PROJECT_STATE);
-                insDep = jsonObject.getString(XJConstant.INS_DEP);
-                insPerson = jsonObject.getString(XJConstant.INS_PRESON);
+            if(ProjectInitiationEnum.平台审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus()) || ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检科室分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员审核.getName().equals(project.getStatus())){
+                if(!ValidationUtil.isEmpty(jsonObject)){
+                    state = jsonObject.getString(XJConstant.PROCESS_PROJECT_STATE);
+                    insDep = jsonObject.getString(XJConstant.INS_DEP);
+                    insPerson = jsonObject.getString(XJConstant.INS_PRESON);
+                }
             }
         }
+        if(ProjectInitiationEnum.平台审核.getName().equals(project.getStatus())){
+            if(ValidationUtil.isEmpty(state)){
+                state = "待审核";
+            }
+        }else {
+            if(ValidationUtil.isEmpty(state)){
+                state = "待上传资料";
+            }
+        }
+
         project.setExamineProjectState(state);
         project.setInsDep(insDep);
         project.setInsPerson(insPerson);
@@ -166,13 +178,15 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
             attachment.setInfo(JSON.toJSONString(subForm));
             attachmentService.updateById(attachment);
         }
-
+        if(ValidationUtil.isEmpty(jsonObject.getString(XJConstant.PROCESS_PROJECT_STATE))){
+            jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"资料已上传");
+        }
         Project project = this.getById(sequenceNbr);
         ProjectDto projectDto = new ProjectDto();
         BeanUtils.copyProperties(project,projectDto);
         projectDto.setInsDep(jsonObject.getString("insDep"));
         projectDto.setInsDep(jsonObject.getString("insPerson"));
-        projectDto.setProcessProjectState(jsonObject.getString("processProjectState"));
+        projectDto.setProcessProjectState(jsonObject.getString(XJConstant.PROCESS_PROJECT_STATE));
         boolean design=false,install=false;
         for(Object object:subForm){
             JSONObject jo = JSON.parseObject(JSON.toJSONString(object));
@@ -188,7 +202,6 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         if(design && install){
             projectInitiationService.execute(project.getInstanceId(),projectDto,"1");
         }
-        this.updateById(project);
         return "ok";
     }