Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java

@@ -171,7 +171,7 @@ public class ConstructionPlanManage {
         defaultDeclaredProjectManage.buildCondition(params, dto);
         // 获取发起单位、发起单位主管单位、发起单位上级条线主管单位信息
         Map<String, OrgInfoDTO> orgModelMap = defaultDeclaredProjectManage.buildOrgModelMap(employeeCode, constructProject);
-        String instanceId = processService.newStartProcess(model.getProcessDefId(), model.getFormId(), params, orgModelMap);
+        String instanceId = processService.startProcessLs(model, params, orgModelMap);
         log.info("建设方案项目申报成功 【{}】", instanceId);
 
         // 保存建设项目相关

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java

@@ -240,7 +240,7 @@ public class DeclaredProjectManage {
         Project project = new Project();
         BeanUtils.copyProperties(projectDto,project);
         Map<String, OrgInfoDTO> orgModelMap = defaultDeclaredProjectManage.buildOrgModelMap(employeeCode,project);
-        String instanceId = processService.newStartProcess(model.getProcessDefId(),model.getFormId(), params,orgModelMap);
+        String instanceId = processService.startProcessLs(model, params,orgModelMap);
         log.info("重新申报项目成功 【{}】", instanceId);
 
         //保存项目相关

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/FinalAcceptanceManage.java

@@ -233,7 +233,7 @@ public class FinalAcceptanceManage {
         declaredProjectManage.buildCondition(params, dto);
         // 获取发起单位、发起单位主管单位、发起单位上级条线主管单位信息
         Map<String, OrgInfoDTO> orgModelMap = declaredProjectManage.buildOrgModelMap(employeeCode, projectInfo);
-        String instanceId = processInstanceService.newStartProcess(model.getProcessDefId(), model.getFormId(), params, orgModelMap);
+        String instanceId = processInstanceService.startProcessLs(model, params, orgModelMap);
         log.info("终验方案项目申报成功 【{}】", instanceId);
 
         //保存终验项目
@@ -294,7 +294,7 @@ public class FinalAcceptanceManage {
         declaredProjectManage.buildCondition(params, dto);
         // 获取发起单位、发起单位主管单位、发起单位上级条线主管单位信息
         Map<String, OrgInfoDTO> orgModelMap = declaredProjectManage.buildOrgModelMap(employeeCode, projectInfo);
-        String instanceId = processInstanceService.newStartProcess(model.getProcessDefId(), model.getFormId(), params, orgModelMap);
+        String instanceId = processInstanceService.startProcessLs(model, params, orgModelMap);
         log.info("终验方案项目重新申报成功 【{}】", instanceId);
 
         //保存终验项目

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java

@@ -194,7 +194,7 @@ public class PrequalificationDeclaredProjectManage {
 
         // 获取发起单位、发起单位主管单位、发起单位上级主管条线单位信息
         Map<String, OrgInfoDTO> orgModelMap = defaultDeclaredProjectManage.buildOrgModelMap(employeeCode,projectInfo);
-        String instanceId = processInstanceService.newStartProcess(model.getProcessDefId(),model.getFormId(), params,orgModelMap);
+        String instanceId = processInstanceService.startProcessLs(model, params,orgModelMap);
         log.info("提交预审项目成功 【{}】", instanceId);
 
         log.info("restart 【{}】", restart);

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java

@@ -97,7 +97,7 @@ public class ReviewByDeptJointManage {
 
         // 获取发起单位、发起单位主管单位、发起单位上级主管条线单位信息
         Map<String, OrgInfoDTO> orgModelMap = defaultDeclaredProjectManage.buildOrgModelMap(startUserCode,project);
-        String instanceId = processService.newStartProcess(model.getProcessDefId(),model.getFormId(), params,orgModelMap);
+        String instanceId = processService.startProcessLs(model, params,orgModelMap);
         log.info("部门联审申报成功 【{}】", instanceId);
 
         //保存项目信息