Merge remote-tracking branch 'origin/master'

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

@@ -806,6 +806,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String ftl = "";
         AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
         AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
+        ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
+        if (crmResultBean.getSuccess()) {
+            CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
+            String idNo = crmCustomerTempVo.getIDNumber();
+            map.put("carSaleCustomerName",crmCustomerTempVo.getName());
+            map.put("carSaleIdNo",idNo);
+            map.put("carSaleAddr",crmCustomerTempVo.getAddress());
+        }
         //车架号集合
         List<String> stringList = new ArrayList<>();
         //查询台数
@@ -920,6 +928,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String ftl = "";
         AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
         AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
+        ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
+        if (crmResultBean.getSuccess()) {
+            CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
+            String idNo = crmCustomerTempVo.getIDNumber();
+            map.put("carSaleCustomerName",crmCustomerTempVo.getName());
+            map.put("carSaleIdNo",idNo);
+            map.put("carSaleAddr",crmCustomerTempVo.getAddress());
+        }
         //车架号集合
         List<String> stringList = new ArrayList<>();
         //查询台数
@@ -1608,6 +1624,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String ftl = "";
         AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
         AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
+        ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
+        if (crmResultBean.getSuccess()) {
+            CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
+            String idNo = crmCustomerTempVo.getIDNumber();
+            map.put("carSaleCustomerName",crmCustomerTempVo.getName());
+            map.put("carSaleIdNo",idNo);
+            map.put("carSaleAddr",crmCustomerTempVo.getAddress());
+        }
         //车架号集合
         List<String> stringList = new ArrayList<>();
         //查询台数
@@ -1701,6 +1725,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String ftl = "";
         AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
         AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
+        ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
+        if (crmResultBean.getSuccess()) {
+            CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
+            String idNo = crmCustomerTempVo.getIDNumber();
+            map.put("carSaleCustomerName",crmCustomerTempVo.getName());
+            map.put("carSaleIdNo",idNo);
+            map.put("carSaleAddr",crmCustomerTempVo.getAddress());
+        }
         //车架号集合
         List<String> stringList = new ArrayList<>();
         //查询台数

anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl

@@ -1151,7 +1151,12 @@
                         <w:sz-cs w:val="19"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                          </w:t>-->
+                    <#if carSaleCustomerName??>
+                        <w:t> ${carSaleCustomerName!}  </w:t>
+                    <#else>
                         <w:t>                          </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="00B738F3">
                     <w:rPr>
@@ -1214,7 +1219,12 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                     </w:t>-->
+                    <#if carSaleIdNo??>
+                        <w:t>   ${carSaleIdNo!}   </w:t>
+                    <#else>
                         <w:t>                     </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="00B738F3">
                     <w:rPr>
@@ -1278,7 +1288,12 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                                                           </w:t>-->
+                    <#if carSaleAddr??>
+                        <w:t>${carSaleAddr!} </w:t>
+                    <#else>
                         <w:t>                                                           </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="00B738F3">
                     <w:rPr>

anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl

@@ -1084,7 +1084,12 @@
                         <w:sz-cs w:val="19"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                          </w:t>-->
+                    <#if carSaleCustomerName??>
+                        <w:t> ${carSaleCustomerName!}  </w:t>
+                    <#else>
                         <w:t>                          </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="0086369C">
                     <w:rPr>
@@ -1153,7 +1158,12 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                     </w:t>-->
+                    <#if carSaleIdNo??>
+                        <w:t>   ${carSaleIdNo!}   </w:t>
+                    <#else>
                         <w:t>                     </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="0086369C">
                     <w:rPr>
@@ -1223,7 +1233,12 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                                                           </w:t>-->
+                    <#if carSaleAddr??>
+                        <w:t>${carSaleAddr!} </w:t>
+                    <#else>
                         <w:t>                                                           </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="0086369C">
                     <w:rPr>

anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl

@@ -1039,7 +1039,12 @@
                         <w:sz-cs w:val="19"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                   <#-- <w:t>                          </w:t>-->
+                    <#if carSaleCustomerName??>
+                        <w:t> ${carSaleCustomerName!}  </w:t>
+                    <#else>
                         <w:t>                          </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="000B0934">
                     <w:rPr>
@@ -1102,7 +1107,12 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                     </w:t>-->
+                    <#if carSaleIdNo??>
+                        <w:t>   ${carSaleIdNo!}   </w:t>
+                    <#else>
                         <w:t>                     </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="000B0934">
                     <w:rPr>
@@ -1166,7 +1176,12 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                                                           </w:t>-->
+                    <#if carSaleAddr??>
+                        <w:t>${carSaleAddr!} </w:t>
+                    <#else>
                         <w:t>                                                           </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="000B0934">
                     <w:rPr>

anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl

@@ -1166,7 +1166,12 @@
                         <w:sz-cs w:val="19"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                          </w:t>-->
+                    <#if carSaleCustomerName??>
+                        <w:t> ${carSaleCustomerName!}  </w:t>
+                    <#else>
                         <w:t>                          </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="0071392F">
                     <w:rPr>
@@ -1229,7 +1234,12 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                     </w:t>-->
+                    <#if carSaleIdNo??>
+                        <w:t>   ${carSaleIdNo!}   </w:t>
+                    <#else>
                         <w:t>                     </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="0071392F">
                     <w:rPr>
@@ -1293,7 +1303,12 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
+                    <#--<w:t>                                                           </w:t>-->
+                    <#if carSaleAddr??>
+                        <w:t>${carSaleAddr!} </w:t>
+                    <#else>
                         <w:t>                                                           </w:t>
+                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="0071392F">
                     <w:rPr>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml

@@ -16,23 +16,18 @@
     </select>
     <select id="selByMainSid"
             resultType="com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo">
-        select sid,
+        select bhv.sid,
-               mainSid,
+        bhv.mainSid,
-               vinNo,
+        bhv.vinNo,
-        vinSid,
+        bhv.vinSid,
-              <!-- invoicingState   as invoicingStateb,
+        bhv.invoicingState ,
-               certificateState as certificateStateb,
+        bhv.certificateState,
-               policyState      as policyStateb,
+        bhv.policyState,
-               onBoardDataState as onBoardDataStateb,
+        bhv.onBoardDataState,
-               otherDataState   as otherDataStateb,-->
+        bhv.otherDataState,
-        invoicingState ,
+        bhv.remarks
-        certificateState,
+        from bus_handover_prepare_vehicle bhv
-        policyState,
+        where bhv.mainSid = #{sid}
-        onBoardDataState,
-        otherDataState,
-        remarks
-        from bus_handover_prepare_vehicle
-        where mainSid = #{sid}
     </select>
 
     <select id="selectByApplySid"

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java

@@ -183,28 +183,6 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
         return list;
     }
 
-   /* public void saveState(AppStateDateDto dto) {
-        String sid = dto.getSid();
-        String key = dto.getKey();
-        String vin = dto.getVin();
-        if ("01".equals(key)) {
-            baseMapper.saveInvoiceState(sid, vin);
-        }
-        if ("02".equals(key)) {
-            baseMapper.saveCertificateState(sid, vin);
-        }
-        if ("03".equals(key)) {
-            baseMapper.savePolicyState(sid, vin);
-        }
-        if ("04".equals(key)) {
-            baseMapper.saveOnBoardState(sid, vin);
-        }
-        if ("05".equals(key)) {
-            baseMapper.saveOtherDataState(sid, vin);
-        }
-
-    }*/
-
     public void deleteByMainSid(String sid) {
         baseMapper.deleteByMainSid(sid);
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml

@@ -6,7 +6,10 @@
         bh.customerName,
         bh.payTypeValue,
         bh.modelName,
-        bh.payStateValue
+        bh.payStateValue,
+        (select count(*) from bus_handover_wait bw left join anrui_base.base_vehicle bv on bv.sid = bw.vinSid
+        where bw.contractNo = bh.contractNo
+        and bw.isDelete = 0 and length(bv.vinNo)>8) as nums
         from bus_handover_wait bh
         <where>
             ${ew.sqlSegment}
@@ -19,28 +22,31 @@
                 , '%')
             </if>
         </where>
-        group by bh.contractNo
+        group by bh.contractNo having nums>0
     </select>
 
     <select id="selectByNo" resultType="com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListVo">
-        select vinNo, vinSid,sid
+        select bw.vinNo, bw.vinSid,bw.sid
-        from bus_handover_wait
+        from bus_handover_wait bw
-        where contractNo = #{contractNo}
+        left join anrui_base.base_vehicle bv on bv.sid = bw.vinSid
-          and isDelete = 0
+        where bw.contractNo = #{contractNo}
+          and bw.isDelete = 0
     </select>
     <select id="selectListPageVo"
             resultType="com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListPageVo">
         select
-        sid,
+        bw.sid,
-        contractNo,
+        bw.contractNo,
-        customerName,
+        bw.customerName,
-        payTypeValue,
+        bw.payTypeValue,
-        payStateValue,
+        bw.payStateValue,
-        vinNo,
+        bw.vinNo,
-        modelName
+        bw.modelName
-        from bus_handover_wait
+        from bus_handover_wait bw
+        left join anrui_base.base_vehicle bv on bv.sid = bw.vinSid
         <where>
             ${ew.sqlSegment}
+            and length(bv.vinNo)>8
         </where>
     </select>
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java

@@ -85,13 +85,13 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BusHandoverWait> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getContractNo())) {
-            qw.like("contractNo", query.getContractNo());
+            qw.like("bw.contractNo", query.getContractNo());
         }
         if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.like("vinNo", query.getVinNo());
+            qw.like("bw.vinNo", query.getVinNo());
         }
         if (StringUtils.isNotBlank(query.getCustomerName())) {
-            qw.like("customerName", query.getCustomerName());
+            qw.like("bw.customerName", query.getCustomerName());
         }
 //        //查询已提交交车办理车辆
 //        ResultBean<List<BusHandoverItems>> resultBean = busHandoverItemsService.getItemsList();
@@ -103,10 +103,10 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
 //                qw.notIn("vinSid", vinSidList);
 //            }
 //        }
-        qw.eq("createBySid", query.getUserSid());
+        qw.eq("bw.createBySid", query.getUserSid());
-        qw.eq("useOrgSid", query.getUseOrgSid());
+        qw.eq("bw.useOrgSid", query.getUseOrgSid());
-        qw.eq("isDelete", 0);
+        qw.eq("bw.isDelete", 0);
-        qw.orderByDesc("createTime");
+        qw.orderByDesc("bw.createTime");
         return qw;
     }
 

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

@@ -1876,6 +1876,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         } else {
                             vo.setMain(true);
                         }
+                    }else{
+                        vo.setMain(true);
                     }
                 }
             } else {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -692,7 +692,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             }
             List<BusSalesVehicleOrder> orderList = busSalesVehicleOrderService.selectByOrderSid(salesOrderSid);
             orderList.removeAll(Collections.singleton(null));
-            if (vinList.size() > 0) {
+            if (orderList.size() > 0) {
                 List<String> topSidLists = orderList.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList());
                 if (topSidLists.size() > 0) {
                     //清除上装信息

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

@@ -451,7 +451,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         IPage page = PagerUtil.queryToPage(pq);
         IPage<PcSelBillVinNoPageVo> pagging = baseMapper.getSelectVinsList(page, qw);
-        for (PcSelBillVinNoPageVo record : pagging.getRecords()) {
+        Iterator<PcSelBillVinNoPageVo> iterator = pagging.getRecords().iterator();
+        while (iterator.hasNext()){
+            PcSelBillVinNoPageVo record = iterator.next();
             //车架号截取后八位
             String vin = record.getVin();
             record.setVin(vin.substring(vin.length() - 8));
@@ -502,6 +504,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     }
                 } else if ("01".equals(solutionsDetailsVo.getTypeKey())) {//非担保
                     LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                    if (StringUtils.isBlank(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany())){
+                        iterator.remove();
+                    }
                     BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
                     CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
                     record.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
@@ -596,7 +601,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication.setArrearsMoney("0");
             String allDownloadUrl = createContractNo(dto);
             downloanVoUrl.setAllDownloadUrl(allDownloadUrl);
-            downloanVoUrl.setSid(dto.getSid());
+            downloanVoUrl.setSid(finBillApplication.getSid());
             finBillApplication.setFileUrl(allDownloadUrl);
             save(finBillApplication);
             //主车开票信息

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -540,6 +540,7 @@ public class SysUserRest implements SysUserFeign {
             return new ResultBean<SysUserVo>().fail().setMsg("请重新登录");
         }
         SysUser user = sysUserService.selectByUserName(userName);
+        user.setToken(token);
         SysUserVo userInfoOneVo = sysUserService.selectUserOne(user);
         if (userInfoOneVo == null) {
             return new ResultBean<SysUserVo>().fail().setMsg("该用户不是公司员工");

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -73,8 +73,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     /**
      * 设置redis的过期时间为4小时
      */
-//    public static final long USERS_REDIS_SESSION_TL_PC = 4 * 3600;
+    public static final long USERS_REDIS_SESSION_TL_PC = 4 * 3600;
-    public static final long USERS_REDIS_SESSION_TL_PC = 60;
+//    public static final long USERS_REDIS_SESSION_TL_PC = 60;
     public static final long USERS_REDIS_SESSION_TL_App = 24 * 15 * 3600;
     /**
      * 验证码长度

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -1040,13 +1040,13 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 if (vinNo.length() != 17) {
                     return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确");
                 }
-            }
                 //判断相同车架号在整个集团中是否存在非退库的
                 Integer count = baseVehicleFeign.selectVinNo(scmApplyInboundVehicleDto.getVinNo().substring(scmApplyInboundVehicleDto.getVinNo().length() - 8)).getData();
                 if (count > 0){
                     return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "在集团中存在未退库的车辆，无法入库");
                 }
             }
+        }
         /*int vinCount = 0;
         if (!vehicleList.isEmpty()) {
             for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {