update 年度制修订计划流程 联调

laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java

@@ -17,7 +17,7 @@ public enum ProcessTypeEnum {
     MARKET_STANDARD_PUBLISH("市场清单发布流程", 4, "com.jero.modules.activiti.process.ms.service.impl.ProcessMarketStandardReleaseServiceImpl", "/workCenter/MarketListReleaseProcess", "/workCenter/MarketListReleaseProcess"),
     ENTERPRISE_STANDARD_ABOLISH_PUBLISH("企标废止发布流程", 5, "com.jero.modules.activiti.process.abolish.service.impl.ProcessAbolishReleaseServiceImpl", "/workCenter/AbolishReleaseProcess", "/workCenter/AbolishReleaseProcess"),
     ES_REVISION_ADVICE("企业标准制修订及征求意见流程", 6, "com.jero.modules.activiti.process.esRevisionAdvice.service.impl.EsRevisionServiceImpl","/workCenter/enterpriseStandardRevision/enterpriseStandardRevisionFlow","/workCenter/enterpriseStandardRevision"),
-    ANNUAL_INIT("年度制修订计划流程", 7, "com.jero.modules.activiti.process.annualinit.service.impl.ProcessAnnualInitService","/workCenter/enterpriseStandardRevision/enterpriseStandardRevisionFlow","/workCenter/enterpriseStandardRevision"),
+    ANNUAL_INIT("年度制修订计划流程", 7, "com.jero.modules.activiti.process.annualinit.service.ProcessAnnualInitService","/workCenter/enterpriseStandardRevision/enterpriseStandardRevisionFlow","/workCenter/enterpriseStandardRevision"),
     DOMESTIC_VEHICLE_CONTROL_PUBLISH("国内整车型号和VIN前八位管控流程", 8, "com.jero.modules.activiti.process.vehicledomestic.service.impl.ProcessVehicleDomesticReleaseServiceImpl","/workCenter/VehicleDomesticReleaseProcess","/workCenter/VehicleDomesticReleaseProcess")
     ;
 

laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java

@@ -23,6 +23,7 @@ import com.jero.modules.activiti.process.fb.dto.ProcessDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.service.ProcessAllService;
+import com.jero.modules.activiti.service.WorkCenterService;
 import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.laws.enterprise.entity.ESPProjectStatus;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
@@ -98,7 +99,6 @@ public class ProcessAnnualInitService extends ServiceImpl<ProcessAnnualInitMappe
 
         //start 先保存一份初始草稿
         processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
-        processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null));
         processHandleService.saveToDraft(processInfoVO, CurrentUserUtil.getId());
         //end 保存初始草稿结束
         //保存快照 start