fix(jyjc)：merge新增、更新接口

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, false);
+	    model = jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model, false);
 	    return ResponseHelper.buildResponse(model);
 	}
 
@@ -63,7 +63,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "更新", notes = "更新")
 	public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrJyjcOpeningApplication(@RequestBody JyjcOpeningApplicationModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.updateModel(model,false));
+	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,false));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -71,7 +71,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
 	public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
-		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.updateModel(model,true));
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -79,7 +79,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "重新提交开通申请", notes = "重新提交开通申请")
 	public ResponseModel<JyjcOpeningApplicationModel> resubmitJyjcOpeningApplication(@RequestBody JyjcOpeningApplicationModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
-		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.updateModel(model, true));
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model, true));
 	}
 
 	/**

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

@@ -98,10 +98,10 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     private WorkflowFeignClient workflowFeignClient;
 
     @Transactional (rollbackFor = {Exception.class, BaseException.class})
-    public JyjcOpeningApplicationModel saveModel(JyjcOpeningApplicationModel model, Boolean restartFlow) {
-        // 开启工作流 startProcess
+    public JyjcOpeningApplicationModel saveOrUpdateModel(JyjcOpeningApplicationModel model, Boolean enableStartFlow) {
         try {
-            if (restartFlow) {
+            if (enableStartFlow) {
+                // 开启工作流 startProcess
                 String instanceId = startFlow();
                 JSONObject dataObject = getTask(instanceId);
                 JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
@@ -112,34 +112,16 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 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());
-            return this.createWithModel(model);
-        } catch (Exception e) {
-            log.error("saveModel: model={} error", model, e);
-            throw new BaseException(e.getMessage());
-        }
-    }
-
-    @Transactional (rollbackFor = {Exception.class, BaseException.class})
-    public JyjcOpeningApplicationModel updateModel(JyjcOpeningApplicationModel model, Boolean restartFlow) {
-        if (model.getSequenceNbr() == null) {
-            throw new BadRequest("sequenceNbr不能为空！");
-        }
-        try {
-            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);
-                }
+            if (model.getSequenceNbr() == null) {
+                CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
+                model.setUnitCode(companyBo.getCompanyCode());
+                model.setUnitCode("91611103MAC4Q1EG7B");
+                model.setUnitCodeName(companyBo.getCompanyName());
+                model.setApplicationSeq(buildApplicationSeq());
+                return this.createWithModel(model);
+            } else {
+                return this.updateWithModel(model);
             }
-            return this.updateWithModel(model);
         } catch (Exception e) {
             log.error("saveModel: model={} error", model, e);
             throw new BaseException(e.getMessage());