修改问题

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1602,11 +1602,15 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
         String idNo = crmCustomerTempVo.getIDNumber();
         //身份证号
-        if("1".equals(crmCustomerTempVo.getCustomerTypeKey())){
-            if (StringUtils.isBlank(idNo)) {
-                return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
+        //生成合同时如果为个人时，证件证号全款不是必须的、贷款必须。企业的证件号码不必须。
+        if("2".equals(appOrderDetailsVo.getPayTypeKey())){
+            if("1".equals(crmCustomerTempVo.getCustomerTypeKey())){
+                if (StringUtils.isBlank(idNo)) {
+                    return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
+                }
             }
         }
+
         //查询销售订单的车型信息
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
         //根据车型sid查询车型的全称

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

@@ -68,7 +68,9 @@
             <if test="name != null and name != ''">
                 and concat(IFNULL(bo.customerName
                   , '')
-                  , ifnull(bo.billNo
+                  ,IFNULL(bo.staffName
+                , '')
+                , ifnull(bo.billNo
                   , '')) LIKE concat('%'
                   , #{name}
                   , '%')

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

@@ -1310,7 +1310,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //推送收款单
         ARReceivebill arReceivebill = new ARReceivebill();
         //业务日期
-        arReceivebill.setFDATE(DateUtil.today());
+//        arReceivebill.setFDATE(DateUtil.today());
+        arReceivebill.setFDATE(confirmation.getCreateDate());//收款日期
         //收款组织
         ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid());
         BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(confirmation.getPurchaseSystemSid()).getData();