bug

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

@@ -275,6 +275,8 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             projectInitiation.setTaskName(taskName);
             projectInitiation.setType(ProcessTypeEnum.项目立项.getType());
 
+
+
             //项目的管辖区域
             String regionCode = project.getInstallRegionCode();
             LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
@@ -595,6 +597,12 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Project::getInstanceId,instanceId);
         Project project = projectService.getOne(wrapper);
+
+        if(ProjectInitiationEnum.建设负责人指定项目负责人.getName().equals(InitiationStatus)) {
+            project.setChargePerson(orgService.getReginParams().getBusinessInfo().getUserName());
+            project.setChargePersonId(orgService.getReginParams().getBusinessInfo().getUserSequenceNbr());
+        }
+
         String taskName = getFlowTaskName(project, status, taskType, sendTime, sourceId, type, unitIds,extendId, instanceId);
         boolean bool = true;
         if (( project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName()) || project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) && "流程结束！".equals(taskName)){

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

@@ -562,13 +562,13 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
        ArrayList<ProjectDto> list = Lists.newArrayList();
        for(ProjectDto projectDto:projects){
            if(OrgEnum.安装单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
-               if(projectDto.getStatus().contains("/")) {
-                   projectDto.setStatus(StringUtils.substringAfter(projectDto.getStatus(), "/"));
+               if(projectDto.getExamineProjectState().contains("/")) {
+                   projectDto.setExamineProjectState(StringUtils.substringAfter(projectDto.getExamineProjectState(), "/"));
                }
 
            } else if(OrgEnum.设计单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
-               if(projectDto.getStatus().contains("/")) {
-                   projectDto.setStatus(StringUtils.substringBefore(projectDto.getStatus(), "/"));
+               if(projectDto.getExamineProjectState().contains("/")) {
+                   projectDto.setExamineProjectState(StringUtils.substringBefore(projectDto.getExamineProjectState(), "/"));
                }
            }
            if (ProjectInitiationEnum.监检员分配.getName().equals(projectDto.getStatus())) {