修改流程

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

@@ -565,7 +565,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         Project project = projectService.getOne(wrapper);
         String taskName = getFlowTaskName(instanceId);
         boolean bool = true;
-        if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus()) && "流程结束！".equals(taskName)){
+        if ((ProjectInitiationEnum.提交资料.getName().equals(project.getStatus()) || project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName()) || project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) && "流程结束！".equals(taskName)){
             bool = false;
             if(OrgEnum.安装单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
                 taskName = ProjectInitiationEnum.设计开工资料提交.getName();

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

@@ -504,10 +504,10 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
     @BusinessIdentify
     @Override
     public IPage<ProjectDto> queryProjectPage(String current,String size, Project project) {
-        if (!ObjectUtils.isEmpty(project.getInstallRegionCode())){
-            Map<String, String> info = getInfo("", "", Long.parseLong(project.getInstallRegionCode()));
-            project.setInstallRegionCode(info.get("regionCode"));
-        }
+//        if (!ObjectUtils.isEmpty(project.getInstallRegionCode())){
+//            Map<String, String> info = getInfo("", "", Long.parseLong(project.getInstallRegionCode()));
+//            project.setInstallRegionCode(info.get("regionCode"));
+//        }
         IPage<ProjectDto> page = new Page<>();
         page.setCurrent(Long.parseLong(current));
         page.setSize(Long.parseLong(size));
@@ -534,7 +534,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         if(!ValidationUtil.isEmpty(codes)){
             page = projectMapper.queryProjectPage(page, project, roleName,companyId,codes);
         }
-        List<ProjectDto> projects = page.getRecords();
+                      List<ProjectDto> projects = page.getRecords();
         for (ProjectDto projectDto : projects) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             if (!ObjectUtils.isEmpty(projectDto.getStartDate())) {