建管项目修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryTemplateServiceImpl.java

@@ -203,9 +203,9 @@ public class PgsProgressCategoryTemplateServiceImpl extends ServiceImpl<PgsProgr
             if (project == null) {
                 throw new ServiceException("对应项目不存在", HttpStatus.NOT_FOUND);
             }
-            if (entity.getConstructionType() == null) {
+//            if (entity.getConstructionType() == null) {
-                entity.setConstructionType(project.getProjectType());
+//                entity.setConstructionType(project.getProjectType());
-            }
+//            }
         }
         if (parentId != 0) {
             if (this.getById(parentId) == null) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java

@@ -73,7 +73,7 @@ public class BusProject extends BaseEntity {
     /**
      * 项目类型
      */
-    private String projectType;
+    private Long projectType;
 
     /**
      * 项目阶段

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectCreateReq.java

@@ -49,7 +49,7 @@ public class BusProjectCreateReq implements Serializable {
     /**
      * 项目类型
      */
-    private String projectType;
+    private Long projectType;
 
     /**
      * 项目阶段

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectQueryReq.java

@@ -43,7 +43,7 @@ public class BusProjectQueryReq implements Serializable {
     /**
      * 项目类型
      */
-    private String projectType;
+    private Long projectType;
 
     /**
      * 项目阶段

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectUpdateReq.java

@@ -65,7 +65,7 @@ public class BusProjectUpdateReq implements Serializable {
     /**
      * 项目类型
      */
-    private String projectType;
+    private Long projectType;
 
     /**
      * 项目阶段

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java

@@ -92,12 +92,12 @@ public class BusProjectVo implements Serializable {
      */
     @ExcelProperty(value = "项目类型", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "project_type")
-    private String projectType;
+    private Long projectType;
 
     /**
      * 项目类型名称
      */
-    @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "projectType", other = "project_type")
+//    @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "projectType", other = "project_type")
     private String projectTypeName;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java

@@ -63,8 +63,11 @@ import org.dromara.system.domain.vo.SysDictDataVo;
 import org.dromara.system.service.ISysDeptService;
 import org.dromara.system.service.ISysDictDataService;
 import org.dromara.workflow.service.IFlwDefinitionService;
+import org.dromara.xzd.domain.vo.XzdProjectTypeVo;
+import org.dromara.xzd.service.impl.XzdProjectTypeServiceImpl;
 import org.dromara.xzd.utilS.IdWorker;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -102,6 +105,9 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
     @Resource
     private ISubContractorService contractorService;
 
+    @Autowired
+    private XzdProjectTypeServiceImpl xzdProjectTypeService;
+
     @Lazy
     @Resource
     private IBusProjectFileService projectFileService;
@@ -197,6 +203,14 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
             List<Punchrange> punchranges = BeanUtil.copyToList(punchrangeList, Punchrange.class);
             vo.setPunchrangeList(punchranges);
         }
+
+        //项目类型
+        if (vo.getProjectType() != null) {
+            XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(vo.getProjectType());
+            if (xzdProjectTypeVo != null) {
+                vo.setProjectTypeName(xzdProjectTypeVo.getTypeName());
+            }
+        }
         return vo;
     }
 
@@ -744,7 +758,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         String shortName = req.getShortName();
         Long pId = req.getPId();
         String status = req.getStatus();
-        String projectType = req.getProjectType();
+        Long projectType = req.getProjectType();
         String projectCategory = req.getProjectStage();
         String projectSite = req.getProjectSite();
         String principal = req.getPrincipal();
@@ -1657,7 +1671,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         vo.setProjectName(name);
         vo.setLat(String.valueOf(lat));
         vo.setLng(String.valueOf(lng));
-        vo.setProjectType(projectType.toString());
+        vo.setProjectType(Long.valueOf(projectType));
         vo.setPlan(plan);
         return vo;
     }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java

@@ -744,25 +744,28 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
         }
         String status = processEvent.getStatus();
         if (BusinessStatusEnum.FINISH.getStatus().equals(status)) {
-//            try {
+            try {
-//                // 创建系统项目
+                // 创建系统项目
-//                BusProjectCreateReq project = new BusProjectCreateReq();
+                if (byId.getSysProjectId() == null){
-//                project.setXzdProjectId(byId.getId());
+                    BusProjectCreateReq project = new BusProjectCreateReq();
-//                project.setProjectName(byId.getProjectName());
+                    project.setXzdProjectId(byId.getId());
-//                project.setShortName(byId.getProjectAbbreviation());
+                    project.setProjectName(byId.getProjectName());
-//                project.setOnStreamTime(String.valueOf(byId.getActualStartDate()));
+                    project.setShortName(byId.getProjectAbbreviation());
-//                // 获取项目概括
+                    project.setOnStreamTime(String.valueOf(byId.getActualStartDate()));
-//                XzdProjectProfile projectProfile = xzdProjectProfileService.lambdaQuery()
+                    // 获取项目概括
-//                    .eq(XzdProjectProfile::getXzdProjectId, byId.getId())
+                    XzdProjectProfile projectProfile = xzdProjectProfileService.lambdaQuery()
-//                    .last("limit 1")
+                        .eq(XzdProjectProfile::getXzdProjectId, byId.getId())
-//                    .one();
+                        .last("limit 1")
-//                project.setProjectGeneralize(projectProfile.getProjectProfile());
+                        .one();
-//                project.setProvince(projectProfile.getProvince());
+                    project.setProjectGeneralize(projectProfile.getProjectProfile());
-//                Long sysProjectId = projectService.insertByBo(project);
+                    project.setProvince(projectProfile.getProvince());
-//                byId.setSysProjectId(sysProjectId);
+                    Long sysProjectId = projectService.insertByBo(project);
-//            } catch (Exception e) {
+                    byId.setSysProjectId(sysProjectId);
-//                log.error("自动创建系统项目失败：{} - {}", byId.getId(), byId.getProjectName(), e);
+                }
-//            }
+
+            } catch (Exception e) {
+                log.error("自动创建系统项目失败：{} - {}", byId.getId(), byId.getProjectName(), e);
+            }
         }
         byId.setShzt(status);
         boolean b = this.updateById(byId);