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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
+import cn.hutool.core.map.MapBuilder;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -23,6 +24,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -127,6 +129,25 @@ public class JyjcOpeningApplicationController extends BaseController {
 	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page,jyjcOpeningApplicationDto));
 	}
 
+
+	/**
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/pageForCompany")
+	@ApiOperation(httpMethod = "GET",value = "分页查询-公司",  notes = "分页查询-公司")
+	public ResponseModel<Page<JyjcOpeningApplicationModel>> querypageForCompany(@RequestParam(value = "current") int current,@RequestParam
+			(value = "size") int size,JyjcOpeningApplicationModel jyjcOpeningApplicationDto) {
+		Page<JyjcOpeningApplication> page = new Page<JyjcOpeningApplication>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.querypageForCompany(page,jyjcOpeningApplicationDto));
+	}
+
 	/**
 	 * 列表全部数据查询
      *
@@ -149,9 +170,12 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "接收或者驳回业务开通申请",   notes = "接收或者驳回业务开通申请")
 	@PostMapping(value = "/execueFlow")
-	public void execueFlow(@RequestBody Map<String,Object> params) {
+	public ResponseModel<HashMap<String,String>> execueFlow(@RequestBody Map<String,Object> params) {
 
 		jyjcOpeningApplicationServiceImpl.execueFlow(params);
+		HashMap<String,String> result =new HashMap<>();
+		result.put("result","success");
+		return ResponseHelper.buildResponse(result);
 	}
 
 	/**

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

@@ -165,6 +165,10 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     }
 
     public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationModel jyjcOpeningApplicationModel) {
+        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationModel);
+    }
+
+    public Page<JyjcOpeningApplicationModel> querypageForCompany(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationModel jyjcOpeningApplicationModel) {
         //根据申请单中的单位信息对于列表数据进行过滤
         CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
         if (companyBo.getLevel().equals("company")) {
@@ -298,9 +302,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 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();
+//                String detectionRegionName =  params.get("detectionRegionName").toString();
                 jyjcOpeningApplication.setDetectionRegion(detectionRegion);
-                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
+//                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
                 jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
             }
         } catch (Exception e) {