Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java

@@ -14,7 +14,6 @@ import com.ningdatech.basic.util.CollUtils;
 import com.ningdatech.basic.util.ValidUtil;
 import com.ningdatech.pmapi.common.constant.CommonConst;
 import com.ningdatech.pmapi.common.model.entity.ExcelExportWriter;
-import com.ningdatech.pmapi.common.statemachine.event.ProjectStatusChangeEvent;
 import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils;
 import com.ningdatech.pmapi.common.util.ExcelDownUtil;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
@@ -82,7 +81,7 @@ public class AnnualPlanLibManage {
     public PageVo<AnnualPlanListItemVO> annulPlanLibList(ProjectListReq req) {
         LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req);
         Integer isTemporaryAugment = req.getIsTemporaryAugment();
-        if (Objects.isNull(isTemporaryAugment)){
+        if (Objects.isNull(isTemporaryAugment)) {
             throw new BizException("请传入是否临时增补标志!");
         }
         query.eq(Project::getIsTemporaryAugment, isTemporaryAugment);
@@ -140,6 +139,8 @@ public class AnnualPlanLibManage {
                 .set(Project::getBuildCycle, req.getBuildCycle())
                 .set(Project::getConstructionPlanFile, req.getBuildPlanFileId())
                 .set(Project::getApprovalDate, req.getApprovedDate())
+                .set(Project::getStatus, project.getStatus())
+                .set(Project::getStage, project.getStage())
                 .eq(Project::getId, req.getProjectId());
         projectService.update(update);
     }
@@ -223,7 +224,7 @@ public class AnnualPlanLibManage {
         param.setPageSize(CommonConst.EXPORT_PAGE_SIZE);
         LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(param);
         Integer isTemporaryAugment = param.getIsTemporaryAugment();
-        if (Objects.isNull(isTemporaryAugment)){
+        if (Objects.isNull(isTemporaryAugment)) {
             throw new BizException("请传入是否临时增补标志!");
         }
         query.eq(Project::getIsTemporaryAugment, isTemporaryAugment);
@@ -235,11 +236,11 @@ public class AnnualPlanLibManage {
         ExcelExportWriter excelExportWriter = new ExcelExportWriter();
 
         Integer tableFlag = param.getTableFlag();
-        if (Objects.isNull(tableFlag)){
+        if (Objects.isNull(tableFlag)) {
             throw new BizException("请传入要导出的表格类型!");
         }
         String fileName = null;
-        if (tableFlag == 0){
+        if (tableFlag == 0) {
             fileName = "年度计划库编辑表";
         } else if (tableFlag == 1) {
             fileName = "年度计划库列表";