Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java

@@ -171,9 +171,9 @@ public class BaseModelModpriceRest implements BaseModelModpriceFeign {
     @Override
     public void downloadModPriceExcel() {
         try {
-            InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("static/excel/调价申请模板.xls");
+            InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("static/excel/车型调价模板.xls");
             //获取要下载的模板名称
-            String fileName = "调价申请模板.xls";
+            String fileName = "车型调价模板.xls";
             response.setHeader("content-type", "application/octet-stream");
             response.setContentType("application/octet-stream");
             // 下载文件能正常显示中文

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -384,13 +384,13 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         if (stateList.contains(false)) {
             return rb.setMsg("已提交的申请不允许删除");
         }
-        for (String s : sidsList) {
+        /*for (String s : sidsList) {
             List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(s);
             for (int j = 0; j < stringList.size(); j++) {
                 String vinNo = stringList.get(j);
                 busDeliveredService.updateState(vinNo, 1);
             }
-        }
+        }*/
         if (sidsList.size() > 0) {
             for (int i = 0; i < sidsList.size(); i++) {
                 busDeliveredApplyDetailsService.deleteByApplySid(sidsList.get(i));

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

@@ -547,7 +547,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         if (StringUtils.isNotBlank(totalValue.toString())) {
             if (busSalesOrderPriceDetailsVo != null) {
-                BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()),BigDecimal.ROUND_CEILING);
+                BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()), BigDecimal.ROUND_CEILING);
                 bigDecimalSing = bigDecimalSing.add(discountA);
             }
         }
@@ -3381,7 +3381,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         if (StringUtils.isNotBlank(vo.getTotaldiscount())) {
             if (priceInfo != null) {
-                BigDecimal discountA = new BigDecimal(vo.getTotaldiscount()).divide(new BigDecimal(priceInfo.getNumber()),BigDecimal.ROUND_CEILING);
+                BigDecimal discountA = new BigDecimal(vo.getTotaldiscount()).divide(new BigDecimal(priceInfo.getNumber()), BigDecimal.ROUND_CEILING);
                 bigDecimalSing = bigDecimalSing.add(discountA);
             }
         }
@@ -3492,7 +3492,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             BigDecimal oneAll = BigDecimal.ZERO;
             if (StringUtils.isNotBlank(vo.getTotaldiscount())) {
                 //总优惠/台数
-                oneAll = new BigDecimal(vo.getTotaldiscount()).divide(new BigDecimal(priceInfo.getNumber()),BigDecimal.ROUND_CEILING);
+                oneAll = new BigDecimal(vo.getTotaldiscount()).divide(new BigDecimal(priceInfo.getNumber()), BigDecimal.ROUND_CEILING);
                 if (oneAll.compareTo(BigDecimal.ZERO) > 0) {
                     pkgPrice = "-￥" + oneAll.toString();
                 } else {
@@ -4779,7 +4779,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //更新临时号
                 ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo);
             }
-        }else{
+        } else {
             for (int i = 0; i < vinList.size(); i++) {
                 //销售订单中车辆表的sid
                 String salesOrderVinSid = vinList.get(i).getSid();
@@ -4795,7 +4795,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if ("02".equals(key)) {
             String makeUpAll = depositInfo.getMakeUpDeposit();
             if (makeUpAll != null) {
-                bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(makeUpAll).divide(new BigDecimal(num),BigDecimal.ROUND_CEILING));
+                bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(makeUpAll).divide(new BigDecimal(num), BigDecimal.ROUND_CEILING));
             }
         } else {
             bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(depositInfo.getDeposit()));
@@ -4973,10 +4973,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
             for (int i = 0; i < vinList.size(); i++) {
                 UnCollectionDto unCollectionDto = new UnCollectionDto();
-                //合同sid
-                unCollectionDto.setContractSid(commonContract.getSid());
-                //合同编号
-                unCollectionDto.setContractNo(commonContract.getContractNo());
+                if (commonContract != null) {
+                    //合同sid
+                    unCollectionDto.setContractSid(commonContract.getSid());
+                    //合同编号
+                    unCollectionDto.setContractNo(commonContract.getContractNo());
+                }
                 //客户名称
                 unCollectionDto.setCustomerName(vo.getName());
                 //客户sid
@@ -5727,7 +5729,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             String totaldiscount = appOrderDetailsVo.getTotaldiscount();
             if (StringUtils.isNotBlank(totaldiscount)) {
                 //计算单台优惠
-                BigDecimal bigDecimal = new BigDecimal(totaldiscount).divide(new BigDecimal(total),BigDecimal.ROUND_CEILING);
+                BigDecimal bigDecimal = new BigDecimal(totaldiscount).divide(new BigDecimal(total), BigDecimal.ROUND_CEILING);
                 busSaleOrderVehicleOutVo.setTotaldiscount(bigDecimal.toString());
                 //赠送情况
                 List<AppOrderDiscountListVo> discountList = appOrderDetailsVo.getDiscountList();

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

@@ -82,6 +82,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
      * @return
      */
     IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
+
     List<AppFinUncollectedReceivablesDetailedVo> getPaymentList(@Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
 
 
@@ -108,19 +109,34 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
 
     List<FinSelectedReceivablesDetailed> getList(@Param("list") List<String> sidsList);
 
-    List<FinSelectedReceivablesDetailedVo> fetchByAuditState1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type,@Param("payTypeKey")String payTypeKey);
-    List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type,@Param("payTypeKey")String payTypeKey);
+    List<FinSelectedReceivablesDetailedVo> fetchByAuditState1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("payTypeKey") String payTypeKey);
+
+    /**
+     * 根据合同编号分组查询客户
+     *
+     * @param sid        收款单sid
+     * @param i          审核状态
+     * @param type       应收项目名称
+     * @param payTypeKey 销售类型
+     * @return
+     */
+    List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1_1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("payTypeKey") String payTypeKey);
+
+    List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("payTypeKey") String payTypeKey);
 
     List<SelectCustomerVo> selectCustomerList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type);
 
     List<FinSelectedReceivablesDetailedVo> selectDetailsList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type);
 
     List<FinSelectedReceivablesDetailedVo> selectVinListVo(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone);
+    List<FinSelectedReceivablesDetailedVo> selectVinListVo_1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("contractNo") String contractNo);
 
     FinSelectedReceivablesDetailedVo fetchByAuditStateV(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone);
+    FinSelectedReceivablesDetailedVo fetchByAuditStateV_1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("contractNo") String contractNo);
 
     @Select("select * from fin_selected_receivables_detailed where contractNo = #{contractNo}")
     List<FinSelectedReceivablesDetailed> fetchByContractNo(String contractNo);
+
     @Select("select * from fin_selected_receivables_detailed where receivablesSid = #{receivablesSid} and auditState = 3")
     List<FinSelectedReceivablesDetailed> fetchByReceivablesSid(String receivablesSid);
 

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

@@ -31,11 +31,11 @@
                customerName           AS `name`,
                currentReceivableMoney AS receivable,
                contractSid,
-               <!--currentReceivableMoney AS confirmMoney,-->
-               VIN                    AS vin,
-               furd.busVinSid,
-               furd.payType,
-               furd.payTypeKey
+        <!--currentReceivableMoney AS confirmMoney,-->
+        VIN AS vin,
+        furd.busVinSid,
+        furd.payType,
+        furd.payTypeKey
         FROM fin_uncollected_receivables_detailed furd
         <where>
             ${ew.sqlSegment}
@@ -56,31 +56,31 @@
     <select id="getPaymentList"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
         SELECT sid,
-        contractNo             AS contractId,
-        receivablesName        AS projectName,
-        customerPhone          AS mobile,
-        customerName           AS `name`,
-        currentReceivableMoney AS receivable,
-        contractSid,
-        VIN                    AS vin,
-        furd.busVinSid,
-        furd.payType,
-        furd.payTypeKey,
-        furd.customerSid,
-        furd.useOrgSid
+               contractNo             AS contractId,
+               receivablesName        AS projectName,
+               customerPhone          AS mobile,
+               customerName           AS `name`,
+               currentReceivableMoney AS receivable,
+               contractSid,
+               VIN                    AS vin,
+               furd.busVinSid,
+               furd.payType,
+               furd.payTypeKey,
+               furd.customerSid,
+               furd.useOrgSid
         FROM fin_uncollected_receivables_detailed furd
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
                 and concat(IFNULL(furd.customerName
-                , '')
-                , ifnull(furd.contractNo
-                , '')) LIKE concat('%'
-                , #{name}
-                , '%')
+                  , '')
+                  , ifnull(furd.contractNo
+                  , '')) LIKE concat('%'
+                  , #{name}
+                  , '%')
             </if>
             and length(furd.busVinSid)
-            >0
+              >0
         </where>
         order by furd.contractNo desc
     </select>
@@ -147,7 +147,7 @@
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
         select fd.*
         from fin_selected_receivables_detailed fd
-        left join fin_uncollected_receivables_detailed fud on fud.sid = fd.receivablesSid
+                 left join fin_uncollected_receivables_detailed fud on fud.sid = fd.receivablesSid
         where fd.contractNo = #{contractNo}
           and fud.busVinSid = #{busVinSid}
           and fd.auditState = #{state}
@@ -173,6 +173,17 @@
         group by concat(customerName, customerPhone)
     </select>
 
+    <select id="fetchByAuditState1_1_1"
+            resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
+        select *, sum(subscriptionMoney) as sumAll
+        from fin_selected_receivables_detailed
+        where collSid = #{sid}
+          and auditState = #{state}
+          and receivablesName = #{type}
+          and payTypeKey = #{payTypeKey}
+        group by contractNo
+    </select>
+
     <select id="fetchByAuditState1_1"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
         select *
@@ -213,6 +224,28 @@
           and length(VIN) > 0
     </select>
 
+    <select id="selectVinListVo_1"
+            resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
+        select *
+        from fin_selected_receivables_detailed
+        where collSid = #{sid}
+          and auditState = #{state}
+          and receivablesName = #{type}
+          and contractNo = #{contractNo}
+          and length(VIN) > 0
+    </select>
+
+    <select id="fetchByAuditStateV_1"
+            resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
+        select *, sum(subscriptionMoney) as sumAll
+        from fin_selected_receivables_detailed
+        where collSid = #{sid}
+          and auditState = #{state}
+          and receivablesName = #{type}
+          and contractNo = #{contractNo}
+          and length(VIN) = 0
+    </select>
+
     <select id="fetchByAuditStateV"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
         select *, sum(subscriptionMoney) as sumAll
@@ -226,8 +259,10 @@
     </select>
 
     <select id="selectByVinSid" resultType="java.lang.String">
-        select sum(fd.subscriptionMoney) from fin_selected_receivables_detailed fd
-        left join fin_uncollected_receivables_detailed ff on ff.sid = fd.receivablesSid
-        where ff.busVinSid = #{busVinSid} and fd.auditState = 3
+        select sum(fd.subscriptionMoney)
+        from fin_selected_receivables_detailed fd
+                 left join fin_uncollected_receivables_detailed ff on ff.sid = fd.receivablesSid
+        where ff.busVinSid = #{busVinSid}
+          and fd.auditState = 3
     </select>
 </mapper>

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

@@ -227,12 +227,25 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         return baseMapper.getList(sidsList);
     }
 
-    public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1(String sid, int i, String type,String payTypeKey) {
-        return baseMapper.fetchByAuditState1(sid, i, type,payTypeKey);
+    public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1(String sid, int i, String type, String payTypeKey) {
+        return baseMapper.fetchByAuditState1(sid, i, type, payTypeKey);
     }
 
-    public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1(String sid, int i, String type,String payTypeKey) {
-        return baseMapper.fetchByAuditState1_1(sid, i, type,payTypeKey);
+    /**
+     * 根据合同编号分组查询客户
+     *
+     * @param sid        收款单sid
+     * @param i          审核状态
+     * @param type       应收项目名称
+     * @param payTypeKey 销售类型
+     * @return
+     */
+    public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1_1(String sid, int i, String type, String payTypeKey) {
+        return baseMapper.fetchByAuditState1_1_1(sid, i, type, payTypeKey);
+    }
+
+    public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1(String sid, int i, String type, String payTypeKey) {
+        return baseMapper.fetchByAuditState1_1(sid, i, type, payTypeKey);
     }
 
     public List<SelectCustomerVo> selectCustomerList(String sid, int i, String type) {
@@ -244,11 +257,28 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     }
 
     public List<FinSelectedReceivablesDetailedVo> selectVinListVo(String sid, int i, String type, String customerName, String customerPhone) {
-        return baseMapper.selectVinListVo(sid, i, type,customerName,customerPhone);
+        return baseMapper.selectVinListVo(sid, i, type, customerName, customerPhone);
+    }
+
+    /**
+     * 查询该收款单明细该合同编号下的车架号不为空的明细
+     *
+     * @param sid        收款单sid
+     * @param i          销售类型
+     * @param type       应收项目名称
+     * @param contractNo 合同编号
+     * @return
+     */
+    public List<FinSelectedReceivablesDetailedVo> selectVinListVo_1(String sid, int i, String type, String contractNo) {
+        return baseMapper.selectVinListVo_1(sid, i, type, contractNo);
+    }
+
+    public FinSelectedReceivablesDetailedVo fetchByAuditStateV_1(String sid, int i, String type, String contractNo) {
+        return baseMapper.fetchByAuditStateV_1(sid, i, type, contractNo);
     }
 
     public FinSelectedReceivablesDetailedVo fetchByAuditStateV(String sid, int i, String type, String customerName, String customerPhone) {
-        return baseMapper.fetchByAuditStateV(sid, i, type,customerName,customerPhone);
+        return baseMapper.fetchByAuditStateV(sid, i, type, customerName, customerPhone);
     }
 
     public ResultBean<List<FinSelectedReceivablesDetailed>> fetchByContractNo(String contractNo) {

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

@@ -264,7 +264,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         String urlPrefix = fileUploadComponent.getUrlPrefix();
         if (null != dto.getFilePaths()) {
             for (String filePath : dto.getFilePaths()) {
-                String path = filePath.substring(urlPrefix.length() + 1);
+                String path = filePath.substring(urlPrefix.length());
                 sb.append(path).append(",");
             }
             sb.delete(sb.length() - 1, sb.length());
@@ -291,7 +291,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         String urlPrefix = fileUploadComponent.getUrlPrefix();
         if (null != dto.getFilePaths()) {
             for (String filePath : dto.getFilePaths()) {
-                String path = filePath.substring(urlPrefix.length() + 1);
+                String path = filePath.substring(urlPrefix.length());
                 sb.append(path).append(",");
             }
             sb.delete(sb.length() - 1, sb.length());