Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java

@@ -88,7 +88,9 @@ public class AppArrearsCarryDto implements Dto {
     //是否金融部复核
     @ApiModelProperty("是否金融部复核，1是，0否")
     private String isFinance;
+    @ApiModelProperty("金融人员用户sid")
     private String financeUserSid;
+    @ApiModelProperty("金融人员")
     private String financeName;
 
     @ApiModelProperty("实例id")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -106,7 +106,7 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @ApiOperation("详情")
     @GetMapping("/details")
     @ResponseBody
-    ResultBean<AppArrearsCarryInfoVo> details(@RequestParam("sid")String sid);
+    ResultBean<AppArrearsCarryInfoVo> details(@RequestParam("sid") String sid);
 
     @ApiOperation("提交流程")
     @PostMapping("/submitAdvanceArrearsInfo")
@@ -118,6 +118,11 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     public ResultBean complete(@Valid @RequestBody AppCompleteAdvanceArrearsDto query);
 
+    @ApiOperation(value = "销售经理、销售内勤办理（同意）")
+    @PostMapping("/completeBy")
+    @ResponseBody
+    public ResultBean completeBy(@RequestBody CompleteByQuery query);
+
     @ApiOperation(value = "办理（同意）")
     @PostMapping("/InitiatorToAnswerInfo")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java

@@ -117,6 +117,11 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
 		return null;
 	}
 
+	@Override
+	public ResultBean completeBy(CompleteByQuery query) {
+		return null;
+	}
+
 	@Override
 	public ResultBean InitiatorToAnswerInfo(AppCompleteAdvanceArrearsDto query) {
 		return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/CompleteByQuery.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class CompleteByQuery extends AppCompleteAdvanceArrearsDto {
+
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carContract = new ArrayList<>();
+    @ApiModelProperty("欠款提车担保承诺书")
+    private List<String> guaranteeLetter = new ArrayList<>();
+    @ApiModelProperty("股东会对外担保决议")
+    private List<String> gdLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书")
+    private List<String> zjlLetter = new ArrayList<>();
+    @ApiModelProperty("其他附件")
+    private List<String> fileList = new ArrayList<>();
+
+
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java

@@ -145,9 +145,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
         return busArrearsCarryVehicleApplyService.submitArrearsCarryVehicle(dto);
     }
 
-    *//**
+    */
+
+    /**
      * 欠款提车单附件保存接口
-     *
      *//*
     @Override
     public ResultBean saveArrearsAppendix(List<ArrearsAppendixDto> list) {
@@ -204,6 +205,11 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
         return busArrearsCarryVehicleApplyService.complete(bv);
     }
 
+    @Override
+    public ResultBean completeBy(CompleteByQuery query) {
+        return busArrearsCarryVehicleApplyService.completeBy(query);
+    }
+
     @Override
     public ResultBean InitiatorToAnswerInfo(AppCompleteAdvanceArrearsDto query) {
         BusinessVariables bv = new BusinessVariables();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -27,10 +27,7 @@ import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppAdvanceArrearsTaskQuery;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppSubmitAdvanceArrearsDto;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.GetNodeQuery;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.GetNodeVo;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetails;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
@@ -991,9 +988,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
 
         String commitmentMoneyDate = dto.getCommitmentMoneyDate();
         List<String> stringLists = Arrays.asList(commitmentMoneyDate.split("-"));
-        map.put("year",stringLists.get(0));
+        map.put("year", stringLists.get(0));
-        map.put("month",stringLists.get(1));
+        map.put("month", stringLists.get(1));
-        map.put("day",stringLists.get(2));
+        map.put("day", stringLists.get(2));
         //车辆信息
         ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(dto.getContractId());
         if (resultBean.getSuccess()) {
@@ -1211,7 +1208,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             AppOrderPriceInfoVo appOrderPriceInfoVo = appOrderDetailsVo.getPriceInfo();
             map.put("money", appOrderPriceInfoVo.getTotalPrice());
             BigDecimal wMoneyAll = BigDecimal.ZERO;
-            if(StringUtils.isNotBlank(appOrderPriceInfoVo.getTotalPrice())){
+            if (StringUtils.isNotBlank(appOrderPriceInfoVo.getTotalPrice())) {
                 wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getTotalPrice()));
             }
             map.put("DaXieMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(appOrderPriceInfoVo.getTotalPrice()).doubleValue())));
@@ -1221,30 +1218,30 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 map.put("YMoney", subscribtAllResultBean.getData());
                 wMoneyAll = wMoneyAll.subtract(new BigDecimal(subscribtAllResultBean.getData()));
             }
-            if(wMoneyAll.compareTo(BigDecimal.ZERO)<0){
+            if (wMoneyAll.compareTo(BigDecimal.ZERO) < 0) {
-                map.put("wMoney","0");
+                map.put("wMoney", "0");
-            }else{
+            } else {
-                map.put("wMoney",wMoneyAll.toString());
+                map.put("wMoney", wMoneyAll.toString());
             }
 
             map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(subscribtAllResultBean.getData()).doubleValue())));
             //根据存放地点查询
             String address = "";
-            if(StringUtils.isNotBlank(priceInfo.getPlannedPickUpLocationKey())){
+            if (StringUtils.isNotBlank(priceInfo.getPlannedPickUpLocationKey())) {
                 ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(priceInfo.getPlannedPickUpLocationKey()).getData();
-                if(scmWarehouseVo != null){
+                if (scmWarehouseVo != null) {
                     address = scmWarehouseVo.getWarehouseAttribute();
                 }
             }
             map.put("address", address);
             //组装到文档相对应的字段中
-            if(StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())){
+            if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
-                ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid());
+                ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
                 if (invoicingDetailsVoResultBean.getData() != null) {
                     map.put("orgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
-            map.put("mobile",appOrderDetailsVo.getPhone());
+            map.put("mobile", appOrderDetailsVo.getPhone());
             ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
             if (crmResultBean.getSuccess()) {
                 CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
@@ -1365,9 +1362,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             if (StringUtils.isNotBlank(dto.getContractCollectionMoney())) {
                 arearsMoney = arearsMoney.subtract(new BigDecimal(dto.getContractCollectionMoney()));
             }
-            if(arearsMoney.compareTo(BigDecimal.ZERO)<0){
+            if (arearsMoney.compareTo(BigDecimal.ZERO) < 0) {
                 busArrearsCarryVehicleApply.setArrearsMoney(BigDecimal.ZERO);
-            }else{
+            } else {
                 busArrearsCarryVehicleApply.setArrearsMoney(arearsMoney);
             }
             List<String> carContract = dto.getCarContract();
@@ -1437,9 +1434,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             if (StringUtils.isNotBlank(dto.getContractCollectionMoney())) {
                 arearsMoney = arearsMoney.subtract(new BigDecimal(dto.getContractCollectionMoney()));
             }
-            if(arearsMoney.compareTo(BigDecimal.ZERO)<0){
+            if (arearsMoney.compareTo(BigDecimal.ZERO) < 0) {
                 busArrearsCarryVehicleApply.setArrearsMoney(BigDecimal.ZERO);
-            }else{
+            } else {
                 busArrearsCarryVehicleApply.setArrearsMoney(arearsMoney);
             }
             if ("0".equals(busArrearsCarryVehicleApply.getIsFinance())) {
@@ -1450,35 +1447,35 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             if (!carContract.isEmpty()) {
                 String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), "");
                 busArrearsCarryVehicleApply.setCarContractFile(carContractImages);
-            }else{
+            } else {
                 busArrearsCarryVehicleApply.setCarContractFile("");
             }
             List<String> guaranteeLetter = dto.getGuaranteeLetter();
             if (!guaranteeLetter.isEmpty()) {
                 String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
                 busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages);
-            }else{
+            } else {
                 busArrearsCarryVehicleApply.setGuaranteeLetterFile("");
             }
             List<String> gdLetter = dto.getGdLetter();
             if (!gdLetter.isEmpty()) {
                 String gdLetterImages = String.join(",", gdLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
                 busArrearsCarryVehicleApply.setGdLetterFile(gdLetterImages);
-            }else{
+            } else {
                 busArrearsCarryVehicleApply.setGdLetterFile("");
             }
             List<String> zjlLetter = dto.getZjlLetter();
             if (!zjlLetter.isEmpty()) {
                 String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
                 busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages);
-            }else{
+            } else {
                 busArrearsCarryVehicleApply.setZjlLetterFile("");
             }
             List<String> otherFile = dto.getFileList();
             if (!otherFile.isEmpty()) {
                 String fileLists = String.join(",", otherFile).replaceAll(fileUploadComponent.getUrlPrefix(), "");
                 busArrearsCarryVehicleApply.setOtherFile(fileLists);
-            }else{
+            } else {
                 busArrearsCarryVehicleApply.setOtherFile("");
             }
             //车辆
@@ -1731,14 +1728,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         bv.setFormVariables(variables);
         bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
         bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
-        if ("Activity_0tieuz3".equals(bv.getTaskDefKey())) {
-            //销售内勤审批
 
-        }
-        if ("Activity_0ynxtyz".equals(bv.getTaskDefKey())) {
-            //销售部经理审批上传信审
-
-        }
         if ("Activity_03na1gk".equals(bv.getTaskDefKey())) {
             //金融部经理审批
             bv.setNextNodeUserSids(busArrearsCarryVehicleApply.getFinanceUserSid());
@@ -1809,54 +1799,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                         busDeliveredService.addRetrievalApply(addRetrievalApplyDto);
                     }
                 }
-
-               /* // 风控中心风控经理
-                UserRoleQuery userRoleQuery1 = new UserRoleQuery();
-                userRoleQuery1.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
-                List<SysUserVo> list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData();
-                for (SysUserVo userVo : list4) {
-                    recipientSidList.add(userVo.getSid());
-                }
-                // 风控中心风控内勤
-                UserRoleQuery userRoleQuery = new UserRoleQuery();
-                userRoleQuery.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
-                List<SysUserVo> list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
-                for (SysUserVo userVo : list1) {
-                    recipientSidList.add(userVo.getSid());
-                }
-                // 分公司会计角色用户
-                UserQuery userQuery = new UserQuery();
-                userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a");
-                userQuery.setOrgSidPath(bv.getOrgSidPath());
-                List<SysUserVo> list = sysUserFeign.getUserByRole(userQuery).getData();
-                for (SysUserVo userVo : list) {
-                    recipientSidList.add(userVo.getSid());
-                }
-                //财务中心总经理角色用户
-                UserRoleQuery userRoleQuery3 = new UserRoleQuery();
-                userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155");
-                List<SysUserVo> list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData();
-                for (SysUserVo userVo : list3) {
-                    recipientSidList.add(userVo.getSid());
-                }
-                //事业部运营经理角色用户
-                UserRoleQuery userRoleQuery2 = new UserRoleQuery();
-                userRoleQuery2.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725");
-                List<SysUserVo> list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData();
-                for (SysUserVo userVo : list2) {
-                    recipientSidList.add(userVo.getSid());
-                }
-                query.setRecipientSidList(recipientSidList);
-                query.setAppMap(appMaps);
-                query.setMsgTitle("业务");
-                query.setMsgContent(sysUserVo.getName() + "提交的欠款提车申请,请查阅");
-                query.setMsgSource("业务");
-                query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri());
-                query.setApp_type("2");
-                query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
-                query.setName("业务");
-                // 消息推送
-                messageFeign.sendAutoserviceMessage(query);*/
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -1956,54 +1898,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                         busDeliveredService.addRetrievalApply(addRetrievalApplyDto);
                     }
                 }
-/*
-                // 风控中心风控经理
-                UserRoleQuery userRoleQuery1 = new UserRoleQuery();
-                userRoleQuery1.setRoleSid("242d52de-7df9-4fab-91ff-d6f07dc98341");
-                List<SysUserVo> list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData();
-                for (SysUserVo userVo : list4) {
-                    recipientSidList.add(userVo.getSid());
-                }
-                // 风控中心风控内勤
-                UserRoleQuery userRoleQuery2 = new UserRoleQuery();
-                userRoleQuery2.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
-                List<SysUserVo> list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData();
-                for (SysUserVo userVo : list1) {
-                    recipientSidList.add(userVo.getSid());
-                }
-                // 分公司会计角色用户
-                UserQuery userQuery = new UserQuery();
-                userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a");
-                userQuery.setOrgSidPath(bv.getOrgSidPath());
-                List<SysUserVo> list = sysUserFeign.getUserByRole(userQuery).getData();
-                for (SysUserVo userVo : list) {
-                    recipientSidList.add(userVo.getSid());
-                }
-                //财务中心总经理角色用户
-                UserRoleQuery userRoleQuery3 = new UserRoleQuery();
-                userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155");
-                List<SysUserVo> list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData();
-                for (SysUserVo userVo : list3) {
-                    recipientSidList.add(userVo.getSid());
-                }
-                //事业部运营经理角色用户
-                UserRoleQuery userRoleQuery4 = new UserRoleQuery();
-                userRoleQuery4.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725");
-                List<SysUserVo> list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery4).getData();
-                for (SysUserVo userVo : list2) {
-                    recipientSidList.add(userVo.getSid());
-                }
-                query.setRecipientSidList(recipientSidList);
-                query.setAppMap(appMaps);
-                query.setMsgTitle("业务");
-                query.setMsgContent(userVos.getName() + "提交的欠款提车申请,请查阅");
-                query.setMsgSource("业务");
-                query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri());
-                query.setApp_type("2");
-                query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
-                query.setName("业务");
-                // 消息推送
-                messageFeign.sendAutoserviceMessage(query);*/
             }
 
             return rb.success().setData(resultBean1.getData());
@@ -2297,4 +2191,58 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         }
         return rb.success().setData(appArrearsCarryInfoVo);
     }
+
+    public ResultBean completeBy(CompleteByQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if ("Activity_0tieuz3".equals(query.getTaskDefKey()) || "Activity_0ynxtyz".equals(query.getTaskDefKey())) {
+            //销售内勤审批|| //销售部经理审批上传信审
+
+
+        }
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
+        if (busArrearsCarryVehicleApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        List<String> carContract = query.getCarContract();
+        if (carContract.isEmpty()) {
+            return rb.setMsg("请上传车辆买卖合同");
+        } else {
+            String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+            busArrearsCarryVehicleApply.setCarContractFile(carContractImages);
+        }
+        List<String> guaranteeLetter = query.getGuaranteeLetter();
+        if (guaranteeLetter.isEmpty()) {
+            return rb.setMsg("请上传欠款提车担保承诺书");
+        } else {
+            String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+            busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages);
+        }
+        List<String> gdLetter = query.getGdLetter();
+        if (!gdLetter.isEmpty()) {
+            String gdLetterImages = String.join(",", gdLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+            busArrearsCarryVehicleApply.setGdLetterFile(gdLetterImages);
+        }
+        List<String> zjlLetter = query.getZjlLetter();
+        if (zjlLetter.isEmpty()) {
+            return rb.setMsg("请上传总经理担保书");
+        } else {
+            String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+            busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages);
+        }
+        List<String> fileList = query.getFileList();
+        if (fileList.isEmpty()) {
+            return rb.setMsg("请上传其他附件");
+        } else {
+            String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+            busArrearsCarryVehicleApply.setOtherFile(fileLists);
+        }
+        baseMapper.updateById(busArrearsCarryVehicleApply);
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        ResultBean resultBean = complete(bv);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -6084,7 +6084,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             Date modifyTime = newSalesOrder.getModifyTime();
             BeanUtils.copyProperties(newSalesOrder, busSalesOrder);
             newSalesOrder.setSid(newSalesOrderSid);
-            newSalesOrder.setBillNo(null);
+            String billNo = getApplyCode(busSalesOrder.getUseOrgSid());
+            newSalesOrder.setBillNo(billNo);
             newSalesOrder.setCreateDate(createTime);
             newSalesOrder.setNodeState(null);
             newSalesOrder.setProcDefId(null);

anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml

@@ -26,4 +26,7 @@ image:
     path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
   url:
     prefix: http://anrui.yyundong.com/upload/
+templateUrl:
+  uploadUrl: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/template/
+  prefixUrl: http://anrui.yyundong.com/upload/template/
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
 
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
+import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.*;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -94,6 +91,11 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     ResultBean agreeArrearsApplyInfo(@RequestBody CompleteArrearsTakeCarDto dto);
 
+    @ApiOperation("销售经理、销售内勤办理（同意）")
+    @PutMapping("/agreeArrearsApplyInfoBy")
+    @ResponseBody
+    ResultBean agreeArrearsApplyInfoBy(@RequestBody AppCompleteQuery query);
+
     @ApiOperation("办理 跨机构")
     @PutMapping("/initiatorToAnswerInfo")
     @ResponseBody
@@ -118,4 +120,9 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
     @GetMapping("/getFlowOperateTitle")
     @ResponseBody
     ResultBean<String> getFlowOperateTitle(@SpringQueryMap AdvanceArrearsQuery query);
+
+    @ApiOperation("获取下一环节")
+    @GetMapping("/getFlowOperateTitleBy")
+    @ResponseBody
+    ResultBean<ArrearsVo> getFlowOperateTitleBy(@SpringQueryMap ArrearsQuery query);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java

@@ -1,9 +1,7 @@
 package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
 
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
+import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.*;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
+import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractFlowListVo;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -77,6 +75,11 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
         return null;
     }
 
+    @Override
+    public ResultBean agreeArrearsApplyInfoBy(AppCompleteQuery query) {
+        return null;
+    }
+
     @Override
     public ResultBean initiatorToAnswer(CompleteArrearsTakeCarDto dto) {
         return null;
@@ -101,4 +104,9 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
     public ResultBean<String> getFlowOperateTitle(AdvanceArrearsQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<ArrearsVo> getFlowOperateTitleBy(ArrearsQuery query) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AppCompleteQuery.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AppCompleteQuery extends CompleteArrearsTakeCarDto {
+
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carContract = new ArrayList<>();
+    @ApiModelProperty("欠款提车担保承诺书")
+    private List<String> guaranteeLetter = new ArrayList<>();
+    @ApiModelProperty("股东会对外担保决议")
+    private List<String> gdLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书")
+    private List<String> zjlLetter = new ArrayList<>();
+    @ApiModelProperty("其他附件")
+    private List<String> fileList = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class ArrearVo {
+
+    @ApiModelProperty("标题：如身份证")
+    private String title;
+    // 类型 1（上传图片）
+    private int type;
+    // 是否可空， 可不填 true
+    private boolean nullAble;
+    // 保存字段名称
+    private String key;
+    // 保存图片使用 type=1
+    private List<String> filesPath = new ArrayList<>();
+    // 保存文本使用
+    private String text;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearsQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ArrearsQuery {
+
+    @ApiModelProperty(value = "节点key")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    @NotNull(message = "参数错误：next")
+    private Integer next = 1;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearsVo.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class ArrearsVo {
+
+    private String title;
+    private List<ArrearVo> list = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java

@@ -1,14 +1,7 @@
 package com.yxt.anrui.terminal.biz.arrearsTakeCar;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.*;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery;
+import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.*;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto;
-import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -94,6 +87,11 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh
         return appBusArrearsCarryVehicleApplyService.agreeArrearsApplyInfo(dto);
     }
 
+    @Override
+    public ResultBean agreeArrearsApplyInfoBy(AppCompleteQuery query) {
+        return appBusArrearsCarryVehicleApplyService.agreeArrearsApplyInfoBy(query);
+    }
+
     @Override
     public ResultBean initiatorToAnswer(CompleteArrearsTakeCarDto dto) {
         return appBusArrearsCarryVehicleApplyService.initiatorToAnswer(dto);
@@ -118,4 +116,9 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh
     public ResultBean<String> getFlowOperateTitle(AdvanceArrearsQuery query) {
         return appBusArrearsCarryVehicleApplyService.getFlowOperateTitle(query);
     }
+
+    @Override
+    public ResultBean<ArrearsVo> getFlowOperateTitleBy(ArrearsQuery query) {
+        return appBusArrearsCarryVehicleApplyService.getFlowOperateTitleBy(query);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@@ -14,10 +14,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.*;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
+import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.*;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
-import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -95,7 +92,7 @@ public class AppBusArrearsCarryVehicleApplyService {
         AppArrearsCarryDto appArrearsCarryDto = new AppArrearsCarryDto();
         BeanUtil.copyProperties(dto, appArrearsCarryDto);
         ResultBean resultBean = busArrearsCarryVehicleApplyFeign.saveArrearsApply(appArrearsCarryDto);
-        if(!resultBean.getSuccess()){
+        if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
         return rb.success();
@@ -233,7 +230,7 @@ public class AppBusArrearsCarryVehicleApplyService {
     public ResultBean<List<ArrearsCarVo>> getCanUseCars(CarsQuery query) {
         ResultBean<List<ArrearsCarVo>> rb = ResultBean.fireFail();
         QCarQuery qCarQuery = new QCarQuery();
-        BeanUtil.copyProperties(query,qCarQuery);
+        BeanUtil.copyProperties(query, qCarQuery);
         ResultBean<List<QCarVo>> resultBean = busSalesOrderVehicleFeign.getCanUseCars(qCarQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -253,10 +250,101 @@ public class AppBusArrearsCarryVehicleApplyService {
         ResultBean<AdvanceArrearsInfoVo> rb = ResultBean.fireFail();
         AdvanceArrearsInfoVo advanceArrearsInfoVo = new AdvanceArrearsInfoVo();
         ResultBean<AppArrearsCarryInfoVo> resultBean = busArrearsCarryVehicleApplyFeign.details(sid);
-        if(!resultBean.getSuccess()){
+        if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
-        BeanUtil.copyProperties(resultBean.getData(),advanceArrearsInfoVo);
+        BeanUtil.copyProperties(resultBean.getData(), advanceArrearsInfoVo);
         return rb.success().setData(advanceArrearsInfoVo);
     }
+
+    public ResultBean agreeArrearsApplyInfoBy(AppCompleteQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        CompleteByQuery completeByQuery = new CompleteByQuery();
+        BeanUtil.copyProperties(query, completeByQuery);
+        ResultBean resultBean = busArrearsCarryVehicleApplyFeign.completeBy(completeByQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
+    }
+
+    public ResultBean<ArrearsVo> getFlowOperateTitleBy(ArrearsQuery query) {
+        ResultBean<ArrearsVo> rb = ResultBean.fireFail();
+        ArrearsVo arrearsVo = new ArrearsVo();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        GetNodeQuery getNodeQuery = new GetNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<GetNodeVo>> getPreviousNodesForReject = busArrearsCarryVehicleApplyFeign.getPreviousNodesForReject(getNodeQuery);
+            if (getPreviousNodesForReject.getSuccess()) {
+                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = getPreviousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getPreviousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<GetNodeVo>> getNextNodesForSubmit = busArrearsCarryVehicleApplyFeign.getNextNodesForSubmit(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        arrearsVo.setTitle(data);
+        ResultBean<AdvanceArrearsInfoVo> details = details(query.getBusinessSid());
+        List<ArrearVo> list = new ArrayList<>();
+        AdvanceArrearsInfoVo advanceArrearsInfoVo = details.getData();
+        if (advanceArrearsInfoVo != null) {
+            ArrearVo arrearVo = new ArrearVo();
+            arrearVo.setTitle("车辆买卖合同（欠款）");
+            arrearVo.setType(1);
+            arrearVo.setKey("carContract");
+            arrearVo.setNullAble(false);
+            List<String> carContract = advanceArrearsInfoVo.getCarContract();
+            arrearVo.setFilesPath(carContract);
+            list.add(arrearVo);
+            //=================================================
+            arrearVo = new ArrearVo();
+            arrearVo.setTitle("欠款提车担保承诺书");
+            arrearVo.setType(1);
+            arrearVo.setKey("guaranteeLetter");
+            arrearVo.setNullAble(false);
+            List<String> guaranteeLetter = advanceArrearsInfoVo.getGuaranteeLetter();
+            arrearVo.setFilesPath(guaranteeLetter);
+            list.add(arrearVo);
+            //=================================================
+            arrearVo = new ArrearVo();
+            arrearVo.setTitle("股东会对外担保决议");
+            arrearVo.setType(1);
+            arrearVo.setKey("gdLetter");
+            arrearVo.setNullAble(true);
+            List<String> gdLetter = advanceArrearsInfoVo.getGdLetter();
+            arrearVo.setFilesPath(gdLetter);
+            list.add(arrearVo);
+            //=================================================
+            arrearVo = new ArrearVo();
+            arrearVo.setTitle("总经理担保书");
+            arrearVo.setType(1);
+            arrearVo.setKey("zjlLetter");
+            arrearVo.setNullAble(false);
+            List<String> zjlLetter = advanceArrearsInfoVo.getZjlLetter();
+            arrearVo.setFilesPath(zjlLetter);
+            list.add(arrearVo);
+            arrearVo = new ArrearVo();
+            arrearVo.setTitle("其他附件");
+            arrearVo.setType(1);
+            arrearVo.setKey("fileList");
+            arrearVo.setNullAble(false);
+            List<String> fileList = advanceArrearsInfoVo.getFileList();
+            arrearVo.setFilesPath(fileList);
+            list.add(arrearVo);
+            arrearsVo.setList(list);
+        }
+        return rb.success().setData(arrearsVo);
+    }
 }