Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java

@@ -139,5 +139,7 @@ public interface BaseTrailerFeign {
     @GetMapping("/fetchByGcVinNo/{gcVinNo}")
     ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(@PathVariable("gcVinNo") String gcVinNo);
 
-
+    @ApiOperation("根据挂车车架号和车辆sid获取一条记录")
+    @PostMapping("/fetchByGcVinNoAndVehSid")
+    ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(@RequestParam("gcVinNo") String gcVinNo,@RequestParam("vehSid") String vehSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java

@@ -103,4 +103,9 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign {
 	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(String gcVinNo) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
+		return null;
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java

@@ -45,6 +45,7 @@ import com.yxt.anrui.base.biz.basedistributorapplyappendix.BaseDistributorApplyA
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
 import com.yxt.anrui.flowable.api.flowtask.DelegateQuery;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -2031,32 +2032,9 @@ public class BaseDistributorApplyService extends MybatisBaseService<BaseDistribu
      */
     public ResultBean delegate(DistributorDelegateQuery distributorDelegateQuery) {
         ResultBean rb = ResultBean.fireFail();
-        DelegateQuery delegateQuery = new DelegateQuery();
+        FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
         BeanUtil.copyProperties(distributorDelegateQuery, delegateQuery);
-        ResultBean delegate = flowTaskFeign.delegate(delegateQuery);
-        String userSid = distributorDelegateQuery.getUserSid();
-        String assignee = distributorDelegateQuery.getAssignee();
-        String instanceId = distributorDelegateQuery.getInstanceId();
-        String views = "";
-        if (StringUtils.isNotBlank(distributorDelegateQuery.getViews())) {
-            views = distributorDelegateQuery.getViews();
-        }
-        ResultBean<SysUserVo> userVoResultBean1 = sysUserFeign.fetchBySid(userSid);
-        String userName = "";
-        if (userVoResultBean1.getData() != null) {
-            userName = userVoResultBean1.getData().getName();
-        }
-        ResultBean<SysUserVo> userVoResultBean2 = sysUserFeign.fetchBySid(assignee);
-        ProcessCommentDto processCommentDto = new ProcessCommentDto();
-        processCommentDto.setReviewerSid(userSid);
-        if (userVoResultBean2.getData() != null) {
-            String changeName = userVoResultBean2.getData().getName();
-            processCommentDto.setReviewer(userName);
-            processCommentDto.setContent(userName + "加签给" + changeName + "：" + views);
-        }
-        processCommentDto.setTime(new Date());
-        processCommentDto.setProcessId(instanceId);
-        processCommentFeign.save(processCommentDto);
+        flowFeign.delegate(delegateQuery);
         return rb.success();
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -103,4 +103,7 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
 
     @Select("select * from base_trailer where vehSid = #{vehSid}")
     List<BaseTrailer> getByVehSid(@Param("vehSid") String vehSid);
+
+    @Select("select * from base_trailer where vinNo = #{gcVinNo} and vehSid = #{vehSid}")
+    BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo,@Param("vehSid") String vehSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java

@@ -131,4 +131,9 @@ public class BaseTrailerRest implements BaseTrailerFeign {
 	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(String gcVinNo) {
 		return baseTrailerService.fetchByGcVinNo(gcVinNo);
 	}
+
+	@Override
+	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
+		return baseTrailerService.fetchByGcVinNoAndVehSid(gcVinNo,vehSid);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -943,4 +943,10 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         List<BaseTrailer> baseTrailers = baseMapper.getByVehSid(vehSid);
         return rb.success().setData(baseTrailers);
     }
+
+    public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNoAndVehSid(gcVinNo,vehSid);
+        return rb.success().setData(baseTrailerDetailsVo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -100,14 +100,14 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     baseVehicleState.setCarryInvoiceState("1");
                 } else if (BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey().equals(operateType)) {
                     baseVehicleState.setCarryInvoiceState("0");
-                }else if (BaseVehicleStateEnum.OperateTypeEnum.JFZB.getTypeKey().equals(operateType)){
+                }/*else if (BaseVehicleStateEnum.OperateTypeEnum.JFZB.getTypeKey().equals(operateType)){
                     baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.JF.getBusNoKey());
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFZB.getStateKey());
                 }else if (BaseVehicleStateEnum.OperateTypeEnum.JFKC.getTypeKey().equals(operateType)){
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFKC.getStateKey());
                 }else if (BaseVehicleStateEnum.OperateTypeEnum.JFZLSH.getTypeKey().equals(operateType)){
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFZLSH.getStateKey());
-                }
+                }*/
                 baseMapper.updateById(baseVehicleState);
             } else {
                 if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey().equals(operateType)) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java

@@ -60,7 +60,7 @@ public class BusSalesOrderLoancontractDto implements Dto {
 	@ApiModelProperty("台数")
     private Integer vehCount;
 	@ApiModelProperty("消贷合同编号")
-    private String loanCotractNo;
+    private String loanContractNo;
 	@ApiModelProperty("资方合同号")
     private String bankContractNo;
     @ApiModelProperty("资方名称")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java

@@ -105,4 +105,8 @@ public interface BusSalesOrderLoancontractFeign {
     @ResponseBody
     ResultBean pushOtherReceivable(@RequestBody LoanOtherReceivablePush loanOtherReceivablePush);
 
+    @ApiOperation("根据销售订单sid查询")
+    @GetMapping("/fetchAllByOrderSid/{orderSid}")
+    @ResponseBody
+    public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSid(@PathVariable("orderSid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java

@@ -99,4 +99,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
 	public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSid(String sid) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -121,10 +121,10 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<List<String>> selectListByvinNo(@RequestParam("vinNo") String vinNo);
 
-    @ApiOperation("更新订单车辆的贷款人sid和消贷合同sid")
+    @ApiOperation("更新订单车辆的消贷合同sid")
     @PostMapping("/updateXDCon")
     @ResponseBody
-    ResultBean updateXDCon(@RequestParam("sid") String sid, @RequestParam("borrowerSid") String borrowerSid, @RequestParam("loanContractSid") String loanContractSid);
+    ResultBean updateXDCon(@RequestParam("sid") String sid, @RequestParam("loanContractSid") String loanContractSid);
 
     @ApiOperation("根据销售订单sid和车辆sid查询销售订单车辆信息")
     @PostMapping("/selectByOrderSidAndVehSid")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -114,7 +114,7 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
     }
 
     @Override
-    public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
+    public ResultBean updateXDCon(String sid, String loanContractSid) {
         return null;
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java

@@ -251,7 +251,7 @@ public class BusSalesOrderConstantUtils {
         /**
          * 载货车
          */
-        TRUCK("005", "载货车"),
+        TRUCK("5", "载货车"),
         /**
          * 牵引车
          */

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

@@ -162,6 +162,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.HomeVisitDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
@@ -5617,6 +5618,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
                 unCollectionDto.setKxState("01");
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+                //==========================================================
+                if(new BigDecimal(money).compareTo(BigDecimal.ZERO) == 0){//首付款及费用若为0
+                    //判断认款是否已认完，若已认完，则更新车辆状态为交清。
+
+                }
             }
         }
     }
@@ -7510,12 +7516,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (busSalesOrderBorrower != null) {
             return rb.setMsg("客户本人已存在贷款人中");
         }
+        //查询客户本人的资方信审状态是否通过
         BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
+        String customerSid = busSalesOrder.getCustomerSid();
+        LoanPreloanCreditApply loanPreloanCreditApply = busSalesOrderBorrowerService.selectLoanApply(customerSid);
+        if(loanPreloanCreditApply != null){
+            if(!"001".equals(loanPreloanCreditApply.getZffkjgKey())){
+                return rb.setMsg("该客户资方审核未通过或未审核，请处理后再操作");
+            }
+        }
         busSalesOrderBorrower = new BusSalesOrderBorrower();
         busSalesOrderBorrower.setSalesOrderSid(saleOrderSid);
         busSalesOrderBorrower.setCustomSid(busSalesOrder.getCustomerSid());
         busSalesOrderBorrower.setBorrowerName(busSalesOrder.getCustomerName());
         busSalesOrderBorrower.setMobile(busSalesOrder.getMobile());
+        LoanFinPolicy loanFinPolicy = busSalesOrderBorrowerService.selectBySid(saleOrderSid);
+        if (loanFinPolicy != null) {
+            busSalesOrderBorrower.setBankSid(loanFinPolicy.getBankSid());
+            busSalesOrderBorrower.setBankName(loanFinPolicy.getBankShortName());
+            busSalesOrderBorrower.setPolicyName(loanFinPolicy.getPolicyName());
+        }
         busSalesOrderBorrowerService.insert(busSalesOrderBorrower);
         return rb.success();
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java

@@ -94,4 +94,6 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
     BusSalesOrderBorrower selectByOrderSids(String saleOrderSid);
 
     LoanPreloanCreditApply selectByCr(String sid);
+
+    LoanPreloanCreditApply selectLoanApply(String customerSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml

@@ -90,4 +90,11 @@
         from anrui_riskcenter.loan_preloan_credit_apply
         where sid = #{sid}
     </select>
+
+    <select id="selectLoanApply"
+            resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply">
+        select *
+        from anrui_riskcenter.loan_preloan_credit_apply
+        where custSid = #{sid} order by id desc limit 1
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@@ -174,6 +174,10 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         return rb.success();
     }
 
+    public LoanFinPolicy selectBySid(String saleOrderSid){
+        return baseMapper.selectBySid(saleOrderSid);
+    }
+
     /**
      * 公司非担保业务进度维护
      *
@@ -308,4 +312,8 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
     public BusSalesOrderBorrower selectOrderSid(String saleOrderSid) {
         return baseMapper.selectByOrderSids(saleOrderSid);
     }
+
+    public LoanPreloanCreditApply selectLoanApply(String customerSid) {
+        return baseMapper.selectLoanApply(customerSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java

@@ -77,4 +77,7 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
 
     @Update("update bus_sales_order_loancontract set bankContractNo=#{bankContractNo},busNo='305',busName='放款资料审核' where sid=#{loanContractSid}")
     void updateBankConAndBusNo(@Param("loanContractSid") String loanContractSid,@Param("bankContractNo") String bankContractNo);
+
+    @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{sid}")
+    List<BusSalesOrderLoancontract> fetchAllByOrderSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java

@@ -128,4 +128,9 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
 	public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) {
 		return busSalesOrderLoancontractService.pushOtherReceivable(loanOtherReceivablePush);
 	}
+
+	@Override
+	public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSid(String sid) {
+		return busSalesOrderLoancontractService.fetchAllByOrderSid(sid);
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -479,4 +479,10 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         }
         return rb.success();
     }
+
+    public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = baseMapper.fetchAllByOrderSid(sid);
+        return rb.success().setData(busSalesOrderLoancontracts);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -144,8 +144,8 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     List<String> selectBySalesOrderSid(String saleOrderSid);
 
-    @Update("update bus_sales_order_vehicle set borrowerSid = #{borrowerSid},loanContractSid = #{loanContractSid} where sid = #{sid}")
-    void updateXDCon(@Param("sid") String sid, @Param("borrowerSid") String borrowerSid, @Param("loanContractSid") String loanContractSid);
+    @Update("update bus_sales_order_vehicle set loanContractSid = #{loanContractSid} where sid = #{sid}")
+    void updateXDCon(@Param("sid") String sid, @Param("loanContractSid") String loanContractSid);
 
     BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -129,8 +129,8 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
     }
 
     @Override
-    public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
-        return busSalesOrderVehicleService.updateXDCon(sid, borrowerSid, loanContractSid);
+    public ResultBean updateXDCon(String sid, String loanContractSid) {
+        return busSalesOrderVehicleService.updateXDCon(sid, loanContractSid);
     }
 
     @Override

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -568,9 +568,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectOneByVehSidAndOrderSid(vehSid, orderSid);
     }
 
-    public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
+    public ResultBean updateXDCon(String sid, String loanContractSid) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.updateXDCon(sid, borrowerSid, loanContractSid);
+        baseMapper.updateXDCon(sid, loanContractSid);
         return rb.success();
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@@ -444,6 +444,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
             flowProcessMapQuery.setProDefKey(busValcustFiling.getProcDefId());
         }
         flowProcessMapQuery.setVariables(variables);
+        flowProcessMapQuery.setContractNo(busValcustFiling.getContractNo());
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();
         //=======================================
         bv.setFormVariables(variables);
@@ -457,37 +458,227 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 if ("0".equals(busValcustFiling.getIsGdk())) {//高开
-                    String[] vinSids = busValcustFiling.getVinSid().split(",");
-                    for (String vinSid : vinSids) {
-                        FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
-                        finUncollectedReceivablesDetailedDto.setCreateByName(busValcustFiling.getCreateByName());
-                        finUncollectedReceivablesDetailedDto.setCreateBySid(busValcustFiling.getCreateBySid());
-                        finUncollectedReceivablesDetailedDto.setContractNo(busValcustFiling.getContractNo());
-                        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busValcustFiling.getSaleOrderSid());
-                        finUncollectedReceivablesDetailedDto.setCustomerSid(busSalesOrder.getCustomerSid());
-                        finUncollectedReceivablesDetailedDto.setCustomerName(busSalesOrder.getCustomerName());
-                        BaseVehicle baseVehicle = baseVehicleFeign.fetchBySid(vinSid).getData();
-                        finUncollectedReceivablesDetailedDto.setVIN(baseVehicle.getVinNo());
-                        finUncollectedReceivablesDetailedDto.setCustomerPhone(busSalesOrder.getMobile());
-                        finUncollectedReceivablesDetailedDto.setUseOrgSid(busValcustFiling.getUseOrgSid());
-                        finUncollectedReceivablesDetailedDto.setReceivablesName("加装配置手续费");
-                        finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(busValcustFiling.getSsMoney());
-                        finUncollectedReceivablesDetailedDto.setReveivableMoney(busValcustFiling.getSsMoney());
-                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busValcustFiling.getContractNo(), vinSid);
-                        finUncollectedReceivablesDetailedDto.setOrgSidPath(busValcustFiling.getOrgSidPath());
-                        finUncollectedReceivablesDetailedDto.setBusVinSid(busSalesOrderVehicle.getSid());
-                        finUncollectedReceivablesDetailedDto.setPayTypeKey(busSalesOrder.getPayTypeKey());
-                        finUncollectedReceivablesDetailedDto.setPayType(busSalesOrder.getPayType());
-                        finUncollectedReceivablesDetailedDto.setUseOrgName(busValcustFiling.getUseOrgName());
-                        finUncollectedReceivablesDetailedDto.setKxState("01");
-                        finUncollectedReceivablesDetailedDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
-                        finUncollectedReceivablesDetailedDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
-                        finUncollectedReceivablesDetailedDto.setStaffName(busSalesOrder.getStaffName());
-                        SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
-                        finUncollectedReceivablesDetailedDto.setStaffUserSid(sysUserVo.getSid());
-                        finUncollectedReceivablesDetailedDto.setStaffDeptSid(busSalesOrder.getOrgSid());
-                        finUncollectedReceivablesDetailedDto.setStaffDeptName(busSalesOrder.getOrgName());
-                        finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
+                    String ssMoney = busValcustFiling.getSsMoney();
+                    int i = Integer.parseInt(ssMoney);
+                    if (i == 0){
+                        if ("1".equals(busValcustFiling.getBusSource())) {
+                            BusBillApplication busBillApplication = busBillApplicationService.fetchBySid(busValcustFiling.getBusSid());
+                            List<BusBillVehicleVo> busBillVehicleVos = busBillVehicleService.fetchVehBySid(busBillApplication.getSid());
+                            List<BusBillTrailerVo> busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid());
+                            for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) {
+                                int count = finVehicleInvoiceFeign.selectCountByVinSid(busBillVehicleVo.getVehSid()).getData();
+                                if (count == 0) {
+                                    FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+                                    finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName());
+                                    finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo());
+                                    finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName());
+                                    finVehicleInvoiceDto.setVehicleSid(busBillVehicleVo.getVehSid());
+                                    finVehicleInvoiceDto.setVIN(busBillVehicleVo.getVinNo());
+                                    finVehicleInvoiceDto.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey());
+                                    finVehicleInvoiceDto.setInvoiceType(busBillVehicleVo.getBillTypeValue());
+                                    finVehicleInvoiceDto.setInvoiceAmount(busBillApplication.getOneBillMoney());
+                                    finVehicleInvoiceDto.setBillingStateKey("001");
+                                    finVehicleInvoiceDto.setBillingState("未开票");
+                                    finVehicleInvoiceDto.setTransferStateKey("001");
+                                    finVehicleInvoiceDto.setTransferState("未移交");
+                                    finVehicleInvoiceDto.setVehicleType("主车");
+                                    finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid());
+                                    finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName());
+                                    finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid());
+                                    BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyService.selComByVehSid(busBillVehicleVo.getVehSid()).getData();
+                                    if (busArrearsCarryVehicleApplyVo == null) {
+                                        finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey());
+                                        finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
+                                    } else {
+                                        finVehicleInvoiceDto.setBusinessStateKey("005");
+                                        finVehicleInvoiceDto.setBusinessState("欠款提车");
+                                    }
+                                    finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
+                                    FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid()).getData();
+                                    if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                        finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+                                        finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+                                        finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+                                        finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                                        finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                                    } else {
+                                        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillVehicleVo.getOpenTickSid()).getData();
+                                        finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                        finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                    }
+                                    finVehicleInvoiceDto.setIsTakeTicket("是");
+                                    finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
+                                }
+                            }
+                            if (busBillTrailerVos != null) {
+                                for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) {
+                                    String gcVinNo = busBillTrailerVo.getGcVinNo();
+                                    BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
+                                    int count = finVehicleInvoiceFeign.selectCountByVinSid(baseTrailerDetailsVo.getSid()).getData();
+                                    if (count == 0) {
+                                        FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+                                        finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName());
+                                        finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo());
+                                        finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName());
+                                        finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
+                                        finVehicleInvoiceDto.setVIN(gcVinNo);
+                                        finVehicleInvoiceDto.setInvoiceTypeKey(busBillTrailerVo.getBillTypeKey());
+                                        finVehicleInvoiceDto.setInvoiceType(busBillTrailerVo.getBillTypeValue());
+                                        finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(busBillTrailerVo.getOneBillMoney()));
+                                        finVehicleInvoiceDto.setBillingStateKey("001");
+                                        finVehicleInvoiceDto.setBillingState("未开票");
+                                        finVehicleInvoiceDto.setTransferStateKey("001");
+                                        finVehicleInvoiceDto.setTransferState("未移交");
+                                        finVehicleInvoiceDto.setVehicleType("挂车");
+                                        finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid());
+                                        finVehicleInvoiceDto.setInvoicingName(busBillTrailerVo.getOpenTickName());
+                                        finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid());
+                                        finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey());
+                                        finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
+                                        finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
+                                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid()).getData();
+                                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                            finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+                                            finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+                                            finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+                                            finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                                            finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                                        } else {
+                                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData();
+                                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                        }
+                                        finVehicleInvoiceDto.setIsTakeTicket("是");
+                                        finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
+                                    }
+                                }
+                            }
+                        } else {
+                            FinBillApplication finBillApplication = finBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData();
+                            List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleFeign.fetchVehBySid(busValcustFiling.getBusSid()).getData();
+                            List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerFeign.fetchByMainSid(busValcustFiling.getBusSid()).getData();
+                            for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                                int count = finVehicleInvoiceFeign.selectCountByVinSid(finBillVehicleVo.getVehSid()).getData();
+                                if (count == 0) {
+                                    FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+                                    finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
+                                    finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
+                                    finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
+                                    finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
+                                    finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
+                                    finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
+                                    finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
+                                    finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
+                                    finVehicleInvoiceDto.setBillingStateKey("001");
+                                    finVehicleInvoiceDto.setBillingState("未开票");
+                                    finVehicleInvoiceDto.setTransferStateKey("001");
+                                    finVehicleInvoiceDto.setTransferState("未移交");
+                                    finVehicleInvoiceDto.setVehicleType("主车");
+                                    finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
+                                    finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
+                                    finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
+                                    BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyService.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
+                                    if (busArrearsCarryVehicleApplyVo == null) {
+                                        finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                                        finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                                    } else {
+                                        finVehicleInvoiceDto.setBusinessStateKey("005");
+                                        finVehicleInvoiceDto.setBusinessState("欠款提车");
+                                    }
+                                    finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                                    FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()).getData();
+                                    if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                        finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+                                        finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+                                        finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+                                        finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                                        finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                                    } else {
+                                        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
+                                        finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                        finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                    }
+                                    finVehicleInvoiceDto.setIsTakeTicket("是");
+                                    finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
+                                }
+                            }
+                            if (finBillTrailerVos != null) {
+                                for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                                    String gcVinNo = finBillTrailerVo.getGcVinNo();
+                                    BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
+                                    int count = finVehicleInvoiceFeign.selectCountByVinSid(baseTrailerDetailsVo.getSid()).getData();
+                                    if (count == 0) {
+                                        FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+                                        finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
+                                        finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
+                                        finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
+                                        finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
+                                        finVehicleInvoiceDto.setVIN(gcVinNo);
+                                        finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
+                                        finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
+                                        finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
+                                        finVehicleInvoiceDto.setBillingStateKey("001");
+                                        finVehicleInvoiceDto.setBillingState("未开票");
+                                        finVehicleInvoiceDto.setTransferStateKey("001");
+                                        finVehicleInvoiceDto.setTransferState("未移交");
+                                        finVehicleInvoiceDto.setVehicleType("挂车");
+                                        finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
+                                        finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
+                                        finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
+                                        finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                                        finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                                        finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()).getData();
+                                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                            finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+                                            finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+                                            finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+                                            finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                                            finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                                        } else {
+                                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
+                                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                        }
+                                        finVehicleInvoiceDto.setIsTakeTicket("是");
+                                        finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
+                                    }
+                                }
+                            }
+                        }
+                    }else {
+                        String[] vinSids = busValcustFiling.getVinSid().split(",");
+                        for (String vinSid : vinSids) {
+                            FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
+                            finUncollectedReceivablesDetailedDto.setCreateByName(busValcustFiling.getCreateByName());
+                            finUncollectedReceivablesDetailedDto.setCreateBySid(busValcustFiling.getCreateBySid());
+                            finUncollectedReceivablesDetailedDto.setContractNo(busValcustFiling.getContractNo());
+                            BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busValcustFiling.getSaleOrderSid());
+                            finUncollectedReceivablesDetailedDto.setCustomerSid(busSalesOrder.getCustomerSid());
+                            finUncollectedReceivablesDetailedDto.setCustomerName(busSalesOrder.getCustomerName());
+                            BaseVehicle baseVehicle = baseVehicleFeign.fetchBySid(vinSid).getData();
+                            finUncollectedReceivablesDetailedDto.setVIN(baseVehicle.getVinNo());
+                            finUncollectedReceivablesDetailedDto.setCustomerPhone(busSalesOrder.getMobile());
+                            finUncollectedReceivablesDetailedDto.setUseOrgSid(busValcustFiling.getUseOrgSid());
+                            finUncollectedReceivablesDetailedDto.setReceivablesName("加装配置手续费");
+                            finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(busValcustFiling.getSsMoney());
+                            finUncollectedReceivablesDetailedDto.setReveivableMoney(busValcustFiling.getSsMoney());
+                            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busValcustFiling.getContractNo(), vinSid);
+                            finUncollectedReceivablesDetailedDto.setOrgSidPath(busValcustFiling.getOrgSidPath());
+                            finUncollectedReceivablesDetailedDto.setBusVinSid(busSalesOrderVehicle.getSid());
+                            finUncollectedReceivablesDetailedDto.setPayTypeKey(busSalesOrder.getPayTypeKey());
+                            finUncollectedReceivablesDetailedDto.setPayType(busSalesOrder.getPayType());
+                            finUncollectedReceivablesDetailedDto.setUseOrgName(busValcustFiling.getUseOrgName());
+                            finUncollectedReceivablesDetailedDto.setKxState("01");
+                            finUncollectedReceivablesDetailedDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
+                            finUncollectedReceivablesDetailedDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
+                            finUncollectedReceivablesDetailedDto.setStaffName(busSalesOrder.getStaffName());
+                            SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
+                            finUncollectedReceivablesDetailedDto.setStaffUserSid(sysUserVo.getSid());
+                            finUncollectedReceivablesDetailedDto.setStaffDeptSid(busSalesOrder.getOrgSid());
+                            finUncollectedReceivablesDetailedDto.setStaffDeptName(busSalesOrder.getOrgName());
+                            finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
+                        }
                     }
                 } else {
                     if ("1".equals(busValcustFiling.getBusSource())) {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java

@@ -144,4 +144,6 @@ public class FinBillApplication extends BaseEntity {
     private String reason;
     @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
     private String qkkpBillNo;
+    @ApiModelProperty("是否为单独新增")
+    private String showBtnStr;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@@ -158,6 +158,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private String orgSidPath;
     @ApiModelProperty("是否显示价值客户")
     private Boolean showValueCustomer;
+    @ApiModelProperty("是否为单独新增")
+    private String showBtnStr;
 
     @ApiModelProperty("开票车辆信息")
     private List<FinBillVehicleVo> finBillVehicles; // 开票车辆信息

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java

@@ -148,6 +148,8 @@ public class FinBillApplicationDto implements Dto {
     private String reason;
     @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
     private String qkkpBillNo;
+    @ApiModelProperty("是否为单独新增")
+    private String showBtnStr;
 
     @ApiModelProperty("开票车辆信息")
     private List<FinBillVehicleDto> finBillVehicles;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java

@@ -67,6 +67,11 @@ public interface FinBillApplicationFeign {
     @ResponseBody
     public ResultBean<PagerVo<FinBillApplicationVo>> listPage(@RequestBody PagerQuery<FinBillApplicationQuery> pq);
 
+    @ApiOperation("开票申请选择车辆")
+    @PostMapping("/getSelectVinsList")
+    @ResponseBody
+    public ResultBean<PagerVo<PcSelBillVinNoPageVo>> getSelectVinsList(@RequestBody PagerQuery<PcSelBillVinNoQuery> pagerQuery);
+
     @ApiOperation("欠款开票分页列表")
     @PostMapping("/listPageQK")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java

@@ -60,6 +60,11 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
 		return rb.setMsg("接口anrui-fin/finbillapplication/listPage无法访问");
 	}
 
+	@Override
+	public ResultBean<PagerVo<PcSelBillVinNoPageVo>> getSelectVinsList(PagerQuery<PcSelBillVinNoQuery> pagerQuery) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<FinBillApplicationVo>> listPageQK(PagerQuery<FinBillApplicationQuery> pq) {
 		return null;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java

@@ -103,4 +103,6 @@ public class FinBillApplicationVo implements Vo {
     private String orderSid;
     @ApiModelProperty("是否可以操作")
     private Boolean isCZ;
+    @ApiModelProperty("是否为单独新增")
+    private String showBtnStr;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillGcVo.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.fin.api.finbillapplication;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PcSelBillGcVo implements Vo {
+
+    @ApiModelProperty("主车车架号")
+    private String vinNo;
+    @ApiModelProperty("挂车车架号")
+    private String gcVinNo;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java

@@ -0,0 +1,68 @@
+package com.yxt.anrui.fin.api.finbillapplication;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PcSelBillVinNoPageVo implements Vo {
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("发起人sid")
+    private String userSid;
+    @ApiModelProperty("发起人名称")
+    private String userName;
+    @ApiModelProperty("发起人部门sid")
+    private String deptSid;
+    @ApiModelProperty("发起人部门名称")
+    private String deptName;
+    @ApiModelProperty("发起日期")
+    private String applyDate;
+    @ApiModelProperty("销售订单sid")
+    private String busSalesOrderSid;
+    @ApiModelProperty("单台开票金额")
+    private String kpMoney;
+    @ApiModelProperty("销售类型key")
+    private String saleTypeKey;
+    @ApiModelProperty("销售类型")
+    private String saleType;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("销售人员sid")
+    private String staffSid;
+    @ApiModelProperty("销售人员")
+    private String sellerName;
+    @ApiModelProperty("销售部门sid")
+    private String staffDeptSid;
+    @ApiModelProperty("销售部门")
+    private String sellerDept;
+    @ApiModelProperty("开票单位")
+    private String invoicingUnit;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("合格证状态key")
+    private String certificateStateKey;
+    @ApiModelProperty("合格证状态value")
+    private String certificateState;
+    @ApiModelProperty("主车合格证图片")
+    private List<String> zcHgzImages;
+
+    @ApiModelProperty("挂车信息")
+    private List<PcSelBillGcVo> finBillTrailers;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto <br/>
+ * Description: 开票挂车信息表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class PcSelBillVinNoQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+	@ApiModelProperty("组织全路径")
+    private String orgPath;
+	@ApiModelProperty("合同号")
+    private String contractId;
+	@ApiModelProperty("已选车架号")
+    private List<String> vins;
+	@ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java

@@ -60,6 +60,8 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
 
     IPage<FinBillApplicationVo> selectPageVo(IPage<FinBillApplication> page, @Param(Constants.WRAPPER) Wrapper<FinBillApplication> qw);
 
+    IPage<PcSelBillVinNoPageVo> getSelectVinsList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw);
+
     List<FinBillApplicationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinBillApplication> qw);
 
     @Select("select * from fin_bill_application")
@@ -82,4 +84,5 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
 
     @Update("update fin_bill_application set nodeState = '终止' where sid = #{businessSid}")
     void updateZZ(String businessSid);
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@@ -93,4 +93,39 @@
         where qkkpBillNo = #{qkkpBillNo}
         ORDER BY createTime DESC LIMIT 1
     </select>
+
+    <select id="getSelectVinsList" resultType="com.yxt.anrui.fin.api.finbillapplication.PcSelBillVinNoPageVo">
+        SELECT DISTINCT
+        bo.`sid` AS busSalesOrderSid,
+        bo.`payTypeKey` AS saleTypeKey,
+        bo.`payType` AS saleType,
+        bo.`contractNo` AS contractId,
+        bo.`staffSid`,
+        bo.`staffName` AS sellerName,
+        bo.`orgSid` AS staffDeptSid,
+        bo.`orgName` AS sellerDept,
+        bo.`customerSid`,
+        bo.`customerName` AS NAME,
+        bv.`linkNo` AS vin,
+        bv.`linkSid` AS vinSid,
+        bc.`certificateState` AS certificateStateKey,
+        bc.`certificateStateValue` AS certificateState,
+        bo.`purchaseSystemSid`,
+        bm.`modelName`,
+        bm.`modelSid`,
+        bo.`oneBillMoney` AS kpMoney
+        FROM
+        anrui_buscenter.`bus_sales_order_vehicle` bv
+        JOIN anrui_buscenter.`bus_sales_order` bo
+        ON bv.`salesOrderSid` = bo.`sid`
+        JOIN anrui_base.base_vehicle_state bs
+        ON bv.`sid` = bs.`busSid`
+        JOIN anrui_base.`base_vehicle_certificate` bc
+        ON bv.`linkSid` = bc.`vehicleSid`
+        JOIN anrui_buscenter.`bus_sales_order_model` bm
+        ON bv.`salesOrderSid` = bm.`salesOrderSid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java

@@ -76,6 +76,13 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<PcSelBillVinNoPageVo>> getSelectVinsList(PagerQuery<PcSelBillVinNoQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PcSelBillVinNoPageVo> pv = finBillApplicationService.getSelectVinsList(pq);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean<PagerVo<FinBillApplicationVo>> listPageQK(PagerQuery<FinBillApplicationQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -388,6 +388,74 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         return p;
     }
 
+    public PagerVo<PcSelBillVinNoPageVo> getSelectVinsList(PagerQuery<PcSelBillVinNoQuery> pq) {
+        PcSelBillVinNoQuery query = pq.getParams();
+        QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+        qw.eq("bo.payTypeKey", "2");
+        qw.eq("bs.busState", "401");
+        qw.eq("bs.finState", "1");
+        qw.eq("bs.carryInvoiceState", "0");
+        qw.eq("bs.invoiceApplyState", "0");
+        qw.eq("bo.useOrgSid", useOrgSid);
+        if (StringUtils.isNotBlank(query.getContractId())) {
+            qw.eq("bo.contractNo", query.getContractId());
+        }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.eq("bo.customerName", query.getName());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.eq("bv.linkNo", query.getVinNo());
+        }
+        if (query.getVins() != null && query.getVins().size() > 0) {
+            qw.notIn("bv.linkSid", query.getVins());
+        }
+        //移动端条件
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> wrapper.like("bo.contractNo", query.getName()).or().like("bo.customerName", query.getName()));
+        }
+        IPage page = PagerUtil.queryToPage(pq);
+        IPage<PcSelBillVinNoPageVo> pagging = baseMapper.getSelectVinsList(page, qw);
+        for (PcSelBillVinNoPageVo record : pagging.getRecords()) {
+            //开票单位
+            if (StringUtils.isNotBlank(record.getPurchaseSystemSid())) {
+                ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid, record.getPurchaseSystemSid());
+                if (invoicingDetailsVoResultBean.getData() != null) {
+                    record.setInvoicingUnit(invoicingDetailsVoResultBean.getData().getName());
+                }
+            }
+            //主车合格证照片
+            BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(record.getVinSid()).getData();
+            if (baseVehicleCertificateVo != null) {
+                List<String> clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
+                record.setZcHgzImages(clhgeImages);
+            }
+            //挂车信息
+            TraliveredVo data = baseTrailerFeign.trailerList(record.getVinSid(), record.getContractId()).getData();
+            List<TrailerVo> list = data.getList();
+            List<PcSelBillGcVo> pcSelBillGcVos = new ArrayList<>();
+            if (list != null && list.size() > 0) {
+                for (TrailerVo trailerVo : list) {
+                    PcSelBillGcVo pcSelBillGcVo = new PcSelBillGcVo();
+                    pcSelBillGcVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                    pcSelBillGcVo.setVinNo(data.getVinNo());
+                    pcSelBillGcVos.add(pcSelBillGcVo);
+                }
+            }
+            record.setFinBillTrailers(pcSelBillGcVos);
+            record.setUserSid(query.getUserSid());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
+            record.setUserName(sysUserVo.getName());
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData();
+            record.setDeptSid(sysOrganizationVo.getSid());
+            record.setDeptName(sysOrganizationVo.getName());
+            record.setApplyDate(DateUtil.formatDate(new Date()));
+            record.setUseOrgSid(useOrgSid);
+        }
+        PagerVo<PcSelBillVinNoPageVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public ResultBean<String> saveOrUpdateDto(FinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
@@ -415,12 +483,27 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 String vehSid = finBillVehicleDto.getVehSid();
                 TraliveredVo data = baseTrailerFeign.trailerList(vehSid, dto.getContractNo()).getData();
                 List<TrailerVo> list = data.getList();
-                for (TrailerVo trailerVo : list) {
-                    FinBillTrailer finBillTrailer = new FinBillTrailer();
-                    finBillTrailer.setGcVinNo(trailerVo.getTrailerVinNo());
-                    finBillTrailer.setVinNo(finBillVehicleDto.getVinNo());
-                    finBillTrailer.setBillAppSid(finBillApplication.getSid());
-                    finBillTrailerService.save(finBillTrailer);
+                if (finBillTrailers != null && finBillTrailers.size() > 0) {
+                    for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
+                        FinBillTrailer finBillTrailer = new FinBillTrailer();
+                        BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
+                        finBillTrailer.setBillAppSid(finBillApplication.getSid());
+                        if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
+                            finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
+                            finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
+                            finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
+                            finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
+                            finBillTrailerService.save(finBillTrailer);
+                        }
+                    }
+                } else {
+                    for (TrailerVo trailerVo : list) {
+                        FinBillTrailer finBillTrailer = new FinBillTrailer();
+                        finBillTrailer.setGcVinNo(trailerVo.getTrailerVinNo());
+                        finBillTrailer.setVinNo(finBillVehicleDto.getVinNo());
+                        finBillTrailer.setBillAppSid(finBillApplication.getSid());
+                        finBillTrailerService.save(finBillTrailer);
+                    }
                 }
             }
             //附件信息
@@ -614,7 +697,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
                 FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid).get(0);
                 finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
-                BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData();
+                BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData();
                 List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
                 List<String> hgzImageUrls = new ArrayList<>();
                 for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -862,6 +862,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             } else {
                 collectionDetailDtoOne.setExTaxMoney(listOne.get(0).getDcje().toString());
             }
+            collectionDetailDtoOne.setUseTo("YT018");
             collectionDetailDtoListOne.add(collectionDetailDtoOne);
             otherReceivableOne.setCollectionDetails(collectionDetailDtoListOne);
             otherReceivableBillService.otherReceivableBillService(otherReceivableOne);
@@ -882,6 +883,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 } else {
                     collectionDetailDtoMany.setExTaxMoney(tzDto.getDcje().toString());
                 }
+                collectionDetailDtoMany.setUseTo("YT018");
                 collectionDetailDtoListMany.add(collectionDetailDtoMany);
                 otherReceivableMany.setCollectionDetails(collectionDetailDtoListMany);
                 otherReceivableBillService.otherReceivableBillService(otherReceivableMany);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@@ -267,7 +267,7 @@
                co.collectionTypeValue,
                fs.subscriptionMoney as subscriptionMoneyAll,
                co.remarks,
-               fs.subscriptionDate,
+               co.collectionDate    as subscriptionDate,
                co.collectionBankNum,
                co.receivingName,
                co.payerName,

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowDelegateQuery.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.flowable.api.flow2;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/10/8 15:58
+ */
+@Data
+public class FlowDelegateQuery {
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+//    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java

@@ -3,7 +3,6 @@ package com.yxt.anrui.flowable.api.flow2;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.core.result.ResultBean;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -41,4 +40,10 @@ public interface FlowFeign {
     @GetMapping(value = "/getMessageReminder")
     @ResponseBody
     ResultBean<FlowableMessageVo> getMessageReminder(@RequestParam("proDefId") String proDefId, @RequestParam("proInstId") String proInstId);
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    public ResultBean delegate(@RequestBody FlowDelegateQuery flowDelegateQuery);
+
+
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java

@@ -1,34 +1,21 @@
 package com.yxt.anrui.flowable.biz.flow2;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
 import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo;
-import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
-import com.yxt.anrui.flowable.biz.process.ProcessService;
-import com.yxt.anrui.flowable.feign.MessageFeign;
-import com.yxt.anrui.flowable.feign.form.MessageFlowVo;
-import com.yxt.anrui.flowable.feign.form.MessageFlowableQuery;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
-import com.yxt.anrui.portal.api.sysflowcc.SysFlowccFeign;
-import com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.UserByRolesAndOrgQuery;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
-import org.flowable.engine.HistoryService;
-import org.flowable.task.api.history.HistoricTaskInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -111,5 +98,10 @@ public class FlowRest implements FlowFeign {
         return flowService.getMessageReminder(proDefId,proInstId);
     }
 
+    @Override
+    public ResultBean delegate(FlowDelegateQuery flowDelegateQuery) {
+        return flowService.delegate(flowDelegateQuery);
+    }
+
 
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@@ -1,31 +1,27 @@
 package com.yxt.anrui.flowable.biz.flow2;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.flowable.api.flow.Flowable;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
 import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
-import com.yxt.anrui.flowable.api.flowtask.FlowTask;
-import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.DelegateQuery;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
-import com.yxt.anrui.flowable.biz.flowtask.FlowTaskMapper;
 import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService;
 import com.yxt.anrui.flowable.biz.process.ExpressionCmd;
 import com.yxt.anrui.flowable.biz.process.ProcessService;
 import com.yxt.anrui.flowable.biz.processcomment.ProcessCommentService;
 import com.yxt.anrui.flowable.common.ProcessConstants;
-import com.yxt.anrui.flowable.exception.CustomException;
 import com.yxt.anrui.flowable.feign.MessageFeign;
 import com.yxt.anrui.flowable.feign.form.MessageFlowVo;
 import com.yxt.anrui.flowable.feign.form.MessageFlowableQuery;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
-import com.yxt.anrui.flowable.utils.FlowableUtils;
 import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigFeign;
 import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigQuery;
 import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVvo;
@@ -37,16 +33,10 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.bpmn.model.*;
-import org.flowable.bpmn.model.Process;
-import org.flowable.common.engine.api.FlowableException;
-import org.flowable.common.engine.api.FlowableObjectNotFoundException;
 import org.flowable.common.engine.impl.identity.Authentication;
 import org.flowable.engine.*;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.history.HistoricActivityInstance;
 import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.engine.runtime.Execution;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.DelegationState;
 import org.flowable.task.api.Task;
@@ -711,8 +701,8 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
         String assignee = (String) processVariables.get("assignee");
         ResultBean<SysUserVo> stringResultBean = sysUserFeign.fetchBySid(assignee);
         String assigneeName = "";
-        if(stringResultBean.getData() != null){
-            assigneeName= stringResultBean.getData().getName();
+        if (stringResultBean.getData() != null) {
+            assigneeName = stringResultBean.getData().getName();
         }
 
         Map<String, Object> app = new HashMap<>();
@@ -722,7 +712,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
         log.info("抄送方法-historicTaskInstance:{}", JSONObject.toJSONString(historicTaskInstance));
         mfq.setAppMap(app);
         mfq.setBusinessSid(bv.getBusinessSid());
-        mfq.setMsgContent(assigneeName+"抄送的流程审批,请查看");
+        mfq.setMsgContent(assigneeName + "抄送的流程审批,请查看");
 //        act_re_procdef
         Map<String, String> process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId());
         log.info("抄送成功-process:{}", process);
@@ -770,7 +760,92 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
 
     public ResultBean<FlowableMessageVo> getMessageReminder(String proDefId, String proInstId) {
         ResultBean<FlowableMessageVo> rb = ResultBean.fireFail();
-        FlowableMessageVo flowableMessageVo = baseMapper.getMessageReminder(proDefId,proInstId);
+        FlowableMessageVo flowableMessageVo = baseMapper.getMessageReminder(proDefId, proInstId);
         return rb.success().setData(flowableMessageVo);
     }
+
+    public ResultBean delegate(FlowDelegateQuery flowDelegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        DelegateQuery delegateQuery = new DelegateQuery();
+        BeanUtil.copyProperties(flowDelegateQuery, delegateQuery);
+        ResultBean delegate = flowTaskService.delegate(delegateQuery);
+        String userSid = flowDelegateQuery.getUserSid();
+        String assigneeSid = flowDelegateQuery.getAssignee();
+        String instanceId = flowDelegateQuery.getInstanceId();
+        String views = "";
+        if (StringUtils.isNotBlank(flowDelegateQuery.getViews())) {
+            views = flowDelegateQuery.getViews();
+        }
+        ResultBean<SysUserVo> userVoResultBean1 = sysUserFeign.fetchBySid(userSid);
+        String userName = "";
+        if (userVoResultBean1.getData() != null) {
+            userName = userVoResultBean1.getData().getName();
+        }
+        ResultBean<SysUserVo> userVoResultBean2 = sysUserFeign.fetchBySid(assigneeSid);
+        ProcessCommentDto processCommentDto = new ProcessCommentDto();
+        processCommentDto.setReviewerSid(userSid);
+        if (userVoResultBean2.getData() != null) {
+            String changeName = userVoResultBean2.getData().getName();
+            processCommentDto.setReviewer(userName);
+            processCommentDto.setContent(userName + "加签给" + changeName + "：" + views);
+        }
+        processCommentDto.setTime(new Date());
+        processCommentDto.setProcessId(instanceId);
+        processCommentService.saveOrUpdateDto(processCommentDto);
+        //加签内容推送至待阅
+        HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                .includeProcessVariables().taskId(delegateQuery.getTaskId()).singleResult();
+        if (historicTaskInstance == null) {
+            return rb.setMsg("分享失败！");
+        }
+        MessageFlowVo messageFlowVo = new MessageFlowVo();
+        String procDefId = historicTaskInstance.getProcessDefinitionId();
+        String procInsId = historicTaskInstance.getProcessInstanceId();
+        String nodeState = historicTaskInstance.getName();
+        String taskDefKey = historicTaskInstance.getTaskDefinitionKey();
+        messageFlowVo.setProcDefId(procDefId);
+        messageFlowVo.setTaskId(delegateQuery.getTaskId());
+        messageFlowVo.setNodeState(nodeState);
+        messageFlowVo.setProcInsId(procInsId);
+        messageFlowVo.setTaskDefKey(taskDefKey);
+        Map<String, Object> processVariables = historicTaskInstance.getProcessVariables();
+        MessageFlowableQuery mfq = new MessageFlowableQuery();
+        mfq.setUfVo(messageFlowVo);
+        String createrOrgPath = (String) processVariables.get("createrOrgPath");
+        if (historicTaskInstance == null) {
+            return rb.setMsg("分享失败！");
+        }
+        //
+        String assignee = (String) processVariables.get("assignee");
+        ResultBean<SysUserVo> stringResultBean = sysUserFeign.fetchBySid(assignee);
+        String assigneeName = "";
+        if (stringResultBean.getData() != null) {
+            assigneeName = stringResultBean.getData().getName();
+        }
+
+        Map<String, Object> app = new HashMap<>();
+        if (processVariables.get("app") != null) {
+            app = (Map<String, Object>) processVariables.get("app");
+        }
+        mfq.setAppMap(app);
+        String businessSid = (String) processVariables.get("businessSid");
+        mfq.setBusinessSid(businessSid);
+        mfq.setMsgContent(userName + "分享的流程审批,请查看");
+//        act_re_procdef
+        Map<String, String> process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId());
+
+        mfq.setModuleName(process.get("NAME_"));
+        if (processVariables.containsKey("orderNames")) {
+            mfq.setMsgTitle(processVariables.get("orderNames").toString());
+        } else {
+            mfq.setMsgTitle(process.get("NAME_"));
+        }
+        mfq.setUserSids(assigneeSid);
+        mfq.setOrgPath(createrOrgPath);
+        mfq.setUserSid(assignee);
+        mfq.setApplicationName(assigneeName);
+        ResultBean<String> resultBean = messageFeign.pushMessageShare(mfq);
+        return rb.success();
+
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java

@@ -51,6 +51,11 @@ public interface LoanFinOtherPolicyFeign {
     @ApiOperation("获取产品政策下其他融，或分公司下其他融")
     ResultBean<List<OtherPolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid ,@RequestParam(value = "period", required = false) String period);
 
+
+    @GetMapping("selectList2")
+    @ApiOperation("移动端产品政策下其他融")
+    ResultBean<List<OtherPolicyVo>> selectList2(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid ,@RequestParam(value = "period", required = false) String period);
+
     @ApiOperation("使用状态停用、开启:useState为1时走停用，为0时走开启")
     @PostMapping("setState")
     ResultBean setState(@RequestBody LoanFinOtherPolicyStateQuery query);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java

@@ -54,6 +54,11 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign {
         return loanFinOtherPolicyService.selectList(orgPath,userSid,sid,name,modelSid ,period);
     }
 
+    @Override
+    public ResultBean<List<OtherPolicyVo>> selectList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) {
+        return loanFinOtherPolicyService.selectList2(orgPath,userSid,sid,name,modelSid ,period);
+    }
+
     @Override
     public ResultBean setState(LoanFinOtherPolicyStateQuery query) {
         return loanFinOtherPolicyService.setState(query);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@@ -109,6 +109,23 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
         }
         return rb.success().setData(list);
 
+    }
+
+    public ResultBean<List<OtherPolicyVo>> selectList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) {
+        ResultBean<List<OtherPolicyVo>> rb = ResultBean.fireFail();
+        if(StringUtils.isNotBlank(sid)){
+            List<OtherPolicyVo> list = baseMapper.selectListOne(sid, name);
+            list.removeAll(Collections.singleton(null));
+            if (list.isEmpty()) {
+                return rb.success().setData(new ArrayList<>());
+            }
+            return rb.success().setData(list);
+        }else{
+            return rb.success().setData(new ArrayList<>());
+        }
+
+
+
     }
 
     public PagerVo<LoanFinOtherPolicyPageVo> listPageVo(PagerQuery<LoanFinOtherPolicyQuery> pq) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java

@@ -345,6 +345,14 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
                     LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(policySid);
                     loanFinPolicy.setFilingState(2);
                     loanFinPolicyService.updateById(loanFinPolicy);
+                    List<LoanFinOtherPolicy> otherPolicyList = loanFinOtherPolicyService.fetchByMainSid(policySid);
+                    otherPolicyList.removeAll(Collections.singleton(null));
+                    if (!otherPolicyList.isEmpty()) {
+                        for (LoanFinOtherPolicy loanFinOtherPolicy : otherPolicyList) {
+                            loanFinOtherPolicy.setFilingState(2);
+                            loanFinOtherPolicyService.updateById(loanFinOtherPolicy);
+                        }
+                    }
                 }
             }
             //==================================添加线程
@@ -422,6 +430,14 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
                     LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(pSid);
                     loanFinPolicy.setFilingState(1);
                     loanFinPolicyService.updateById(loanFinPolicy);
+                    List<LoanFinOtherPolicy> otherPolicyList = loanFinOtherPolicyService.fetchByMainSid(policySid);
+                    otherPolicyList.removeAll(Collections.singleton(null));
+                    if (!otherPolicyList.isEmpty()) {
+                        for (LoanFinOtherPolicy loanFinOtherPolicy : otherPolicyList) {
+                            loanFinOtherPolicy.setFilingState(1);
+                            loanFinOtherPolicyService.updateById(loanFinOtherPolicy);
+                        }
+                    }
                 }
                 entity.setClosingDate(new Date());
                 //办结日期
@@ -546,7 +562,7 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
 
-                //终止任务后经销商备案状态改完未备案
+                //终止任务后备案状态改完未备案
                 LoanFinPolicyRecordApply loanFinPolicyRecordApply = fetchBySid(query.getBusinessSid());
                 if (loanFinPolicyRecordApply.getNodeState().equals("终止")) {
                     String policySids = loanFinPolicyRecordApply.getPolicySid();
@@ -556,6 +572,14 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
                             LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(sid);
                             loanFinPolicy.setFilingState(0);
                             loanFinPolicyService.updateById(loanFinPolicy);
+                            List<LoanFinOtherPolicy> otherPolicyList = loanFinOtherPolicyService.fetchByMainSid(sid);
+                            otherPolicyList.removeAll(Collections.singleton(null));
+                            if (!otherPolicyList.isEmpty()) {
+                                for (LoanFinOtherPolicy loanFinOtherPolicy : otherPolicyList) {
+                                    loanFinOtherPolicy.setFilingState(0);
+                                    loanFinOtherPolicyService.updateById(loanFinOtherPolicy);
+                                }
+                            }
                         }
                     }
                 }
@@ -571,7 +595,7 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
-                    //终止任务后经销商备案状态改完未备案
+                    //终止任务后备案状态改完未备案
                     LoanFinPolicyRecordApply loanFinPolicyRecordApply = fetchBySid(query.getBusinessSid());
                     if (loanFinPolicyRecordApply.getNodeState().equals("终止")) {
                         String policySids = loanFinPolicyRecordApply.getPolicySid();
@@ -581,6 +605,14 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
                                 LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(sid);
                                 loanFinPolicy.setFilingState(0);
                                 loanFinPolicyService.updateById(loanFinPolicy);
+                                List<LoanFinOtherPolicy> otherPolicyList = loanFinOtherPolicyService.fetchByMainSid(sid);
+                                otherPolicyList.removeAll(Collections.singleton(null));
+                                if (!otherPolicyList.isEmpty()) {
+                                    for (LoanFinOtherPolicy loanFinOtherPolicy : otherPolicyList) {
+                                        loanFinOtherPolicy.setFilingState(0);
+                                        loanFinOtherPolicyService.updateById(loanFinOtherPolicy);
+                                    }
+                                }
                             }
                         }
                     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -30,10 +30,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDetailsVo;
@@ -42,6 +44,7 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvest
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto;
+import com.yxt.anrui.riskcenter.biz.loancapitalcreditresult.LoanCapitalCreditResultService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -81,6 +84,8 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
     @Autowired
     private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
     @Autowired
+    private LoanCapitalCreditResultService loanCapitalCreditResultService;
+    @Autowired
     private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
     @Autowired
     private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
@@ -399,6 +404,15 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
             }
         }
         this.updateByDto(dto);
+        List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByOrderSid(dto.getSaleOrderSid()).getData();
+        if (busSalesOrderLoancontracts != null){
+            for (BusSalesOrderLoancontract busSalesOrderLoancontract : busSalesOrderLoancontracts) {
+                LoanCapitalCreditResultDto loanCapitalCreditResultDto = new LoanCapitalCreditResultDto();
+                loanCapitalCreditResultDto.setSaleOrderSid(dto.getSaleOrderSid());
+                loanCapitalCreditResultDto.setLoanContractSid(busSalesOrderLoancontract.getSid());
+                loanCapitalCreditResultService.saveOrUpdateDto(loanCapitalCreditResultDto);
+            }
+        }
     }
 
     public void insertByDto(LoanHomevisitFileexamineDto dto) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml

@@ -54,7 +54,7 @@
                bo.`staffName`,
                bo.`contractNo`,
                bb.`vehCount`,
-               bb.borrowerSid,
+               lp.saleOrderBorrowerSid AS borrowerSid,
                bb.`borrowerName`,
                bb.`mobile`,
                bb.`bankName`,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -238,35 +238,35 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto();
                 busSalesOrderLoancontractDto.setSalesOrderSid(loanHomevisitPrepVo.getSaleOrderSid());
-                busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getSid());
+                busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getBorrowerSid());
                 busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName());
                 busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
                 String num = String.format("%02d", i);
-                busSalesOrderLoancontractDto.setLoanCotractNo(busSalesOrder.getContractNo() + "-" + num);
+                busSalesOrderLoancontractDto.setLoanContractNo(busSalesOrder.getContractNo() + "-" + num);
                 i = i + 1;
                 busSalesOrderLoancontractDto.setBankName(loanHomevisitPrepVo.getBankName());
                 busSalesOrderLoancontractDto.setPolicyName(loanHomevisitPrepVo.getPolicyName());
                 busSalesOrderLoancontractDto.setBusNo("304");
                 busSalesOrderLoancontractDto.setBusName("资方终审确认");
                 String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
-                busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanHomevisitPrepVo.getBorrowerSid(), loanContractSid);
+                busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
             }
         } else if (conSetUpKey.equals("002")) {//一人一合同
             BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto();
             busSalesOrderLoancontractDto.setSalesOrderSid(loanHomevisitPrepVo.getSaleOrderSid());
-            busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getSid());
+            busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getBorrowerSid());
             busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName());
             busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
             BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
-            busSalesOrderLoancontractDto.setLoanCotractNo(busSalesOrder.getContractNo() + "-01");
+            busSalesOrderLoancontractDto.setLoanContractNo(busSalesOrder.getContractNo() + "-01");
             busSalesOrderLoancontractDto.setBankName(loanHomevisitPrepVo.getBankName());
             busSalesOrderLoancontractDto.setPolicyName(loanHomevisitPrepVo.getPolicyName());
             busSalesOrderLoancontractDto.setBusNo("304");
             busSalesOrderLoancontractDto.setBusName("资方终审确认");
             String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
-                busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanHomevisitPrepVo.getSid(), loanContractSid);
+                busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
             }
         }
         return rb.success();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -1384,6 +1384,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //其他融贴息
             String otherDiscount = query.getOtherDiscount();
             if (StringUtils.isNotBlank(otherDiscount) && !"0".equals(otherDiscount)) {
+                loanDownPay = loanDownPay.subtract(new BigDecimal(otherPolicyAmount));
+                //总贷款金额的计算
+                loanAmountTotal = loanAmountTotal.add(new BigDecimal(otherPolicyAmount));
                 //根据年利率和期数、贷款金额计算旧月还
                 BigDecimal otherPolicyMonthlyRepay = BigDecimal.ZERO;
                 if(new BigDecimal(otherPolicyYearRatio).compareTo(BigDecimal.ZERO) == 0){
@@ -1800,12 +1803,17 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                                 solutionssVo.setOtherPolicyIsMain(false);
                             }
                         } else {
-                            LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
-                            if (loanFinOtherPolicy != null) {
-                                solutionssVo.setOtherPolicyIsMain(true);
+                            if(StringUtils.isNotBlank(loanSolutions.getPolicySid())){
+                                LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
+                                if (loanFinOtherPolicy != null) {
+                                    solutionssVo.setOtherPolicyIsMain(true);
+                                }else{
+                                    solutionssVo.setOtherPolicyIsMain(false);
+                                }
                             }else{
                                 solutionssVo.setOtherPolicyIsMain(false);
                             }
+
                         }
                     }
                 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java

@@ -83,4 +83,6 @@ public class BillApplicationIInfoDto implements Dto {
     private String modelSid; // 车型sid
     @ApiModelProperty("车型名称")
     private String modelName; // 车型名称
+    @ApiModelProperty("是否为单独新增")
+    private Boolean showBtn;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

@@ -89,4 +89,6 @@ public class BillApplicationIInfoVo implements Vo {
     private String busSalesOrderSid;
     @ApiModelProperty("是否显示价值客户")
     private Boolean showValueCustomer;
+    @ApiModelProperty("是否为单独新增")
+    private Boolean showBtn;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageInfoQuery.java

@@ -10,4 +10,8 @@ public class BillApplicationPageInfoQuery implements Query {
 
     @ApiModelProperty("sid")
     private String sid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java

@@ -50,6 +50,12 @@ public class BillApplicationPageVo implements Vo {
     @ApiModelProperty("是否显示修改按钮 合同提交后/开始走流程不显示")
     private boolean isShowUpData;
 
+    @ApiModelProperty("是否显示删除按钮")
+    private boolean showDelete;
+
+    @ApiModelProperty("是否为单独新增")
+    private String showBtn;
+
     @ApiModelProperty("销售类型")
     private String saleType;
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java

@@ -28,6 +28,16 @@ public interface InvoicedFeign {
     @ResponseBody
     public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(@RequestBody PagerQuery<BillApplicationPageQuery> pagerQuery);
 
+    @ApiOperation("手机端-删除开票申请")
+    @GetMapping("/deleteInvoice")
+    @ResponseBody
+    public ResultBean deleteInvoice(@RequestParam("sid") String sid);
+
+    @ApiOperation("移动端-开票申请选择车辆")
+    @PostMapping("/getSelectVinsList")
+    @ResponseBody
+    public ResultBean<PagerVo<SelBillVinNoPageVo>> getSelectVinsList(@RequestBody PagerQuery<SelBillVinNoQuery> pagerQuery);
+
     @ApiOperation("手机端-初始化 开票申请/详情")
     @GetMapping("/getInvoicedApply")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java

@@ -20,6 +20,16 @@ public class InvoicedFeignFallback implements InvoicedFeign {
         return null;
     }
 
+    @Override
+    public ResultBean deleteInvoice(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<SelBillVinNoPageVo>> getSelectVinsList(PagerQuery<SelBillVinNoQuery> pagerQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean<BillApplicationIInfoVo> getInvoicedApply(BillApplicationPageInfoQuery query) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillGcVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.terminal.api.autoservice.invoiced;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SelBillGcVo implements Vo {
+
+    @ApiModelProperty("主车车架号")
+    private String vinNo;
+    @ApiModelProperty("挂车车架号")
+    private String gcVinNo;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.autoservice.invoiced;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SelBillVinNoPageVo implements Vo {
+
+    @ApiModelProperty("销售订单sid")
+    private String busSalesOrderSid;
+    @ApiModelProperty("销售类型")
+    private String saleType;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("销售人员")
+    private String sellerName;
+    @ApiModelProperty("销售部门")
+    private String sellerDept;
+    @ApiModelProperty("开票单位")
+    private String invoicingUnit;
+    @ApiModelProperty("客户名称")
+    private String name;
+
+    @ApiModelProperty("主车信息")
+    private List<SelBillZcVo> cars;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoQuery.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.invoiced;
+
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto <br/>
+ * Description: 开票挂车信息表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class SelBillVinNoQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+	@ApiModelProperty("组织全路径")
+    private String orgPath;
+	@ApiModelProperty("合同号")
+    private String contractId;
+	@ApiModelProperty("已选车架号")
+    private List<String> vins;
+	@ApiModelProperty("客户名称")
+    private String name;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.autoservice.invoiced;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SelBillZcVo implements Vo {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("合格证状态key")
+    private String certificateStateKey;
+    @ApiModelProperty("合格证状态value")
+    private String certificateState;
+    @ApiModelProperty("主车合格证图片")
+    private List<String> zcHgzImages;
+
+    @ApiModelProperty("挂车信息")
+    private List<SelBillGcVo> finBillTrailers;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java

@@ -45,11 +45,16 @@ public interface SolutionsFeign {
                                            @RequestParam(value = "name", required = false) String name,
                                            @RequestParam(value = "modelSid", required = false) String modelSid);
 
-    @ApiOperation("获取产品政策下其他融，或分公司下其他融")
+    @ApiOperation("获取分公司下其他融")
     @GetMapping("/selectOtherList")
     @ResponseBody
     ResultBean<List<OtherPolicysVo>> selectOtherList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid,@RequestParam(value = "period", required = false) String period);
 
+    @ApiOperation("获取产品政策下其他融")
+    @GetMapping("/selectOtherList2")
+    @ResponseBody
+    ResultBean<List<OtherPolicysVo>> selectOtherList2(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid,@RequestParam(value = "period", required = false) String period);
+
     @ApiOperation("初始化金融方案2")
     @GetMapping("/selectDetailsVo2")
     @ResponseBody

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java

@@ -28,6 +28,16 @@ public class InvoicedRest implements InvoicedFeign {
         return invoicedService.getInvoicedApplyList(pagerQuery);
     }
 
+    @Override
+    public ResultBean deleteInvoice(String sid) {
+        return invoicedService.deleteInvoice(sid);
+    }
+
+    @Override
+    public ResultBean<PagerVo<SelBillVinNoPageVo>> getSelectVinsList(PagerQuery<SelBillVinNoQuery> pagerQuery) {
+        return invoicedService.getSelectVinsList(pagerQuery);
+    }
+
     @Override
     public ResultBean<BillApplicationIInfoVo> getInvoicedApply(BillApplicationPageInfoQuery query) {
         return invoicedService.getInvoicedApply(query);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -32,8 +32,11 @@ import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 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.terminal.api.autoservice.advanceInvoice.ItemEditTextInfo;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.*;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.*;
@@ -64,6 +67,8 @@ public class InvoicedService {
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
     private BusBillApplicationFeign busBillApplicationFeign;
@@ -106,8 +111,12 @@ public class InvoicedService {
             billApplicationPageVo.setNodeState(record.getNodeState());
             if (record.getNodeState().equals("待提交")) {
                 billApplicationPageVo.setShowUpData(true);
+                if (record.getShowBtnStr().equals("1")) {
+                    billApplicationPageVo.setShowDelete(true);
+                }
             } else {
                 billApplicationPageVo.setShowUpData(false);
+                billApplicationPageVo.setShowDelete(false);
             }
             billApplicationPageVo.setVinNo(record.getVinNo());
             billApplicationPageVos.add(billApplicationPageVo);
@@ -116,9 +125,36 @@ public class InvoicedService {
         return rb.success().setData(v);
     }
 
+    public ResultBean<PagerVo<SelBillVinNoPageVo>> getSelectVinsList(PagerQuery<SelBillVinNoQuery> pagerQuery) {
+        ResultBean<PagerVo<SelBillVinNoPageVo>> rb = ResultBean.fireFail();
+        SelBillVinNoQuery params = pagerQuery.getParams();
+        FinBillApplicationQuery finBillApplicationQuery = new FinBillApplicationQuery();
+        finBillApplicationQuery.setCreateBySid(params.getUserSid());
+        finBillApplicationQuery.setName(params.getName());
+        finBillApplicationQuery.setOrgPath(params.getOrgPath());
+        //finBillApplicationQuery.setType(params.getType());
+        //finBillApplicationQuery.setMenuSid(params.getMenuSid());
+        PagerQuery<FinBillApplicationQuery> pcq = new PagerQuery<>();
+        pcq.setParams(finBillApplicationQuery);
+        ResultBean<PagerVo<FinBillApplicationVo>> resultBean = finBillApplicationFeign.listPage(pcq);
+        List<FinBillApplicationVo> records = resultBean.getData().getRecords();
+        List<SelBillVinNoPageVo> billApplicationPageVos = new ArrayList<>();
+        PagerVo<SelBillVinNoPageVo> v = new PagerVo<>();
+        v.setRecords(billApplicationPageVos);
+        return rb.success().setData(v);
+    }
+
     public ResultBean<BillApplicationIInfoVo> getInvoicedApply(BillApplicationPageInfoQuery query) {
         ResultBean<BillApplicationIInfoVo> rb = ResultBean.fireFail();
         BillApplicationIInfoVo vo = new BillApplicationIInfoVo();
+        if (StringUtils.isBlank(query.getSid())){
+            String userSid = query.getUserSid();
+            String orgPath = query.getOrgPath();
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
+            vo.setPublishInfo(sysOrganizationVo.getName() + sysUserVo.getName());
+            vo.setShowBtn(true);
+        }
         ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.fetchDetailsBySid(query.getSid());
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -340,13 +376,13 @@ public class InvoicedService {
             if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
                 billApplicationIInfoVo.setIsCanEdit(false);
                 billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
-                if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){
+                if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
                     billApplicationIInfoVo.setInvoiceTotal(new BigDecimal(busSalesOrderIsDTKPJVo.getOneBillMoney()).multiply(new BigDecimal(busBillVehicleVos.size())).toString());
                 }
             } else {
                 billApplicationIInfoVo.setIsCanEdit(true);
             }
-        }else {
+        } else {
             billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid());
             billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName());
             billApplicationIInfoVo.setProcInsId(busDeliveredApply.getProcInstId());
@@ -392,6 +428,11 @@ public class InvoicedService {
         FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
         BeanUtil.copyProperties(dto, finBillApplicationDto, "carBuyContractImages");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        if (dto.getShowBtn()){
+            finBillApplicationDto.setShowBtnStr("1");
+        }else {
+            finBillApplicationDto.setShowBtnStr("0");
+        }
         finBillApplicationDto.setUseOrgSid(useOrgSid);
         finBillApplicationDto.setCreateBySid(dto.getUserSid());
         finBillApplicationDto.setTotalBillMoney(dto.getInvoiceTotal());
@@ -571,7 +612,7 @@ public class InvoicedService {
         List<String> invoiceApplyConfirmImages = billApplicationIInfoDto.getInvoiceApplyConfirmImages();//开票信息确认书
         List<String> registerContractImages = billApplicationIInfoDto.getRegisterContractImages();//车辆登记合同
         List<String> idCardImages = billApplicationIInfoDto.getIdCardImages();//证件
-        if (idCardImages == null || idCardImages.size() == 0){
+        if (idCardImages == null || idCardImages.size() == 0) {
             return new ResultBean().fail().setMsg("证件不能为空");
         }
         List<BusBillFileDto> carBuyContractImages = new ArrayList<>(); // 车辆买卖合同
@@ -699,6 +740,12 @@ public class InvoicedService {
 
     public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        if (dto.getShowBtn()){
+            List<VinListDto> vinList = dto.getVinList();
+            if (vinList == null || vinList.size() == 0){
+                return rb.setMsg("车辆不能为空");
+            }
+        }
         SubmitFinBillApplicationDto submitBillApplicationDto = new SubmitFinBillApplicationDto();
         BeanUtil.copyProperties(dto, submitBillApplicationDto, "carBuyContractImages");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
@@ -974,4 +1021,14 @@ public class InvoicedService {
         }
         return rb.success().setData(kpsqFlowListVo);
     }
+
+    public ResultBean deleteInvoice(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String[] sids = {sid};
+        ResultBean resultBean = finBillApplicationFeign.delBySids(sids);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java

@@ -48,6 +48,11 @@ public class SolutionsRest implements SolutionsFeign {
         return solutionsService.selectOtherList(orgPath, userSid, sid, name,modelSid,period);
     }
 
+    @Override
+    public ResultBean<List<OtherPolicysVo>> selectOtherList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) {
+        return solutionsService.selectOtherList2(orgPath, userSid, sid, name,modelSid,period);
+    }
+
     @Override
     public ResultBean<AppSolutionVo> selectDetailsVo2(String busSid) {
         return solutionsService.selectDetailsVo2(busSid);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java

@@ -132,4 +132,25 @@ public class SolutionsService {
         }
         return rb.success();
     }
+
+    public ResultBean<List<OtherPolicysVo>> selectOtherList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) {
+        ResultBean<List<OtherPolicysVo>> rb = ResultBean.fireFail();
+        List<OtherPolicysVo> listNew = new ArrayList<>();
+        ResultBean<List<OtherPolicyVo>> resultBean = loanFinOtherPolicyFeign.selectList2(orgPath, userSid, sid, name, modelSid, period);
+        if (resultBean.getData() != null && !resultBean.getData().isEmpty()) {
+            List<OtherPolicyVo> list = resultBean.getData();
+            list.removeAll(Collections.singleton(null));
+            for (int i = 0; i < list.size(); i++) {
+                OtherPolicyVo policyVo = list.get(i);
+                OtherPolicyExtraVo extraVo = new OtherPolicyExtraVo();
+                OtherPolicysVo policysVo = new OtherPolicysVo();
+                policysVo.setId(policyVo.getSid());
+                policysVo.setDictValue(policyVo.getName());
+                BeanUtil.copyProperties(policyVo, extraVo);
+                policysVo.setExtra(extraVo);
+                listNew.add(policysVo);
+            }
+        }
+        return rb.success().setData(listNew);
+    }
 }