Selaa lähdekoodia

fix:pdsc, 禅道bug

zhangkai 3 kuukautta sitten
vanhempi
commit
0915f41f40

+ 2 - 0
nationrel-module-pdsc-biz/src/main/java/com/nationrel/modules/pdsc/controller/ProjectInfoController.java

@@ -1,6 +1,7 @@
 package com.nationrel.modules.pdsc.controller;
 
 import com.nationrel.modules.pdsc.entity.ProjectInfo;
+import com.nationrel.modules.pdsc.enums.ProjectStatuseEnum;
 import com.nationrel.modules.pdsc.req.ProjectInfoActivateReq;
 import com.nationrel.modules.pdsc.req.ProjectInfoListReq;
 import com.nationrel.modules.pdsc.req.ProjectInfoReleaseReq;
@@ -165,6 +166,7 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
     public Result<String> recovery(@RequestParam(name = "id", required = true) String id) {
         ProjectInfo projectInfo = projectInfoService.getById(id);
         projectInfo.setDelFlag(CommonConstant.DEL_FLAG_0);
+        projectInfo.setStatus(ProjectStatuseEnum.UNDER_PREPARATION.getType());
         projectInfo.setDeleteTime(null);
         projectInfoService.updateById(projectInfo);
         return Result.OK(MessageUtils.get("nationrel_recovery_success"));

+ 2 - 0
nationrel-module-pdsc-biz/src/main/java/com/nationrel/modules/pdsc/service/impl/ProjectInfoServiceImpl.java

@@ -137,6 +137,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
     public void delete(String id) {
         ProjectInfo projectInfo = getById(id);
         projectInfo.setDelFlag(CommonConstant.DEL_FLAG_1);
+        projectInfo.setStatus(ProjectStatuseEnum.ABANDONED.getType());
         projectInfo.setDeleteTime(new Date());
         updateById(projectInfo);
         if (projectInfo.getVersion() > 1) {
@@ -159,6 +160,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
         Date curDate = new Date();
         projectInfos.forEach(v -> {
             v.setDelFlag(CommonConstant.DEL_FLAG_1);
+            v.setStatus(ProjectStatuseEnum.ABANDONED.getType());
             v.setDeleteTime(curDate);
         });
         updateBatchById(projectInfos);