优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java

@@ -131,6 +131,6 @@ public class BaseVehicleOutApplyVoNew implements Vo {
     @ApiModelProperty("出库类型")
     private String ckType;
     @ApiModelProperty("欠款时长（天）")
-    private String qkDate;
+    private Long qkDate;
 }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@@ -26,6 +26,9 @@
 package com.yxt.anrui.base.biz.basevehicleoutapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
@@ -39,6 +42,12 @@ import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
 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.finpaymentrecord.FinPaymentrecordSourceLCVo;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo;
@@ -55,8 +64,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
+import static java.util.Comparator.comparing;
+
 
 /**
  * Project: anrui-base(销售出库单) <br/>
@@ -85,11 +97,13 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
     @Autowired
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
     @Autowired
-    private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
-    @Autowired
     private BusArrearsCarryVehicleDetailsFeign busArrearsCarryVehicleDetailsFeign;
     @Autowired
-    private BusDeliveredApplyFeign busDeliveredApplyFeign;
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
+    @Autowired
+    private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
 
     private QueryWrapper<BaseVehicleOutApply> createQueryWrapper(BaseVehicleOutApplyQueryNew params) {
         QueryWrapper<BaseVehicleOutApply> qw = new QueryWrapper<>();
@@ -176,7 +190,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(concatNo).getData();
             if (busSalesOrder != null) {
                 String saleOrderSid = busSalesOrder.getSid();
-                if (StringUtils.isNotBlank(saleOrderSid)){
+                if (StringUtils.isNotBlank(saleOrderSid)) {
                     SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
                     if (solutionsDetailsVo != null) {
                         record.setFactoryDiscount(solutionsDetailsVo.getFactoryDiscount());
@@ -200,16 +214,42 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
             }
             //出库类型
             Integer i = busArrearsCarryVehicleDetailsFeign.selByVinSidAndYBJ(vinSid).getData();
-            if (i > 0){
+            if (i > 0) {
                 record.setCkType("欠款出库");
                 //欠款时长（天）
                 String saleDate = record.getSaleDate();
-            }else {
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(record.getConcatNo(), record.getVinSid()).getData();
+                //应收未收sid
+                List<String> ysSids = finUncollectedReceivablesDetailedFeign.fetchYsSidByOrderVehSid(busSalesOrderVehicle.getSid()).getData();
+                for (String ysSid : ysSids) {
+                    FinSelectedReceivablesDetailed data = finSelectedReceivablesDetailedFeign.fetchByReceivablesSidLimt(ysSid).getData();
+                    BigDecimal currentReceivableMoney = data.getCurrentReceivableMoney();
+                    BigDecimal subscriptionMoney = data.getSubscriptionMoney();
+                    BigDecimal decimal = currentReceivableMoney.subtract(subscriptionMoney);
+                    int i1 = decimal.intValue();
+                    if (i1 > 0) {
+                        String today = DateUtil.today();
+                        DateTime currentDate = DateUtil.parse(today);
+                        DateTime saleDateTime = DateUtil.parse(saleDate);
+                        int j = saleDateTime.compareTo(currentDate);
+                        long betweenDay = DateUtil.between(saleDateTime, currentDate, DateUnit.DAY);
+                        record.setQkDate(betweenDay * j * -1);
+                        break;
+                    }else {
+                        String auditDate = data.getAuditDate();
+                        DateTime auditDateTime = DateUtil.parse(auditDate);
+                        DateTime saleDateTime = DateUtil.parse(saleDate);
+                        int j = saleDateTime.compareTo(auditDateTime);
+                        long betweenDay = DateUtil.between(saleDateTime, auditDateTime, DateUnit.DAY);
+                        record.setQkDate(betweenDay * j * -1);
+                    }
+                }
+            } else {
                 record.setCkType("正常出库");
+                record.setQkDate(Long.parseLong("0"));
             }
         }
         PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);
-        //p.setTotal(countTotal);
         return p;
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java

@@ -120,6 +120,8 @@ public class BusSalesOrder extends BaseEntity {
 
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
 
     @ApiModelProperty("是否包牌：1是，0否")
     private String licensePlateKey;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -178,7 +178,7 @@ public class AppBusSalesOrderVo implements Vo {
     private String modelName;
     @ApiModelProperty("销售部门")
     private String orgName;
-    @ApiModelProperty("排产订单编号")
+    @ApiModelProperty("采购订单编号")
     private String orderingNo;
     @ApiModelProperty("贴息")
     private String factoryDiscount;

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

@@ -116,9 +116,9 @@
         GROUP_CONCAT(IF(ov.`linkNo` = '', NULL, ov.`linkNo`)) AS vinNo,
         GROUP_CONCAT(
         IF(
-        ov.orderingNo = '',
+        bsvo.linkNo = '',
         NULL,
-        ov.orderingNo
+        bsvo.linkNo
         )
         ) AS orderingNo,
         bm.guildPrice,
@@ -142,6 +142,8 @@
         ON bsos.salesOrderSid = bo.sid
         LEFT JOIN bus_sales_order_model bm
         ON bm.salesOrderSid = bo.sid
+        LEFT JOIN bus_sales_vehicle_order bsvo
+        ON bsvo.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
@@ -159,7 +161,6 @@
                 >0
             </if>
             GROUP BY bo.sid
-
             <if test="vinNo != null and vinNo != '' and orderingNo != null and orderingNo != ''">
                 HAVING vinNo like concat('%',#{vinNo},'%')
                 AND orderingNo like concat('%',#{orderingNo},'%')

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

@@ -2087,6 +2087,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrder.setOrgSid(orgSid);
                 busSalesOrder.setOrgSidPath(orgSidPath);
                 busSalesOrder.setUseOrgSid(useOrgSid);
+                SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+                busSalesOrder.setUseOrgName(sysOrganizationVo.getName());
                 String billNo = getApplyCode(useOrgSid);
                 busSalesOrder.setBillNo(billNo);
                 boolean isSave = save(busSalesOrder);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java

@@ -66,7 +66,7 @@ public interface FinSelectedReceivablesDetailedFeign {
     @PostMapping("/fetchByContractNo")
     public ResultBean<List<FinSelectedReceivablesDetailed>> fetchByContractNo(@RequestParam("contractNo") String contractNo);
 
-    @ApiOperation("根据合同编号查询")
+    @ApiOperation("根据应收未收sid查询")
     @PostMapping("/fetchByReceivablesSid")
     public ResultBean<List<FinSelectedReceivablesDetailed>> fetchByReceivablesSid(@RequestParam("receivablesSid") String receivablesSid);
 
@@ -74,4 +74,7 @@ public interface FinSelectedReceivablesDetailedFeign {
     @GetMapping("/selectByBusVinSid")
     ResultBean<String> selectByBusVinSid(@RequestParam("busVinSid") String busVinSid);
 
+    @ApiOperation("根据应收未收sid查询最新一条")
+    @PostMapping("/fetchByReceivablesSidLimt")
+    public ResultBean<FinSelectedReceivablesDetailed> fetchByReceivablesSidLimt(@RequestParam("ysSid") String ysSid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java

@@ -71,4 +71,9 @@ public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedR
 		return null;
 	}
 
+	@Override
+	public ResultBean<FinSelectedReceivablesDetailed> fetchByReceivablesSidLimt(String ysSid) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -115,4 +115,12 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @ApiOperation("查询车辆的应收未收款项")
     @GetMapping("/selectByCreateBySidOne")
     ResultBean<List<String>> selectByCreateBySidOne(@RequestParam("userSid") String userSid);
+
+    @ApiOperation("根据销售订单车辆sid查询应收未收金额")
+    @GetMapping("/fetchSumYS")
+    ResultBean<String> fetchSumYS(@RequestParam("sid") String sid);
+
+    @ApiOperation("根据销售订单车辆sid查询应收已收sid")
+    @GetMapping("/fetchYsSidByOrderVehSid")
+    ResultBean<List<String>> fetchYsSidByOrderVehSid(@RequestParam("sid") String sid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -126,4 +126,14 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> fetchSumYS(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<String>> fetchYsSidByOrderVehSid(String sid) {
+		return null;
+	}
+
 }

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

@@ -146,4 +146,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     String fetchSumSeYsByReceivablesSid(String ysSid);
 
     int updateAuditStateBySid(@Param("auditState") int i, @Param("collSid") String sid);
+
+    FinSelectedReceivablesDetailed fetchByReceivablesSidLimt(String ysSid);
 }

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

@@ -25,12 +25,12 @@
     <select id="getPaymentDetailsList"
             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,
+        contractNo AS contractId,
+        receivablesName AS projectName,
+        customerPhone AS mobile,
+        customerName AS `name`,
+        currentReceivableMoney AS receivable,
+        contractSid,
         <!--currentReceivableMoney AS confirmMoney,-->
         VIN AS vin,
         furd.busVinSid,
@@ -41,14 +41,14 @@
             ${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>
@@ -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>
@@ -131,7 +131,7 @@
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo">
         SELECT fsrd.subscriptionMoney
         FROM fin_selected_receivables_detailed fsrd
-                 LEFT JOIN fin_collection_confirmation fcc ON fcc.sid = fsrd.collSid
+                     LEFT JOIN fin_collection_confirmation fcc ON fcc.sid = fsrd.collSid
         WHERE fcc.paymentState = 1
     </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}
@@ -261,12 +261,23 @@
     <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
+                     left join fin_uncollected_receivables_detailed ff on ff.sid = fd.receivablesSid
         where ff.busVinSid = #{busVinSid}
           and fd.auditState = 3
     </select>
 
     <update id="updateAuditStateBySid">
-        update fin_selected_receivables_detailed set auditState = #{auditState} where collSid = #{collSid}
+        update fin_selected_receivables_detailed
+        set auditState = #{auditState}
+        where collSid = #{collSid}
     </update>
+
+    <select id="fetchByReceivablesSidLimt"
+            resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed">
+        SELECT *
+        FROM fin_selected_receivables_detailed
+        WHERE receivablesSid = #{ysSid}
+          AND auditState = 3
+        ORDER BY createTime DESC LIMIT 1
+    </select>
 </mapper>

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

@@ -90,4 +90,9 @@ public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivable
 		return finSelectedReceivablesDetailedService.selectByBusVinSid(busVinSid);
 	}
 
+	@Override
+	public ResultBean<FinSelectedReceivablesDetailed> fetchByReceivablesSidLimt(String ysSid) {
+		return finSelectedReceivablesDetailedService.fetchByReceivablesSidLimt(ysSid);
+	}
+
 }

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

@@ -306,4 +306,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     public int updateAuditStateBySid(int i, String sid) {
         return baseMapper.updateAuditStateBySid(i,sid);
     }
+
+    public ResultBean<FinSelectedReceivablesDetailed> fetchByReceivablesSidLimt(String ysSid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = baseMapper.fetchByReceivablesSidLimt(ysSid);
+        return rb.success().setData(finSelectedReceivablesDetailed);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -147,6 +147,20 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
         return finUncollectedReceivablesDetailedService.selectByCreateBySidOne(userSid);
     }
 
+    @Override
+    public ResultBean<String> fetchSumYS(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String s = finUncollectedReceivablesDetailedService.fetchSumYS(sid);
+        return rb.success().setData(s);
+    }
+
+    @Override
+    public ResultBean<List<String>> fetchYsSidByOrderVehSid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> stringList = finUncollectedReceivablesDetailedService.fetchYsSidByOrderVehSid(sid);
+        return rb.success().setData(stringList);
+    }
+
 
     @Override
     public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java

@@ -173,6 +173,11 @@ public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, Sy
             qw.like("sm.name",query.getMenuName());
         }
         List<SysMenuRoleDataVo> sysMenuRoleDataVos = baseMapper.selMenuByRole(qw);
+        for (SysMenuRoleDataVo sysMenuRoleDataVo : sysMenuRoleDataVos) {
+            if (StringUtils.isBlank(sysMenuRoleDataVo.getName())){
+                sysMenuRoleDataVos.remove(sysMenuRoleDataVo);
+            }
+        }
         return rb.success().setData(sysMenuRoleDataVos);
     }