fix(jyjc)：调整新增接口

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -48,7 +48,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<JyjcOpeningApplicationModel> save(@RequestBody JyjcOpeningApplicationModel model) {
-	    model = jyjcOpeningApplicationServiceImpl.saveModel(model);
+	    model = jyjcOpeningApplicationServiceImpl.saveModel(model, true);
 	    return ResponseHelper.buildResponse(model);
 	}
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -97,24 +97,26 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Autowired
     private WorkflowFeignClient workflowFeignClient;
 
-    @Transactional (rollbackFor = {Exception.class, CommonException.class})
-    public JyjcOpeningApplicationModel saveModel(JyjcOpeningApplicationModel model) {
+    @Transactional (rollbackFor = {Exception.class, BaseException.class})
+    public JyjcOpeningApplicationModel saveModel(JyjcOpeningApplicationModel model, Boolean restartFlow) {
         // 开启工作流 startProcess
         try {
-            // String instanceId = startFlow();
-            // JSONObject dataObject = getTask(instanceId);
-            // JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
-            // if(!ValidationUtil.isEmpty(executorArray)) {
-            //     String roleGroups = executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
-            //     model.setWorkflowRole(roleGroups);
-            // }
+            if (restartFlow) {
+                String instanceId = startFlow();
+                JSONObject dataObject = getTask(instanceId);
+                JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
+                if(!ValidationUtil.isEmpty(executorArray)) {
+                    String roleGroups = executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
+                    model.setWorkflowRole(roleGroups);
+                }
+                model.setStatus(!ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "");
+                model.setWorkflowProstanceId(instanceId);
+            }
             CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
             model.setUnitCode(companyBo.getCompanyCode());
             model.setUnitCode("91611103MAC4Q1EG7B");
             model.setUnitCodeName(companyBo.getCompanyName());
             model.setApplicationSeq(buildApplicationSeq());
-            // model.setStatus(!ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "");
-            // model.setWorkflowProstanceId(instanceId);
             return this.createWithModel(model);
         } catch (Exception e) {
             log.error("saveModel: model={} error", model, e);
@@ -122,7 +124,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         }
     }
 
-    @Transactional (rollbackFor = {Exception.class, CommonException.class})
+    @Transactional (rollbackFor = {Exception.class, BaseException.class})
     public JyjcOpeningApplicationModel updateModel(JyjcOpeningApplicationModel model, Boolean restartFlow) {
         if (model.getSequenceNbr() == null) {
             throw new BadRequest("sequenceNbr不能为空！");