撤回接口修改支持行内操作

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

@@ -205,8 +205,8 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "撤回业务开通申请",   notes = "撤回业务开通申请")
 	@GetMapping(value = "/rollBackFlow")
-	public void overflow( @RequestParam("instanceId") String instanceId) {
-		jyjcOpeningApplicationServiceImpl.stopFlow(instanceId);
+	public void overflow( @RequestParam("sequenceNbr") String sequenceNbr) {
+		jyjcOpeningApplicationServiceImpl.stopFlow(sequenceNbr);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -193,9 +193,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     public Page<JyjcOpeningApplicationModel> querypageForCompany(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto) {
         //根据申请单中的单位信息对于列表数据进行过滤
         CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
-        if (companyBo.getLevel().equals("company")) {
+//        if (companyBo.getLevel().equals("company")) {
             jyjcOpeningApplicationRequstDto.setUnitCode(companyBo.getCompanyCode());
-        }
+//        }
 
         String applyStartTime = "";
         String applyEndTime = "";
@@ -358,14 +358,15 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 撤回流程办理单
      */
-    public void stopFlow(String instanceId) {
+    public void stopFlow(String sequenceNbr) {
+        JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(sequenceNbr);
         try {
             //撤回流程
-            JSONObject jsonObject = workflowFeignClient.rollBack(instanceId);
+            JSONObject jsonObject = workflowFeignClient.rollBack(jyjcOpeningApplication.getWorkflowProstanceId());
             if (ObjectUtils.isEmpty(jsonObject)) {
 
             }
-            updateModelByInstanceId(instanceId, FlowStatusEnum.ROLLBACK.getCode() + "");
+            updateModelByInstanceId(jyjcOpeningApplication.getWorkflowProstanceId(), FlowStatusEnum.ROLLBACK.getCode() + "");
         } catch (Exception e) {
             e.printStackTrace();
         }