款项结转问题优化..

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinCustNameAndPhone.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.fin.api.finfundscarriedforwardapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FinCustNameAndPhone {
+
+    @ApiModelProperty("付款人姓名")
+    private String draweeName;
+    @ApiModelProperty("付款人联系电话")
+    private String draweeMobile;
+    @ApiModelProperty("业务员sid")
+    private String staffSid;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/TzDto.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.fin.api.finfundscarriedforwardapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TzDto {
+
+    @ApiModelProperty("业务sud")
+    private String busSid;
+    @ApiModelProperty("调账类型")
+    private String tzType;
+    @ApiModelProperty("合同编号")
+    private String conNo;
+    @ApiModelProperty("客户sid")
+    private String custSid;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("客户编码")
+    private String custNo;
+    @ApiModelProperty("物料编码")
+    private String vinNo;
+    @ApiModelProperty("调出金额")
+    private Integer dcje = 0;
+    @ApiModelProperty("调入金额")
+    private Integer drje = 0;
+
+    public TzDto(String busSid, String zc, String conNo, String name, String custNo, String vinNo, int i) {
+
+    }
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/ZC.java

@@ -1,25 +0,0 @@
-package com.yxt.anrui.fin.api.finfundscarriedforwardapply;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class ZC {
-
-    @ApiModelProperty("调账类型")
-    private String zc;
-    @ApiModelProperty("合同编号")
-    private String conNo;
-    @ApiModelProperty("客户名称")
-    private String name;
-    @ApiModelProperty("物料编码")
-    private String vinNo;
-    @ApiModelProperty("调出金额")
-    private String dcje;
-    @ApiModelProperty("调入金额")
-    private String drje;
-    @ApiModelProperty("调出前余额")
-    private String dcqye;
-    @ApiModelProperty("调出后余额")
-    private String dchye;
-}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/ZR.java

@@ -1,25 +0,0 @@
-package com.yxt.anrui.fin.api.finfundscarriedforwardapply;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class ZR {
-
-    @ApiModelProperty("调账类型")
-    private String zr;
-    @ApiModelProperty("合同编号")
-    private String conNo;
-    @ApiModelProperty("客户名称")
-    private String name;
-    @ApiModelProperty("物料编码")
-    private String vinNo;
-    @ApiModelProperty("调出金额")
-    private String dcje;
-    @ApiModelProperty("调入金额")
-    private String drje;
-    @ApiModelProperty("调出前余额")
-    private String dcqye;
-    @ApiModelProperty("调出后余额")
-    private String dchye;
-}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java

@@ -15,6 +15,8 @@ import java.util.List;
 @Data
 public class OtherReceivable {
 
+    @ApiModelProperty("单据编号")
+    public String billNo;
     @ApiModelProperty("单据类型")
     public String billType = "QTYSD01_SYS";
     @ApiModelProperty("往来单位类型")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -201,13 +201,13 @@
     <select id="jyddkydjListPage"
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo">
         SELECT
-        fcc.sid,
+        fsrd.sid,
         fcc.useOrgSid,
         fcc.staffDeptName,
         fcc.staffUserSid AS staffSid,
         fcc.staffName,
         fcc.`billNo`,
-        fcc.`payerName`,
+        fsrd.`customerName`,
         bd.`draweeMobile` AS phone,
         fcc.collectionDate,
         fcc.collectionMoney,
@@ -215,9 +215,9 @@
         fcc.collectionMoney - COALESCE(SUM(ffc.`thisUseMoney`), 0)
         ) AS balance
         FROM
-        fin_collection_confirmation fcc
+        fin_selected_receivables_detailed fsrd
-        LEFT JOIN fin_selected_receivables_detailed fsrd
+        JOIN fin_collection_confirmation fcc
-        ON fcc.`sid` = fsrd.`collSid`
+        ON fcc.`sid` = fsrd.`collSid` AND fcc.`pushMessgae` = 1
         LEFT JOIN anrui_buscenter.`bus_deposit` bd
         ON fcc.`busSid` = bd.`billSid`
         LEFT JOIN `fin_funds_carried_forward_veh` ffc

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -2771,7 +2771,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             qw.like("fcc.billNo", query.getBillNo());
         }
         if (StringUtils.isNotBlank(query.getPayerName())) {
-            qw.like("fcc.payerName", query.getPayerName());
+            qw.like("fsrd.customerName", query.getPayerName());
         }
         if (StringUtils.isNotBlank(query.getPhone())) {
             qw.like("bd.draweeMobile", query.getPhone());
@@ -2784,8 +2784,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (StringUtils.isNotBlank(query.getName())) {
             qw.and(wrapper -> wrapper.like("fcc.billNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("fcc.staffName", query.getName()).or().like("fcc.payerName", query.getName()).or().like("bd.draweeMobile", query.getName()));
         }
-        qw.isNotNull("fcc.busSid");
+        qw.groupBy("fsrd.sid");
-        qw.groupBy("fcc.sid");
         if (StringUtils.isNotBlank(query.getCollectionSmallMoney()) && StringUtils.isNotBlank(query.getCollectionBigMoney())){
             qw.having("balance > 0").having("balance >= {0}", query.getCollectionSmallMoney()).having("balance <= {0}", query.getCollectionBigMoney());
         }else {

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

@@ -36,7 +36,6 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.common.utils.Rule;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
@@ -53,12 +52,10 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
-import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
 import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService;
 import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
-import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.anrui.fin.biz.kingdee.otherreceivablebill.OtherReceivableBillService;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -360,24 +357,13 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         for (String busSid : busSids) {
             FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo = new FinFundsCarriedForwardVehDetailsVo();
             finFundsCarriedForwardVehDetailsVo.setBusSid(busSid);
-            if ("简易订单订金".equals(finFundsCarriedForwardApplyInitQuery.getSource())) {
+            FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchYeBySid(busSid);
-                finCollectionConfirmation = finCollectionConfirmationService.fetchBySid(busSid);
-                finFundsCarriedForwardVehDetailsVo.setBusBillNo(finCollectionConfirmation.getBillNo());
-                finFundsCarriedForwardVehDetailsVo.setCustomerName(finCollectionConfirmation.getPayerName());
-                finFundsCarriedForwardVehDetailsVo.setBalance(finCollectionConfirmation.getBalance().toString());
-            } else if ("已认款".equals(finFundsCarriedForwardApplyInitQuery.getSource())) {
-                FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(busSid);
             finCollectionConfirmation = finCollectionConfirmationService.fetchBySid(finSelectedReceivablesDetailed.getCollSid());
             finFundsCarriedForwardVehDetailsVo.setBusBillNo(finSelectedReceivablesDetailed.getContractNo());
             finFundsCarriedForwardVehDetailsVo.setCustomerSid(finSelectedReceivablesDetailed.getCustomerSid());
             finFundsCarriedForwardVehDetailsVo.setCustomerName(finSelectedReceivablesDetailed.getCustomerName());
             finFundsCarriedForwardVehDetailsVo.setVinNo(finSelectedReceivablesDetailed.getVIN());
-                if (StringUtils.isBlank(finSelectedReceivablesDetailed.getBalance())) {
-                    finFundsCarriedForwardVehDetailsVo.setBalance(finSelectedReceivablesDetailed.getSubscriptionMoney().toString());
-                } else {
             finFundsCarriedForwardVehDetailsVo.setBalance(finSelectedReceivablesDetailed.getBalance());
-                }
-            }
             finFundsCarriedForwardVehDetailsVos.add(finFundsCarriedForwardVehDetailsVo);
         }
         finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finCollectionConfirmation.getStaffDeptSid());
@@ -541,10 +527,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         ResultBean rb = ResultBean.fireFail();
         //用户的组织全路径
         FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(dto.getSid());
-        //销售部门信息
+        //根据结转申请sid查询转出转入的list集合
-        SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(finFundsCarriedForwardApply.getSaleDeptSid()).getData();
-        //分公司信息
-        SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(finFundsCarriedForwardApply.getUseOrgSid()).getData();
         List<FinFundsCarriedForwardVehDto> finFundsCarriedForwardVehDetailsVos = dto.getFinFundsCarriedForwardVehDetailsVos();
         List<AppFinFundsCarriedForwardYXYSKXDto> yxysFinFundsCarriedForwardYXYSKXVos = dto.getYxysFinFundsCarriedForwardYXYSKXVos();
         if (finFundsCarriedForwardVehDetailsVos.size() > 1 && yxysFinFundsCarriedForwardYXYSKXVos.size() > 1) {
@@ -591,100 +574,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 dto.setIsOneSale(true);
                 String sid = saveOrUpdateAll(dto).getData();
                 finFundsCarriedForwardApply = fetchBySid(sid);
-                FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(sid).getData();
+                //String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
-                List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos1 = data.getFinFundsCarriedForwardVehDetailsVos();
+                //baseMapper.updatePathBySid(pdfPath, sid);
-                List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos1 = data.getYxysFinFundsCarriedForwardYXYSKXVos();
+                tsqtysd(sid);
-                String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
-                baseMapper.updatePathBySid(pdfPath, sid);
-                List<Map<String,String>> jzCustNos = new ArrayList<>();
-                List<Map<String,String>> ysCustNos = new ArrayList<>();
-                for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo2 : finFundsCarriedForwardVehDetailsVos1) {
-                    FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo2.getBusSid());
-                    String custNo = "";
-                    if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
-                        Map<String, String> map = new HashMap<>();
-                        custNo = finSelectedReceivablesDetailed.getContractNo();
-                        map.put("type","全款");
-                        map.put("custNo",custNo);
-                        jzCustNos.add(map);
-                    } else {//贷款
-                        BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
-                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
-                        custNo = busSalesOrderVehicle.getTemporaryNo();
-                        Map<String, String> map = new HashMap<>();
-                        map.put("type","贷款");
-                        map.put("custNo",custNo);
-                        jzCustNos.add(map);
-                    }
-                }
-                jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
-                for (Map jzCustNo : jzCustNos) {
-                    String custNo = (String) jzCustNo.get("custNo");
-                    OtherReceivable otherReceivable = new OtherReceivable();
-                    otherReceivable.setCommUnit(custNo);
-                    otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
-                    otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                    List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
-                    List<String> stringList;
-                    if (jzCustNo.get("type").equals("全款")){
-                        stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
-                    }else {
-                        custNo = custNo.substring(0, custNo.length() - 2);
-                        stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
-                    }
-                    for (String s : stringList) {
-                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                        collectionDetailDto.setExTaxMoney(s);
-                        collectionDetailDtoList.add(collectionDetailDto);
-                    }
-                    otherReceivable.setCollectionDetails(collectionDetailDtoList);
-                    otherReceivableBillService.otherReceivableBillService(otherReceivable);
-                }
-                for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos1) {
-                    FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo2.getSid());
-                    String custNo = "";
-                    if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
-                        custNo = finSelectedReceivablesDetailed.getContractNo();
-                        Map<String, String> map = new HashMap<>();
-                        map.put("type","全款");
-                        map.put("custNo",custNo);
-                        ysCustNos.add(map);
-                    } else {//贷款
-                        BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
-                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
-                        custNo = busSalesOrderVehicle.getTemporaryNo();
-                        Map<String, String> map = new HashMap<>();
-                        map.put("type","贷款");
-                        map.put("custNo",custNo);
-                        ysCustNos.add(map);
-                    }
-                }
-                ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
-                for (Map ysCustNo : ysCustNos) {
-                    OtherReceivable otherReceivable = new OtherReceivable();
-                    String custNo = (String)ysCustNo.get("custNo");
-                    otherReceivable.setCommUnit(custNo);
-                    otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
-                    otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                    List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
-                    List<String> stringList;
-                    if (ysCustNo.get("type").equals("全款")){
-                        stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
-                    }else {
-                        custNo = custNo.substring(0, custNo.length() - 2);
-                        stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
-                    }
-                    for (String s : stringList) {
-                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                        collectionDetailDto.setExTaxMoney("-" + s);
-                        collectionDetailDtoList.add(collectionDetailDto);
-                    }
-                    otherReceivable.setCollectionDetails(collectionDetailDtoList);
-                    otherReceivableBillService.otherReceivableBillService(otherReceivable);
-                }
-                //baseMapper.updateNodeStateBySid("已办结",finFundsCarriedForwardApply.getSid());
                 return rb.success();
             }
         }
@@ -767,6 +659,180 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         return null;
     }
 
+    public void tsqtysd(String applySid) {
+        //1.根据结转申请sid查询转出转入的list集合 listi(转入)listo(转出)
+        FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(applySid).getData();
+        //转出
+        List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
+        //转入
+        List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
+        //分公司信息
+        SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(data.getUseOrgSid()).getData();
+        //销售部门信息
+        SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(data.getSaleDeptSid()).getData();
+        List<TzDto> zcList = new ArrayList<>();
+        List<TzDto> zrList = new ArrayList<>();
+        //构建对象
+        for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
+            TzDto zc = new TzDto();
+            zc.setBusSid(finFundsCarriedForwardVehDetailsVo.getBusSid());
+            zc.setTzType("转出");
+            zc.setCustSid(finFundsCarriedForwardVehDetailsVo.getCustomerSid());
+            zc.setConNo(finFundsCarriedForwardVehDetailsVo.getBusBillNo());
+            zc.setName(finFundsCarriedForwardVehDetailsVo.getCustomerName());
+            zc.setVinNo(finFundsCarriedForwardVehDetailsVo.getVinNo());
+            zc.setDcje(Integer.valueOf(finFundsCarriedForwardVehDetailsVo.getThisUseMoney()));
+            zcList.add(zc);
+        }
+        for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
+            TzDto zr = new TzDto();
+            zr.setBusSid(yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+            zr.setTzType("转入");
+            zr.setCustSid(yxysFinFundsCarriedForwardYXYSKXVo.getCustomerSid());
+            zr.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
+            zr.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
+            zr.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
+            zr.setDrje(Integer.parseInt(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
+            zrList.add(zr);
+        }
+        //2.设置listi和listo中财务系统客户编码值
+        if ("简易订单订金".equals(data.getSource())) {
+            for (TzDto zc : zcList) {
+                //从已认款中获取客户编码
+                if (StringUtils.isNotBlank(zc.getCustSid())) {
+                    CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(zc.getCustSid()).getData();
+                    zc.setCustNo(crmCustomerTempVo.getCustomerNo());
+                } else {
+                    List<FinCustNameAndPhone> finCustNameAndPhoneList = finFundsCarriedForwardVehService.fetchNameAndPhoneByBusSid(zc.getBusSid());
+                    for (FinCustNameAndPhone finCustNameAndPhone : finCustNameAndPhoneList) {
+                        String custNo = getPrefix(finCustNameAndPhone.getStaffSid(), finCustNameAndPhone.getDraweeName(), finCustNameAndPhone.getDraweeMobile());
+                        zc.setCustNo(custNo);
+                    }
+                }
+            }
+        } else {
+            for (TzDto zc : zcList) {
+                zc.setCustNo(getCustNoCW(zc.getBusSid()));
+            }
+        }
+        for (TzDto zr : zrList) {
+            zr.setCustNo(getCustNoCW(zr.getBusSid()));
+        }
+        List<TzDto> listOne;
+        List<TzDto> listMany;
+        if (zcList.size() > 1) {
+            listOne = zcList;
+            listMany = zrList;
+        } else {
+            listOne = zrList;
+            listMany = zcList;
+        }
+        //3.循环判断多条中是否存在相同的财务系统客户编码,如果有相同的则合并为一条，结转金额相加
+        List<TzDto> manyRemoveList = manyHB(listMany);
+        Boolean aBoolean = subMoney(listOne, manyRemoveList);
+        if (!aBoolean) {
+            return;
+        }
+        //5.判断一条的余额是否大于0，大于0推送，否则不推送
+        if (listOne.get(0).getDrje() > 0 || listOne.get(0).getDcje() > 0) {
+            //一条的推送
+            OtherReceivable otherReceivableOne = new OtherReceivable();
+            otherReceivableOne.setBillNo(data.getBillNo());
+            otherReceivableOne.setCommUnit(listOne.get(0).getCustNo());
+            otherReceivableOne.setCollectionOrg(sysOrganizationVo1.getOrgCode());
+            otherReceivableOne.setBussDate(DateUtil.formatDate(new Date()));
+            List<OtherReceivable.CollectionDetailDto> collectionDetailDtoListOne = new ArrayList<>();
+            OtherReceivable.CollectionDetailDto collectionDetailDtoOne = new OtherReceivable.CollectionDetailDto();
+            collectionDetailDtoOne.setDearDept(sysOrganizationVo2.getOrgCode());
+            if (listOne.get(0).getTzType().equals("转入")) {
+                collectionDetailDtoOne.setExTaxMoney("-" + listOne.get(0).getDrje());
+            } else {
+                collectionDetailDtoOne.setExTaxMoney(listOne.get(0).getDcje().toString());
+            }
+            collectionDetailDtoListOne.add(collectionDetailDtoOne);
+            otherReceivableOne.setCollectionDetails(collectionDetailDtoListOne);
+            otherReceivableBillService.otherReceivableBillService(otherReceivableOne);
+            //多条的推送
+            OtherReceivable otherReceivableMany = new OtherReceivable();
+            int i = 1;
+            for (TzDto tzDto : manyRemoveList) {
+                String temporaryNum = String.format("%02d", i);
+                otherReceivableMany.setBillNo(data.getBillNo() + "-" + temporaryNum);
+                otherReceivableMany.setCommUnit(tzDto.getCustNo());
+                otherReceivableMany.setCollectionOrg(sysOrganizationVo1.getOrgCode());
+                otherReceivableMany.setBussDate(DateUtil.formatDate(new Date()));
+                List<OtherReceivable.CollectionDetailDto> collectionDetailDtoListMany = new ArrayList<>();
+                OtherReceivable.CollectionDetailDto collectionDetailDtoMany = new OtherReceivable.CollectionDetailDto();
+                collectionDetailDtoMany.setDearDept(sysOrganizationVo2.getOrgCode());
+                if (tzDto.getTzType().equals("转入")) {
+                    collectionDetailDtoMany.setExTaxMoney("-" + tzDto.getDrje());
+                } else {
+                    collectionDetailDtoMany.setExTaxMoney(tzDto.getDcje().toString());
+                }
+                collectionDetailDtoListMany.add(collectionDetailDtoMany);
+                otherReceivableMany.setCollectionDetails(collectionDetailDtoListMany);
+                otherReceivableBillService.otherReceivableBillService(otherReceivableMany);
+                i = i + 1;
+            }
+        }
+    }
+
+    /*
+     * 财务中的客户编码
+     * */
+    private String getCustNoCW(String busSid) {
+        String custNo = "";
+        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(busSid);
+        if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
+            custNo = finSelectedReceivablesDetailed.getContractNo();
+        } else {//贷款
+            if (finSelectedReceivablesDetailed.getVIN().length() > 3) {
+                BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
+                custNo = busSalesOrderVehicle.getTemporaryNo();
+            } else {
+                //没有车架号，拼接合同号和临时编号
+                custNo = finSelectedReceivablesDetailed.getContractNo() + finSelectedReceivablesDetailed.getVIN();
+            }
+        }
+        return custNo;
+    }
+
+    private List<TzDto> manyHB(List<TzDto> list) {
+        //转出为多条，转入为一条
+        List<TzDto> manyRemoveList = new ArrayList<>();
+        list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> {
+            transfer.stream().reduce((a, b) -> new TzDto(
+                    a.getBusSid(),
+                    a.getTzType(),
+                    a.getConNo(),
+                    a.getName(),
+                    a.getCustNo(),
+                    a.getVinNo(),
+                    a.getDcje() + b.getDcje())).ifPresent(manyRemoveList::add);
+        });
+        return manyRemoveList;
+    }
+
+    private Boolean subMoney(List<TzDto> listOne, List<TzDto> removeList) {
+        //4.对比一条的和多条的是否存在相同的客户编码,相同的结转金额相减，多条中相同客户编码的记录去除
+        String custNo = listOne.get(0).getCustNo();
+        for (TzDto tzDto : removeList) {
+            if (tzDto.getCustNo().equals(custNo)) {
+                if (tzDto.getTzType().equals("转入")) {
+                    listOne.get(0).setDcje(listOne.get(0).getDcje() - tzDto.getDrje());
+                } else {
+                    listOne.get(0).setDrje(listOne.get(0).getDrje() - tzDto.getDcje());
+                }
+                removeList.remove(tzDto);
+            }
+            if (removeList.size() == 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * 更新流程相关的状态
      *
@@ -1020,170 +1086,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
                     finSelectedReceivablesDetailedService.updateAuditStateBySid(3, appFinFundsCarriedForwardYXYSKXVo.getSid());
                 }
-                List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
+                tsqtysd(businessSid);
-                List<Map<String,String>> jyddNos = new ArrayList<>();
-                List<Map<String,String>> jzCustNos = new ArrayList<>();
-                List<Map<String,String>> ysCustNos = new ArrayList<>();
-                if ("简易订单订金".equals(finFundsCarriedForwardApply.getSource())) {
-                    List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos1 = finFundsCarriedForwardVehService.fetchByMainSidAndGroupCustPhone(finFundsCarriedForwardApply.getSid());
-                    for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos1) {
-                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
-                        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finSelectedReceivablesDetailed.getCustomerSid()).getData();
-                        Map<String, String> map = new HashMap<>();
-                        map.put("custSid",crmCustomerTempVo.getSid());
-                        map.put("custNo",crmCustomerTempVo.getCustomerNo());
-                        jyddNos.add(map);
-                    }
-                    jyddNos = jyddNos.stream().distinct().collect(Collectors.toList());
-                    for (Map<String, String> jyddNo : jyddNos) {
-                        OtherReceivable otherReceivable = new OtherReceivable();
-                        String custNo = jyddNo.get("custNo");
-                        otherReceivable.setCommUnit(custNo);
-                        otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
-                        otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
-                        String custSid = jyddNo.get("custSid");
-                        List<String> stringList = finFundsCarriedForwardVehService.fetchJzMoneyByCustSidAndMainSid(custSid, finFundsCarriedForwardApply.getSid());
-                        for (String s : stringList) {
-                            OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                            collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                            collectionDetailDto.setExTaxMoney(s);
-                            collectionDetailDtoList.add(collectionDetailDto);
-                        }
-                        otherReceivable.setCollectionDetails(collectionDetailDtoList);
-                        otherReceivableBillService.otherReceivableBillService(otherReceivable);
-                    }
-                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo2.getSid());
-                        String custNo = "";
-                        if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
-                            custNo = finSelectedReceivablesDetailed.getContractNo();
-                            Map<String, String> map = new HashMap<>();
-                            map.put("type","全款");
-                            map.put("custNo",custNo);
-                            ysCustNos.add(map);
-                        } else {//贷款
-                            BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
-                            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
-                            custNo = busSalesOrderVehicle.getTemporaryNo();
-                            Map<String, String> map = new HashMap<>();
-                            map.put("type","贷款");
-                            map.put("custNo",custNo);
-                            ysCustNos.add(map);
-                        }
-                    }
-                    ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
-                    for (Map ysCustNo : ysCustNos) {
-                        OtherReceivable otherReceivable = new OtherReceivable();
-                        String custNo = (String)ysCustNo.get("custNo");
-                        otherReceivable.setCommUnit(custNo);
-                        otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
-                        otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
-                        List<String> stringList;
-                        if (ysCustNo.get("type").equals("全款")){
-                            stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
-                        }else {
-                            custNo = custNo.substring(0, custNo.length() - 2);
-                            stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
-                        }
-                        for (String s : stringList) {
-                            OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                            collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                            collectionDetailDto.setExTaxMoney("-" + s);
-                            collectionDetailDtoList.add(collectionDetailDto);
-                        }
-                        otherReceivable.setCollectionDetails(collectionDetailDtoList);
-                        otherReceivableBillService.otherReceivableBillService(otherReceivable);
-                    }
-                } else if ("已认款".equals(finFundsCarriedForwardApply.getSource())) {
-                    for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo2 : finFundsCarriedForwardVehDetailsVos) {
-                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo2.getBusSid());
-                        String custNo = "";
-                        if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
-                            Map<String, String> map = new HashMap<>();
-                            custNo = finSelectedReceivablesDetailed.getContractNo();
-                            map.put("type","全款");
-                            map.put("custNo",custNo);
-                            jzCustNos.add(map);
-                        } else {//贷款
-                            BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
-                            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
-                            custNo = busSalesOrderVehicle.getTemporaryNo();
-                            Map<String, String> map = new HashMap<>();
-                            map.put("type","贷款");
-                            map.put("custNo",custNo);
-                            jzCustNos.add(map);
-                        }
-                    }
-                    jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
-                    for (Map jzCustNo : jzCustNos) {
-                        String custNo = (String) jzCustNo.get("custNo");
-                        OtherReceivable otherReceivable = new OtherReceivable();
-                        otherReceivable.setCommUnit(custNo);
-                        otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
-                        otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
-                        List<String> stringList;
-                        if (jzCustNo.get("type").equals("全款")){
-                            stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
-                        }else {
-                            custNo = custNo.substring(0, custNo.length() - 2);
-                            stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
-                        }
-                        for (String s : stringList) {
-                            OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                            collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                            collectionDetailDto.setExTaxMoney(s);
-                            collectionDetailDtoList.add(collectionDetailDto);
-                        }
-                        otherReceivable.setCollectionDetails(collectionDetailDtoList);
-                        otherReceivableBillService.otherReceivableBillService(otherReceivable);
-                    }
-                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo2.getSid());
-                        String custNo = "";
-                        if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
-                            custNo = finSelectedReceivablesDetailed.getContractNo();
-                            Map<String, String> map = new HashMap<>();
-                            map.put("type","全款");
-                            map.put("custNo",custNo);
-                            ysCustNos.add(map);
-                        } else {//贷款
-                            BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
-                            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
-                            custNo = busSalesOrderVehicle.getTemporaryNo();
-                            Map<String, String> map = new HashMap<>();
-                            map.put("type","贷款");
-                            map.put("custNo",custNo);
-                            ysCustNos.add(map);
-                        }
-                    }
-                    ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
-                    for (Map ysCustNo : ysCustNos) {
-                        OtherReceivable otherReceivable = new OtherReceivable();
-                        String custNo = (String)ysCustNo.get("custNo");
-                        otherReceivable.setCommUnit(custNo);
-                        otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
-                        otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
-                        List<String> stringList;
-                        if (ysCustNo.get("type").equals("全款")){
-                            stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
-                        }else {
-                            custNo = custNo.substring(0, custNo.length() - 2);
-                            stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
-                        }
-                        for (String s : stringList) {
-                            OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                            collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                            collectionDetailDto.setExTaxMoney("-" + s);
-                            collectionDetailDtoList.add(collectionDetailDto);
-                        }
-                        otherReceivable.setCollectionDetails(collectionDetailDtoList);
-                        otherReceivableBillService.otherReceivableBillService(otherReceivable);
-                    }
-                }
             } else {
                 //极光推送
                 finFundsCarriedForwardApply = fetchBySid(businessSid);
@@ -1339,31 +1242,27 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 }
             }
         }
-        List<ZC> zcList = new ArrayList<>();
+        List<TzDto> tzList = new ArrayList<>();
-        List<ZR> zrList = new ArrayList<>();
         for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
-            ZC zc = new ZC();
+            TzDto tzDto = new TzDto();
-            zc.setZc("转出");
+            tzDto.setTzType("转出");
-            zc.setConNo(finFundsCarriedForwardVehDetailsVo.getBusBillNo());
+            tzDto.setConNo(finFundsCarriedForwardVehDetailsVo.getBusBillNo());
-            zc.setName(finFundsCarriedForwardVehDetailsVo.getCustomerName());
+            tzDto.setName(finFundsCarriedForwardVehDetailsVo.getCustomerName());
-            zc.setVinNo(finFundsCarriedForwardVehDetailsVo.getVinNo());
+            tzDto.setVinNo(finFundsCarriedForwardVehDetailsVo.getVinNo());
-            zc.setDcje(finFundsCarriedForwardVehDetailsVo.getThisUseMoney());
+            tzDto.setDcje(Integer.parseInt(finFundsCarriedForwardVehDetailsVo.getThisUseMoney()));
-            zc.setDcqye(finFundsCarriedForwardVehDetailsVo.getBalance());
+            tzList.add(tzDto);
-            zc.setDchye(new BigDecimal(finFundsCarriedForwardVehDetailsVo.getBalance()).subtract(new BigDecimal(finFundsCarriedForwardVehDetailsVo.getThisUseMoney())).toString());
-            zcList.add(zc);
         }
         for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-            ZR zr = new ZR();
+            TzDto tzDto = new TzDto();
-            zr.setZr("转入");
+            tzDto.setTzType("转入");
-            zr.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
+            tzDto.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
-            zr.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
+            tzDto.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
-            zr.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
+            tzDto.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
-            zr.setDrje(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney().toString());
+            tzDto.setDrje(Integer.parseInt(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-            zrList.add(zr);
+            tzList.add(tzDto);
         }
         dataMap.put("saleDate", DateUtil.formatDate(new Date()));
-        dataMap.put("zcList", zcList);
+        dataMap.put("tzList", tzList);
-        dataMap.put("zrList", zrList);
         dataMap.put("makeName", data.getCreateByName() + data.getCreateByDate());
         //获取模板
         //模板路径

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinCustNameAndPhone;
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDetailsVo;
 import org.apache.ibatis.annotations.*;
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh;
@@ -77,9 +78,5 @@ public interface FinFundsCarriedForwardVehMapper extends BaseMapper<FinFundsCarr
 
     String selectByBusSid(List<String> sidsList);
 
-	List<FinFundsCarriedForwardVehDetailsVo> fetchByMainSidAndGroupCustPhone(String sid);
+	List<FinCustNameAndPhone> fetchNameAndPhoneByBusSid(String busSid);
-
-    List<String> fetchJzMoneyByContractNoAndMainSid(@Param("jzCustNo") String jzCustNo,@Param("sid") String sid);
-
-	List<String> fetchJzMoneyByCustSidAndMainSid(@Param("custSid") String custSid,@Param("sid") String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml

@@ -45,29 +45,21 @@
         </foreach>
     </select>
 
-    <select id="fetchByMainSidAndGroupCustPhone"
+    <select id="fetchNameAndPhoneByBusSid"
-            resultType="com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDetailsVo">
+            resultType="com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinCustNameAndPhone">
-        SELECT ffv.*, bd.draweeMobile
+        SELECT bd.`draweeName`,
+               bd.draweeMobile,
+               ffa.`staffSid`
         FROM fin_funds_carried_forward_veh ffv
+                     LEFT JOIN fin_funds_carried_forward_apply ffa
+                ON ffv.`mainSid` = ffa.`sid`
+                     LEFT JOIN fin_selected_receivables_detailed fsrd
+                ON ffv.`busSid` = fsrd.`sid`
                      LEFT JOIN fin_collection_confirmation fcc
-                ON ffv.`busSid` = fcc.`sid`
+                ON fsrd.`collSid` = fcc.`sid`
+                        AND fcc.`pushMessgae` = 1
                      LEFT JOIN anrui_buscenter.`bus_deposit` bd
                 ON fcc.`busSid` = bd.`billSid`
-        WHERE ffv.`mainSid` = #{sid}
+        WHERE ffv.`busSid` = #{busSid}
-        GROUP BY bd.`draweeMobile`
-    </select>
-
-    <select id="fetchJzMoneyByContractNoAndMainSid" resultType="java.lang.String">
-        SELECT ffc.`thisUseMoney` AS jzMoney
-        FROM fin_funds_carried_forward_veh ffc
-        WHERE ffc.busBillNo = #{jzCustNo}
-          AND ffc.mainSid = #{sid}
-    </select>
-
-    <select id="fetchJzMoneyByCustSidAndMainSid" resultType="java.lang.String">
-        SELECT ffc.`thisUseMoney` AS jzMoney
-        FROM fin_funds_carried_forward_veh ffc
-        WHERE ffc.customerSid = #{custSid}
-          AND ffc.mainSid = #{sid}
     </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java

@@ -43,6 +43,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinCustNameAndPhone;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -162,15 +163,7 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService<FinFund
 		return baseMapper.selectByBusSid(sidsList);
 	}
 
-	public List<FinFundsCarriedForwardVehDetailsVo> fetchByMainSidAndGroupCustPhone(String sid) {
+	public List<FinCustNameAndPhone> fetchNameAndPhoneByBusSid(String busSid) {
-		return baseMapper.fetchByMainSidAndGroupCustPhone(sid);
+		return baseMapper.fetchNameAndPhoneByBusSid(busSid);
-	}
-
-	public List<String> fetchJzMoneyByContractNoAndMainSid(String jzCustNo, String sid) {
-		return baseMapper.fetchJzMoneyByContractNoAndMainSid(jzCustNo,sid);
-	}
-
-	public List<String> fetchJzMoneyByCustSidAndMainSid(String custSid, String sid) {
-		return baseMapper.fetchJzMoneyByCustSidAndMainSid(custSid,sid);
 	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -161,4 +161,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     String selectBalanceByReceivedSid(String receivablesSid);
 
     IPage<FinSelectReceivablesDetailedVo> selectPageLists(IPage<FinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
+
+    FinSelectedReceivablesDetailed fetchYeBySid(String busSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -487,4 +487,21 @@
         WHERE fsr.`contractNo` = #{ysCustNo}
           AND fsr.`collSid` = #{sid}
     </select>
+
+    <select id="fetchYeBySid"
+            resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed">
+        SELECT fsrd.contractNo,
+               fsrd.`customerSid`,
+               fsrd.`customerName`,
+               fsrd.`VIN`,
+               fsrd.collSid,
+               (
+                       fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
+                       ) AS balance
+        FROM fin_selected_receivables_detailed fsrd
+                     LEFT JOIN `fin_funds_carried_forward_veh` ffc
+                ON ffc.`busSid` = fsrd.`sid`
+        WHERE fsrd.`sid` = #{busSid}
+        GROUP BY fsrd.sid
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -622,4 +622,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     public List<String> fetchJzMoneyByContractNoAndMainSid(String ysCustNo, String sid) {
         return baseMapper.fetchJzMoneyByContractNoAndMainSid(ysCustNo,sid);
     }
+
+    public FinSelectedReceivablesDetailed fetchYeBySid(String busSid) {
+        return baseMapper.fetchYeBySid(busSid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java

@@ -27,6 +27,11 @@ public class OtherReceivableBillService extends FinKingDeeService {
         //业务表的主表数据集合
         Map<String,String> map_fEntityModel_=new HashMap<>();
         //物料的数组集合
+        //单据编号
+        if(otherReceivable.getBillNo()==null){
+            return rb.setMsg("单据编号不能为空");
+        }
+        map_fEntityModel_.put("FBillNo",otherReceivable.getBillNo());
         //业务日期
         if(otherReceivable.getBussDate()==null){
             return rb.setMsg("业务日期不能为空");

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json

@@ -3,7 +3,7 @@
   "FBillTypeID": {
     "FNUMBER": "QTYSD01_SYS"
   },
-  "FBillNo": "",
+  "FBillNo": "@KD_FBillNo",
   "FDATE": "@KD_FDATE",
   "FENDDATE_H": "1900-01-01",
   "FISINIT": "false",

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java

@@ -67,4 +67,8 @@ public class LoanPreloanCreditApplyVo implements Vo {
     private String zffkjg;
     @ApiModelProperty("申诉结果")
     private String ssjg;
+    @ApiModelProperty("是否可以办理")
+    private Boolean isEdit;
+    @ApiModelProperty("是否可以删除")
+    private Boolean isDelete;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -141,6 +141,16 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         }
         IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pq);
         IPage<LoanPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (LoanPreloanCreditApplyVo record : pagging.getRecords()) {
+            String state = record.getState();
+            if ("1".equals(state)){
+                record.setIsEdit(true);
+                record.setIsDelete(true);
+            }else {
+                record.setIsEdit(false);
+                record.setIsDelete(false);
+            }
+        }
         PagerVo<LoanPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -224,6 +234,16 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         }
         IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pq);
         IPage<LoanPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (LoanPreloanCreditApplyVo record : pagging.getRecords()) {
+            String state = record.getState();
+            if ("0".equals(state)){
+                record.setIsEdit(true);
+                record.setIsDelete(false);
+            }else {
+                record.setIsEdit(false);
+                record.setIsDelete(false);
+            }
+        }
         PagerVo<LoanPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

工作内容需要的文档/单据模板/款项结转打印模板/款项结转（调账申请）.doc

@@ -1,6 +1,9 @@
 
 |调账申请                                                           |
 |${saleDate!}                                                       |
-|调账类|合同编号                  |客户 |物料编码                   |
+|调账类型  |合同编号  |客户名称  |物料编码  |调出金额  |调入金额  |
-|型    |                          |名称 |                           |
+|${tz.tzTyp|${tz.conNo|${tz.name!|${tz.vinNo|${tz.dcje!|${tz.drje!|
+|e!}       |!}        |}         |!}        |}         |}         |
+|申请人|${makeName!}              |审核 |${spName!}                 |
+|：    |                          |人： |                           |