款项结转问题优化

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java

@@ -69,5 +69,6 @@ public class FinFundsCarriedForwardVehDetailsVo implements Vo {
     private String balance; // 剩余金额
 	@ApiModelProperty("本次使用金额")
     private String thisUseMoney; // 本次使用金额
-
+    @ApiModelProperty("联系电话")
+    private String draweeMobile;
 }

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

@@ -2789,6 +2789,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");
         IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
         IPage<FinCollectionConfirmationJYDDKYDJVo> pagging = baseMapper.jyddkydjListPage(page, qw);
         List<FinCollectionConfirmationJYDDKYDJVo> records = pagging.getRecords();

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

@@ -30,10 +30,16 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 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;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
 import com.yxt.anrui.fin.api.finfundscarriedforwardapply.*;
 import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeQuery;
@@ -46,10 +52,14 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
+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.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
+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;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -60,6 +70,7 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -67,6 +78,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ConstantUtils;
+import com.yxt.common.base.utils.HanZiConverterPinYin;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.WordUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -106,6 +118,12 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
     private FinCollectionConfirmationService finCollectionConfirmationService;
     @Autowired
     private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService;
@@ -122,6 +140,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     @Autowired
     private FlowTaskFeign flowTaskFeign;
     @Autowired
+    private OtherReceivableBillService otherReceivableBillService;
+    @Autowired
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
     @Autowired
     private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
@@ -521,6 +541,10 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         ResultBean rb = ResultBean.fireFail();
         //用户的组织全路径
         FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(dto.getSid());
+        //销售部门信息
+        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) {
@@ -567,6 +591,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 dto.setIsOneSale(true);
                 String sid = saveOrUpdateAll(dto).getData();
                 finFundsCarriedForwardApply = fetchBySid(sid);
+                FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(sid).getData();
+                List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos1 = data.getFinFundsCarriedForwardVehDetailsVos();
+                List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos1 = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                 String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
                 baseMapper.updatePathBySid(pdfPath, sid);
                 updateYeBySid(sid);
@@ -578,6 +605,58 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                         finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
                     }
                 }
+                List<String> jzCustNos = new ArrayList<>();
+                List<String> ysCustNos = new ArrayList<>();
+                for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo2 : finFundsCarriedForwardVehDetailsVos1) {
+                    FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo2.getBusSid());
+                    String custNo = "";
+                    if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
+                        custNo = finSelectedReceivablesDetailed.getContractNo();
+                    } else {//贷款
+                        BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
+                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
+                        custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
+                    }
+                    jzCustNos.add(custNo);
+                }
+                jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
+                for (String jzCustNo : jzCustNos) {
+                    OtherReceivable otherReceivable = new OtherReceivable();
+                    otherReceivable.setCommUnit(jzCustNo);
+                    otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
+                    otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
+                    OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                    collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                    jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2);
+                    String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid());
+                    collectionDetailDto.setExTaxMoney(jzMoney);
+                    otherReceivableBillService.otherReceivableBillService(otherReceivable);
+                }
+                for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos1) {
+                    FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo2.getSid());
+                    String custNo = "";
+                    if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
+                        custNo = finSelectedReceivablesDetailed.getContractNo();
+                    } else {//贷款
+                        BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
+                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
+                        custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
+                    }
+                    ysCustNos.add(custNo);
+                }
+                ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
+                for (String ysCustNo : ysCustNos) {
+                    OtherReceivable otherReceivable = new OtherReceivable();
+                    otherReceivable.setCommUnit(ysCustNo);
+                    otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
+                    otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
+                    OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                    collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                    ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2);
+                    String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid());
+                    collectionDetailDto.setExTaxMoney("-" + jzMoney);
+                    otherReceivableBillService.otherReceivableBillService(otherReceivable);
+                }
                 return rb.success();
             }
         }
@@ -931,6 +1010,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
         FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(businessSid);
+        //销售部门信息
+        SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(finFundsCarriedForwardApply.getSaleDeptSid()).getData();
+        //分公司信息
+        SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(finFundsCarriedForwardApply.getUseOrgSid()).getData();
+        FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
@@ -955,9 +1039,110 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 String pdfPath = createPdf(finFundsCarriedForwardApply.getSid(), finFundsCarriedForwardApply.getCreateByName()).getData();
                 baseMapper.updatePathBySid(pdfPath, businessSid);
-                List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = finFundsCarriedForwardVehService.fetchByMainSid(businessSid);
+                List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
+                for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
+                    finSelectedReceivablesDetailedService.updateAuditStateBySid(3, appFinFundsCarriedForwardYXYSKXVo.getSid());
+                }
+                List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
+                List<String> jzCustNos = new ArrayList<>();
+                List<String> ysCustNos = new ArrayList<>();
+                if ("简易订单订金".equals(finFundsCarriedForwardApply.getSource())) {
+                    List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos1 = finFundsCarriedForwardVehService.fetchByMainSidAndGroupCustPhone(finFundsCarriedForwardApply.getSid());
+                    for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos1) {
+                        String customerName = finFundsCarriedForwardVehDetailsVo.getCustomerName();
+                        String draweeMobile = finFundsCarriedForwardVehDetailsVo.getDraweeMobile();
+                        String custNo = getPrefix(finFundsCarriedForwardApply.getStaffSid(), customerName, draweeMobile);
+                        jzCustNos.add(custNo);
+                    }
+                    jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
+                    for (String jzCustNo : jzCustNos) {
+                        OtherReceivable otherReceivable = new OtherReceivable();
+                        otherReceivable.setCommUnit(jzCustNo);
+                        otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
+                        otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
+                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                        jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2);
+                        String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid());
+                        collectionDetailDto.setExTaxMoney(jzMoney);
+                        otherReceivableBillService.otherReceivableBillService(otherReceivable);
+                    }
+                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
+                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                        String custNo = "";
+                        if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
+                            custNo = finSelectedReceivablesDetailed.getContractNo();
+                        } else {//贷款
+                            BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
+                            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
+                            custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
+                        }
+                        ysCustNos.add(custNo);
+                    }
+                    ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
+                    for (String ysCustNo : ysCustNos) {
+                        OtherReceivable otherReceivable = new OtherReceivable();
+                        otherReceivable.setCommUnit(ysCustNo);
+                        otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
+                        otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
+                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                        ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2);
+                        String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid());
+                        collectionDetailDto.setExTaxMoney("-" + jzMoney);
+                        otherReceivableBillService.otherReceivableBillService(otherReceivable);
+                    }
+                } else if ("已认款".equals(finFundsCarriedForwardApply.getSource())) {
                     for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
-                    finSelectedReceivablesDetailedService.updateAuditStateBySid(3,finFundsCarriedForwardVehDetailsVo.getBusSid());
+                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
+                        String custNo = "";
+                        if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
+                            custNo = finSelectedReceivablesDetailed.getContractNo();
+                        } else {//贷款
+                            BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
+                            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
+                            custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
+                        }
+                        jzCustNos.add(custNo);
+                    }
+                    jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
+                    for (String jzCustNo : jzCustNos) {
+                        OtherReceivable otherReceivable = new OtherReceivable();
+                        otherReceivable.setCommUnit(jzCustNo);
+                        otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
+                        otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
+                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                        jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2);
+                        String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid());
+                        collectionDetailDto.setExTaxMoney(jzMoney);
+                        otherReceivableBillService.otherReceivableBillService(otherReceivable);
+                    }
+                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
+                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                        String custNo = "";
+                        if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
+                            custNo = finSelectedReceivablesDetailed.getContractNo();
+                        } else {//贷款
+                            BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
+                            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
+                            custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
+                        }
+                        ysCustNos.add(custNo);
+                    }
+                    ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
+                    for (String ysCustNo : ysCustNos) {
+                        OtherReceivable otherReceivable = new OtherReceivable();
+                        otherReceivable.setCommUnit(ysCustNo);
+                        otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
+                        otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
+                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                        ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2);
+                        String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid());
+                        collectionDetailDto.setExTaxMoney("-" + jzMoney);
+                        otherReceivableBillService.otherReceivableBillService(otherReceivable);
+                    }
                 }
             } else {
                 //极光推送
@@ -1157,4 +1342,35 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
         return rb.success().setData("template/" + dateStr + "/" + pdfName);
     }
+
+    public String getPrefix(String staffSid, String name, String mobile) {
+        String customerNoPrefix = "";
+        //查询业务员的分公司简称和部门编码
+        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(staffSid);
+        if (staffOrgResultBean.getSuccess()) {
+            SysStaffOrg sysStaffOrg = staffOrgResultBean.getData();
+            if (sysStaffOrg != null) {
+                ResultBean<String> resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath());
+                if (resultBean1.getSuccess()) {
+                    String osid = resultBean1.getData();
+                    if (StringUtils.isNotBlank(osid)) {
+                        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid);
+                        if (sysOrganizationVoResultBean.getSuccess()) {
+                            SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
+                            customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre();
+                        }
+                    }
+                }
+                String orgSid1 = sysStaffOrg.getOrgSid();
+                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1);
+                if (sysOrganizationVoResultBean.getSuccess()) {
+                    SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
+                    customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode();
+                }
+            }
+        }
+        customerNoPrefix = customerNoPrefix + mobile + HanZiConverterPinYin.getPinYinFirst(name);
+        System.out.println(customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix);
+        return customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix;
+    }
 }

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

@@ -76,4 +76,8 @@ public interface FinFundsCarriedForwardVehMapper extends BaseMapper<FinFundsCarr
 	void updateYeByMainSid(@Param("balance") String balance,@Param("sid") String sid);
 
     String selectByBusSid(List<String> sidsList);
+
+	List<FinFundsCarriedForwardVehDetailsVo> fetchByMainSidAndGroupCustPhone(String sid);
+
+    String fetchJzMoneyByContractNoAndMainSid(@Param("jzCustNo") String jzCustNo,@Param("sid") String sid);
 }

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

@@ -44,4 +44,23 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="fetchByMainSidAndGroupCustPhone"
+            resultType="com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDetailsVo">
+        SELECT ffv.*, bd.draweeMobile
+        FROM fin_funds_carried_forward_veh ffv
+                     LEFT JOIN fin_collection_confirmation fcc
+                ON ffv.`busSid` = fcc.`sid`
+                     LEFT JOIN anrui_buscenter.`bus_deposit` bd
+                ON fcc.`busSid` = bd.`billSid`
+        WHERE ffv.`mainSid` = #{sid}
+        GROUP BY bd.`draweeMobile`
+    </select>
+
+    <select id="fetchJzMoneyByContractNoAndMainSid" resultType="java.lang.String">
+        SELECT SUM(ffc.`thisUseMoney`) AS jzMoney
+        FROM fin_funds_carried_forward_veh ffc
+        WHERE ffc.busBillNo = #{jzCustNo}
+          AND ffc.mainSid = #{sid}
+    </select>
 </mapper>

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

@@ -161,4 +161,12 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService<FinFund
 	public String selectByBusSid(List<String> sidsList) {
 		return baseMapper.selectByBusSid(sidsList);
 	}
+
+	public List<FinFundsCarriedForwardVehDetailsVo> fetchByMainSidAndGroupCustPhone(String sid) {
+		return baseMapper.fetchByMainSidAndGroupCustPhone(sid);
+	}
+
+	public String fetchJzMoneyByContractNoAndMainSid(String jzCustNo, String sid) {
+		return baseMapper.fetchJzMoneyByContractNoAndMainSid(jzCustNo,sid);
+	}
 }

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

@@ -156,6 +156,8 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     @Update("update fin_selected_receivables_detailed set balance = #{balance} where sid = #{busSid}")
     void updateYeBySid(@Param("balance") String balance,@Param("busSid") String busSid);
 
+    String fetchJzMoneyByContractNoAndMainSid(@Param("ysCustNo") String ysCustNo,@Param("sid") String sid);
+
     String selectBalanceByReceivedSid(String receivablesSid);
 
     List<FinSelectedReceivablesDetailed> selectListByReceivableSid(String receivablesSid);

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

@@ -24,25 +24,18 @@
     <!--手机端—查询可使用款项明细列表-->
     <select id="getPaymentDetailsList"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
-        SELECT distinct furd.sid,
-                        furd.contractNo                                     AS contractId,
-                        furd.receivablesName                                AS projectName,
-                        furd.customerPhone                                  AS mobile,
-                        furd.customerName                                   AS `name`,
-                        furd.customerSid,
-                        furd.useOrgSid,
-                        (furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS receivable,
-                        furd.contractSid,
-                        if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
-                           if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo),
-                           RIGHT(bv.linkNo, 8))                             as vin,
+        SELECT sid,
+        contractNo AS contractId,
+        receivablesName AS projectName,
+        customerPhone AS mobile,
+        customerName AS `name`,
+        currentReceivableMoney AS receivable,
+        contractSid,
+        <!--currentReceivableMoney AS confirmMoney,-->
+        VIN AS vin,
         furd.busVinSid,
         furd.payType,
-                        furd.payTypeKey,
-                        0                                                   as subscribedOf,
-                        furd.sid                                            as receivablesSid,
-                        CURRENT_DATE()                                      as confirmDate,
-                        furd.purchaseSystemSid
+        furd.payTypeKey
         FROM fin_uncollected_receivables_detailed furd
                  left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
                  LEFT JOIN (
@@ -206,6 +199,7 @@
           and auditState = #{state}
           and receivablesName = #{type}
           and payTypeKey = #{payTypeKey}
+          and subscribedOf = 0
         group by contractNo
     </select>
 
@@ -217,6 +211,7 @@
           and auditState = #{state}
           and receivablesName = #{type}
           and payTypeKey = #{payTypeKey}
+          and subscribedOf = 0
     </select>
 
     <select id="selectCustomerList" resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo">
@@ -225,6 +220,7 @@
         where collSid = #{sid}
           and auditState = #{state}
           and receivablesName = #{type}
+          and subscribedOf = 0
         group by concat(customerName, customerPhone)
     </select>
 
@@ -234,6 +230,7 @@
         from fin_selected_receivables_detailed
         where collSid = #{sid}
           and auditState = #{state}
+          and subscribedOf = 0
           and receivablesName = #{type}
     </select>
 
@@ -246,6 +243,7 @@
           and receivablesName = #{type}
           and customerName = #{customerName}
           and customerPhone = #{customerPhone}
+          and subscribedOf = 0
           and length(VIN) > 0
     </select>
 
@@ -257,6 +255,7 @@
           and auditState = #{state}
           and receivablesName = #{type}
           and contractNo = #{contractNo}
+          and subscribedOf = 0
           and length(VIN) > 0
     </select>
 
@@ -268,6 +267,7 @@
           and auditState = #{state}
           and receivablesName = #{type}
           and contractNo = #{contractNo}
+          and subscribedOf = 0
           and length(VIN) = 0
     </select>
 
@@ -280,6 +280,7 @@
           and receivablesName = #{type}
           and customerName = #{customerName}
           and customerPhone = #{customerPhone}
+          and subscribedOf = 0
           and length(VIN) = 0
     </select>
 
@@ -290,6 +291,7 @@
         LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = fd.`sid`
         where ff.busVinSid = #{busVinSid}
           and fd.auditState = 3
+          and subscribedOf = 0
     </select>
 
     <update id="updateAuditStateBySid">
@@ -352,7 +354,8 @@
 
     <select id="noOutVehRecPageList"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo">
-        SELECT ferd.sid,
+        SELECT
+        ferd.sid,
         fcc.`useOrgSid`,
         fcc.`staffDeptName`,
         fcc.staffUserSid AS staffSid,
@@ -367,16 +370,49 @@
         ferd.`subscriptionMoney`,
         ferd.balance AS reveivableMoney,
         ferd.kxState AS state
-        FROM fin_selected_receivables_detailed ferd
+        FROM
+        fin_selected_receivables_detailed ferd
         LEFT JOIN fin_collection_confirmation fcc
         ON ferd.`collSid` = fcc.`sid`
         LEFT JOIN anrui_base.`base_vehicle` bv
-                           ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8) AND fcc.`useOrgSid` = bv.`createOrgSid`
+        ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8)
+        AND fcc.`useOrgSid` = bv.`createOrgSid`
+        UNION
+        SELECT
+        ferd.sid,
+        ffcfa.useOrgSid,
+        ffcfa.saleDeptName AS staffDeptName,
+        ffcfa.staffSid,
+        ffcfa.`staffName`,
+        ferd.`contractNo`,
+        ferd.`payType`,
+        ferd.`customerName`,
+        ferd.`customerPhone`,
+        ferd.`VIN` AS vinNo,
+        ferd.`receivablesName`,
+        ferd.`auditDate`,
+        ferd.`subscriptionMoney`,
+        ferd.balance AS reveivableMoney,
+        ferd.kxState AS state
+        FROM
+        fin_selected_receivables_detailed ferd
+        LEFT JOIN fin_funds_carried_forward_apply ffcfa
+        ON ferd.`collSid` = ffcfa.`sid`
+        LEFT JOIN anrui_base.`base_vehicle` bv
+        ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8)
+        AND ffcfa.`useOrgSid` = bv.`createOrgSid`
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
 
+    <select id="fetchJzMoneyByContractNoAndMainSid" resultType="java.lang.String">
+        SELECT SUM(fsr.`subscriptionMoney`) AS jzMoney
+        FROM fin_selected_receivables_detailed fsr
+        WHERE fsr.`contractNo` = #{ysCustNo}
+          AND fsr.`collSid` = #{sid}
+    </select>
+
     <select id="selectBalanceByReceivedSid"
             resultType="java.lang.String">
         select ifnull(sum(balance), 0)

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

@@ -568,10 +568,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         qw.eq("ferd.auditState", 3);
         qw.ne("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode());
         if (StringUtils.isNotBlank(query.getStaffDeptName())) {
-            qw.like("fcc.staffDeptName", query.getStaffDeptName());
+            qw.and(wrapper -> wrapper.like("fcc.staffDeptName", query.getStaffDeptName()).or().like("ffcfa.saleDeptName", query.getStaffDeptName()));
         }
         if (StringUtils.isNotBlank(query.getStaffName())) {
-            qw.like("fcc.staffName", query.getStaffName());
+            qw.and(wrapper -> wrapper.like("fcc.staffName", query.getStaffName()).or().like("ffcfa.staffName", query.getStaffName()));
         }
         if (StringUtils.isNotBlank(query.getContractNo())) {
             qw.like("ferd.contractNo", query.getContractNo());
@@ -591,7 +591,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
             qw.between("ferd.balance", balanceSmallMoney, balanceBigMoney);
         }
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.and(wrapper -> wrapper.like("ferd.contractNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("fcc.staffName", query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName()));
+            qw.and(wrapper -> wrapper.like("ferd.contractNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("ffcfa.saleDeptName",query.getName()).or().like("ffcfa.staffName",query.getName()).or().like("fcc.staffName", query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName()));
         }
         IPage<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pagerQuery);
         IPage<FinSelectReceivablesDetailedWCKCLRKVo> pagging = baseMapper.noOutVehRecPageList(page, qw);
@@ -618,4 +618,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     public List<FinSelectedReceivablesDetailed> selectListByReceivableSid(String receivablesSid) {
         return baseMapper.selectListByReceivableSid(receivablesSid);
     }
+
+    public String fetchJzMoneyByContractNoAndMainSid(String ysCustNo, String sid) {
+        return baseMapper.fetchJzMoneyByContractNoAndMainSid(ysCustNo,sid);
+    }
 }

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

@@ -29,12 +29,10 @@ public class OtherReceivableBillCastToKingDeeBillFields {
         String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data.json");
         String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_data.json");
         String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json");
-          String fEntityPlan_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntityPlan.json");
 
         //模板字符创转json
         JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
         JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField);
-        JSONObject jsonFEntityPlan_= JSONObject.parseObject(fEntityPlan_,Feature.OrderedField);
         fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
         JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField);
 
@@ -42,7 +40,7 @@ public class OtherReceivableBillCastToKingDeeBillFields {
 
         //对模板字段赋值  根据传递进来的map数据的集合进行赋值
         for(int i=0;i<vehicleList.size();i++){
-            String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntityDetail.json");
+            String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntity.json");
             Map<String,String> params=vehicleList.get(i);
             Map<String,String> map_fEntityDetail_=new HashMap<>();
             for (Map.Entry<String, String> entry : params.entrySet()) {
@@ -53,9 +51,6 @@ public class OtherReceivableBillCastToKingDeeBillFields {
         }
 
         jsonFEntityModel_.put("FEntityDetail", JSONArray.parseArray(JSON.toJSONString(list_fEntityDetail_)));
-        List<JSONObject> list_fEntityPlan_=new ArrayList<>();
-        list_fEntityPlan_.add( jsonFEntityPlan_);
-        jsonFEntityModel_.put("FEntityPlan", JSONArray.parseArray(JSON.toJSONString(list_fEntityPlan_)));
         jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField));
         jsonObj.put("data",jsonFEntityData_.toJSONString());
 

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

@@ -0,0 +1,10 @@
+{
+  "FCOSTDEPARTMENTID": {
+    "FNumber": "@KD_FCOSTDEPARTMENTID"
+  },
+  "FINVOICETYPE": "普通发票",
+  "FNOTAXAMOUNTFOR": "@KD_FNOTAXAMOUNTFOR",
+  "F_PAEZ_Assistant1": {
+    "FNumber": "调账申请"
+  }
+}

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

@@ -1,31 +0,0 @@
-{
-  "FMATERIALID": {
-    "FNumber": "@KD_FMATERIALID"
-  },
-  "FMaterialDesc": "@KD_FMaterialDesc",
-  "FPRICEUNITID": {
-    "FNumber": "@KD_FPRICEUNITID"
-  },
-  "FPriceQty": 1.0,
-  "FTaxPrice": 12222.0,
-  "FPrice": 12100.99,
-  "FEntryTaxRate": 1.0,
-  "FNoTaxAmountFor_D": 12100.99,
-  "FTAXAMOUNTFOR_D": 121.01,
-  "FALLAMOUNTFOR_D": 12222.0,
-  "FDeliveryControl": false,
-  "FStockUnitId": {
-    "FNumber": "@KD_FPRICEUNITID"
-  },
-  "FStockQty": 1.0,
-  "FIsFree": false,
-  "FStockBaseQty": 1.0,
-  "FSalUnitId": {
-    "FNumber": "@KD_FPRICEUNITID"
-  },
-  "FSalQty": 1.0,
-  "FSalBaseQty": 1.0,
-  "FPriceBaseDen": 1.0,
-  "FSalBaseNum": 1.0,
-  "FStockBaseNum": 1.0
-}

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

@@ -1,5 +0,0 @@
-{
-  "FENDDATE": "2022-08-02 00:00:00",
-  "FPAYRATE": 100.0,
-  "FPAYAMOUNTFOR": 12222.0
-}

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

@@ -1,60 +1,21 @@
 {
-  "FID": 0,
+  "FID": "0",
   "FBillTypeID": {
-    "FNUMBER": "YSD01_SYS"
+    "FNUMBER": "其他应收单"
   },
-  "FDATE": "@KD_FDATE",
-  "FISINIT": false,
-  "FENDDATE_H": "@KD_FDATE",
-  "FCUSTOMERID": {
-    "FNumber": "@KD_FCUSTOMERID"
+  "FDATE": "@KD_bussDate",
+  "FCONTACTUNITTYPE": "客户",
+  "FCONTACTUNIT": {
+    "FNumber": "@KD_commUnit"
   },
-  "FCURRENCYID": {
-    "FNumber": "PRE001"
-  },
-  "FISPRICEEXCLUDETAX": true,
   "FSETTLEORGID": {
-    "FNumber": "101"
+    "FNumber": "@KD_collectionOrg"
   },
   "FPAYORGID": {
-    "FNumber": "101"
-  },
-  "FSALEORGID": {
-    "FNumber": "101"
-  },
-  "FAR_Remark": "@KD_FAR_Remark",
-  "FISTAX": true,
-  "FCancelStatus": "A",
-  "FBUSINESSTYPE": "BZ",
-  "FSetAccountType": "1",
-  "FISHookMatch": false,
-  "FISINVOICEARLIER": false,
-  "F_PMZC_Assistant2": {
-    "FNumber": "01"
-  },
-  "FsubHeadSuppiler": {
-    "FORDERID": {
-      "FNumber": "@KD_FCUSTOMERID"
-    },
-    "FTRANSFERID": {
-      "FNumber": "@KD_FCUSTOMERID"
+    "FNumber": "@KD_collectionOrg"
   },
-    "FChargeId": {
-      "FNumber": "@KD_FCUSTOMERID"
-    }
-  },
-  "FsubHeadFinc": {
-    "FACCNTTIMEJUDGETIME": "@KD_FDATE",
-    "FMAINBOOKSTDCURRID": {
-      "FNumber": "PRE001"
-    },
-    "FEXCHANGETYPE": {
-      "FNumber": "HLTX01_SYS"
-    },
-    "FExchangeRate": 1.0,
-    "FTaxAmountFor": 121.01,
-    "FNoTaxAmountFor": 12100.99
+  "FCURRENCYID": {
+    "FNumber": "人民币"
   },
-  "FEntityDetail": [],
-  "FEntityPlan": []
+  "FEntity": []
 }

anrui-gateway/src/main/resources/application-devv.yml

@@ -4,16 +4,16 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 39.104.100.138:8848
+        server-addr: 127.0.0.1:8848
   redis:
     database: 3  # Redis数据库索引（默认为0）
-    host: 39.104.100.138
+    host: 127.0.0.1
     jedis:
       pool:
         max-active: -1  #连接池最大连接数（使用负值表示没有限制）
         max-idle: 8  #连接池中的最大空闲连接
         max-wait: -1   # 连接池最大阻塞等待时间（使用负值表示没有限制）
         min-idle: 0  # 连接池中的最小空闲连接
-    password:
+    password: 123456
     port: 6379
-    timeout: 0  # 连接超时时间(毫秒)
+    timeout: 0  # 连接超时时间（毫秒）

anrui-portal/anrui-portal-biz/src/main/resources/application-devv.yml

@@ -25,11 +25,9 @@ image:
   upload:
     path: D:\\anrui\\upload\\
   url:
-    prefix: http://192.168.1.107:8111/upload/
+    prefix: http://192.168.1.112:8111/upload/
   login:
     path: D:\\images\\pic-click
 config:
   url:
-    prefix: http://192.168.1.107:8111/
-
-
+    prefix: http://192.168.1.105:8111/

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeo.java

@@ -37,6 +37,8 @@ import lombok.Data;
 public class LoanPreloanCreditPeo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("主表sid")
+    private String mainSid;
 	@ApiModelProperty("人员身份key")
     private String peoTypeKey; // 人员身份key
 	@ApiModelProperty("人员身份value")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoDetailsVo.java

@@ -40,6 +40,10 @@ public class LoanPreloanCreditPeoDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("主表sid")
+    private String mainSid;
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("人员身份key")
     private String peoTypeKey; // 人员身份key
 	@ApiModelProperty("人员身份value")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoDto.java

@@ -40,6 +40,10 @@ public class LoanPreloanCreditPeoDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("主表sid")
+    private String mainSid;
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("人员身份key")
     private String peoTypeKey; // 人员身份key
 	@ApiModelProperty("人员身份value")

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

@@ -279,6 +279,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                 commonAppendixFeign.save(commonAppendixDto);
             }
             for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
+                loanPreloanCreditPeo.setMainSid(sid);
                 String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
                 List<String> idCardImages1 = loanPreloanCreditPeo.getIdCardImages();
                 for (String s : idCardImages1) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-devv.yml

@@ -20,4 +20,8 @@ spring:
     password:
     port: 6379
     timeout: 0  # 连接超时时间（毫秒）
-
+image:
+  upload:
+    path: D:\\anrui\\upload\\
+  url:
+    prefix: http://192.168.1.112:8111/upload/