Merge remote-tracking branch 'origin/fourthStage' into fourthStage

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java

@@ -131,6 +131,7 @@ public class ProcessESInitChangeEndListener implements ExecutionListener {
                 espService.deleteById(processEsInitChange.getStandardIdTwo());
                 // 生成新企标计划
                 EnterpriseStandardPlan plan = BeanCopyUtils.copyBean(processEsInitChange, EnterpriseStandardPlan.class);
+                plan.setApplicationCategory(ESPProjectType.ENACT.getValue());
                 espService.save(plan);
                 //发起制修订流程
                 esRevisionService.autoStartProcess(getRevisionDataVO(plan));

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java

@@ -210,6 +210,9 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         if (esp == null) {
             throw new JeroBootException(ResultCommon.INVALID_ESP);
         }
+        // 设置状态为运行中
+        esp.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue());
+        espService.updateById(esp);
     }
 
     @Override