1.检验业务在线开通流程接口执行调整

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

@@ -24,6 +24,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -146,10 +147,11 @@ public class JyjcOpeningApplicationController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "接收或者驳回业务开通申请",   notes = "接收或者驳回业务开通申请")
-	@GetMapping(value = "/execueFlow")
-	public void execueFlow(@RequestParam("op") String op, @RequestParam("instanceId") String instanceId,@RequestParam("comments") String comments) {
-		jyjcOpeningApplicationServiceImpl.execueFlow(op,instanceId,comments);
+	@ApiOperation(httpMethod = "POST",value = "接收或者驳回业务开通申请",   notes = "接收或者驳回业务开通申请")
+	@PostMapping(value = "/execueFlow")
+	public void execueFlow(@RequestBody Map<String,Object> params) {
+
+		jyjcOpeningApplicationServiceImpl.execueFlow(params);
 	}
 
 	/**

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

@@ -51,14 +51,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -277,7 +270,10 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 接收/驳回通知检验单
      */
-   public void execueFlow(String op, String instanceId,String comments) {
+   public void execueFlow(Map<String,Object> params) {
+       String op = params.get("op").toString();
+       String instanceId = params.get("instanceId").toString();
+       String comments= params.get("comments").toString();
         try {
             AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
             JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
@@ -296,8 +292,16 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             if (ObjectUtils.isEmpty(ajaxResult1)) {
 
             }
-
             updateModelByInstanceId(instanceId);
+            if(op.equals("0")){
+                String originalDataId = params.get("originalDataId").toString();
+                JyjcOpeningApplication jyjcOpeningApplication=jyjcOpeningApplicationMapper.selectById(originalDataId);
+                List<String> detectionRegion = Arrays.asList(params.get("detectionRegion").toString().split(",")) ;
+                String detectionRegionName =  params.get("detectionRegionName").toString();
+                jyjcOpeningApplication.setDetectionRegion(detectionRegion);
+                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
+                jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }