提前开票问题修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java

@@ -50,6 +50,6 @@ public class AppAdvanceInvoiceInfoVo implements Vo {
     @ApiModelProperty("任务id")
     private String taskId;
     @ApiModelProperty("流程实列id")
-    private String procInsId;
+    private String procInstId;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java

@@ -130,6 +130,11 @@ public interface BusAdvanceGinvoiceapplyFeign {
     @ResponseBody
     public ResultBean complete(@Valid @RequestBody AppCompleteAdvanceInvoiceDto query);
 
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/InitiatorToAnswer")
+    @ResponseBody
+    public ResultBean InitiatorToAnswer(@Valid @RequestBody AppCompleteAdvanceInvoiceDto query);
+
     @ApiOperation(value = "获取上一个环节")
     @PostMapping(value = "/getPreviousNodesForReject")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java

@@ -111,6 +111,11 @@ public class BusAdvanceGinvoiceapplyFeignFallback implements BusAdvanceGinvoicea
         return null;
     }
 
+    @Override
+    public ResultBean InitiatorToAnswer(AppCompleteAdvanceInvoiceDto query) {
+        return null;
+    }
+
     @Override
     public ResultBean complete(AppCompleteAdvanceInvoiceDto query) {
         return null;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java

@@ -144,6 +144,14 @@ public class BusAdvanceGinvoiceapplyRest implements BusAdvanceGinvoiceapplyFeign
         return busAdvanceGinvoiceapplyService.complete(bv);
     }
 
+    @Override
+    public ResultBean InitiatorToAnswer(AppCompleteAdvanceInvoiceDto query) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId());
+        return busAdvanceGinvoiceapplyService.InitiatorToAnswer(bv);
+    }
+
     @Override
     public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
         return busAdvanceGinvoiceapplyService.getPreviousNodesForReject(query);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@@ -65,6 +65,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -565,7 +566,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
     public ResultBean submitCarTransfer(AppSubmitAdvanceInvoiceDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean  = sysUserFeign.fetchBySid(dto.getUserSid());
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
         if (!userVoResultBean.getSuccess()) {
             return rb.setMsg(userVoResultBean.getMsg());
         }
@@ -715,6 +716,45 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         }
     }
 
+    public ResultBean InitiatorToAnswer(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(bv.getBusinessSid());
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("contractSid", bv.getBusinessSid());
+        variables.put("app", appMap);
+        bv.setFormVariables(variables);
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        List<String> candidateGroups = voList.get(0).getCandidateGroups();
+        UserRoleQuery userRoleQuery = new UserRoleQuery();
+        userRoleQuery.setRoleSid(candidateGroups.get(0));
+        List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
+        StringBuilder nextNodeUserSids = new StringBuilder();
+        if (sysUserVos.size() > 0) {
+            for (SysUserVo sysUserVo : sysUserVos) {
+                String sid = sysUserVo.getSid();
+                nextNodeUserSids.append(sid).append(",");
+            }
+        }
+        if (StringUtils.isBlank(nextNodeUserSids)) {
+            return rb.setMsg("下一环节暂无操作人员");
+        }
+        String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+        bv.setNextNodeUserSids(substring);
+        if (bv.getTaskId().equals(busAdvanceGinvoiceapply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
+            if (!resultBean1.getSuccess()) {
+                return rb.setMsg(resultBean1.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
+            return rb.success().setData(resultBean1.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
     public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
         ResultBean<List<GetNodeVo>> rb = new ResultBean<>();
         BusinessVariables bv = new BusinessVariables();

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -12,7 +12,8 @@ public enum ProcDefEnum {
     SALESPOLICY("销售政策审批流程", "sales_policy_oxeeyzhr:1:247508"),
     FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
 //    ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
-    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:647504"),
+//    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:2:665066"), //本地
+    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//测试
     ARREARSCARRYVEHICLE("欠款提车审批流程", "arrears_carryvehicle:1:232589"),
 //    VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

@@ -59,6 +59,7 @@ public class AdvanceInvoiceInfoVo implements Vo {
     @ApiModelProperty("任务id")
     private String taskId;
     @ApiModelProperty("流程实列id")
-    private String procInsId;
+    @JsonProperty("procInsId")
+    private String procInstId;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java

@@ -100,6 +100,11 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
     @ResponseBody
     ResultBean agreeAdvanceInvoiceInfo(@RequestBody CompleteAdvanceInvoiceDto dto);
 
+    @ApiOperation("办理 跨机构")
+    @PutMapping("/initiatorToAnswerInfo")
+    @ResponseBody
+    ResultBean initiatorToAnswer(@RequestBody CompleteAdvanceInvoiceDto dto);
+
     @ApiOperation("驳回")
     @PutMapping("/rejectAdvanceInvoiceInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java

@@ -86,6 +86,11 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
         return null;
     }
 
+    @Override
+    public ResultBean initiatorToAnswer(CompleteAdvanceInvoiceDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean rejectAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
         return null;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java

@@ -93,6 +93,11 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
         return appBusAdvanceGinvoiceapplyService.agreeAdvanceInvoiceInfo(dto);
     }
 
+    @Override
+    public ResultBean initiatorToAnswer(CompleteAdvanceInvoiceDto dto) {
+        return appBusAdvanceGinvoiceapplyService.initiatorToAnswer(dto);
+    }
+
     @Override
     public ResultBean rejectAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
         return appBusAdvanceGinvoiceapplyService.rejectAdvanceInvoiceInfo(query);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -160,6 +160,30 @@ public class AppBusAdvanceGinvoiceapplyService {
         return rb.success().setData(resultBean.getData());
     }
 
+    public ResultBean initiatorToAnswer(CompleteAdvanceInvoiceDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!staffOrgResultBean.getSuccess()) {
+            return rb.setMsg(staffOrgResultBean.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        AppCompleteAdvanceInvoiceDto completeAdvanceInvoiceDto = new AppCompleteAdvanceInvoiceDto();
+        BeanUtil.copyProperties(dto, completeAdvanceInvoiceDto);
+        completeAdvanceInvoiceDto.setOrgSidPath(orgSidPath);
+        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.InitiatorToAnswer(completeAdvanceInvoiceDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
     public ResultBean rejectAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
         ResultBean rb = ResultBean.fireFail();
         AppAdvanceInvoiceTaskQuery taskQuery = new AppAdvanceInvoiceTaskQuery();