diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java index 84bf685b62..245b7b2f3e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java +++ b/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; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java index e9b18ceafd..67135204d5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java +++ b/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(销售出库单)
@@ -85,11 +97,13 @@ public class BaseVehicleOutApplyService extends MybatisBaseService createQueryWrapper(BaseVehicleOutApplyQueryNew params) { QueryWrapper qw = new QueryWrapper<>(); @@ -176,7 +190,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService 0){ + if (i > 0) { record.setCkType("欠款出库"); //欠款时长（天） String saleDate = record.getSaleDate(); - }else { + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(record.getConcatNo(), record.getVinSid()).getData(); + //应收未收sid + List 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 p = PagerUtil.pageToVo(pagging, null); - //p.setTotal(countTotal); return p; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java index 33748e491a..0df078ffd8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java +++ b/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; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index 9977764882..f38f199301 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/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; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 99c1b659a3..94a46155f8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/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 ${ew.sqlSegment} @@ -159,7 +161,6 @@ >0 GROUP BY bo.sid - HAVING vinNo like concat('%',#{vinNo},'%') AND orderingNo like concat('%',#{orderingNo},'%') diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 660c5fd80a..a8c5f32234 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/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> fetchByContractNo(@RequestParam("contractNo") String contractNo); - @ApiOperation("根据合同编号查询") + @ApiOperation("根据应收未收sid查询") @PostMapping("/fetchByReceivablesSid") public ResultBean> fetchByReceivablesSid(@RequestParam("receivablesSid") String receivablesSid); @@ -74,4 +74,7 @@ public interface FinSelectedReceivablesDetailedFeign { @GetMapping("/selectByBusVinSid") ResultBean selectByBusVinSid(@RequestParam("busVinSid") String busVinSid); + @ApiOperation("根据应收未收sid查询最新一条") + @PostMapping("/fetchByReceivablesSidLimt") + public ResultBean fetchByReceivablesSidLimt(@RequestParam("ysSid") String ysSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java index f998a103af..2a5449948d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java +++ b/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 fetchByReceivablesSidLimt(String ysSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index a7e55d19ba..c604d1bd75 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/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> selectByCreateBySidOne(@RequestParam("userSid") String userSid); + + @ApiOperation("根据销售订单车辆sid查询应收未收金额") + @GetMapping("/fetchSumYS") + ResultBean fetchSumYS(@RequestParam("sid") String sid); + + @ApiOperation("根据销售订单车辆sid查询应收已收sid") + @GetMapping("/fetchYsSidByOrderVehSid") + ResultBean> fetchYsSidByOrderVehSid(@RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index 2b1b65e2ee..3945078b5b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java +++ b/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 fetchSumYS(String sid) { + return null; + } + + @Override + public ResultBean> fetchYsSidByOrderVehSid(String sid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index c8e2338ee0..90c90fd3b4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/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 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, VIN AS vin, furd.busVinSid, @@ -41,14 +41,14 @@ ${ew.sqlSegment} and concat(IFNULL(furd.customerName - , '') - , ifnull(furd.contractNo - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(furd.contractNo + , '')) LIKE concat('%' + , #{name} + , '%') and length(furd.busVinSid) - >0 + >0 order by furd.contractNo desc @@ -56,31 +56,31 @@ @@ -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 @@ -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 @@ - update fin_selected_receivables_detailed set auditState = #{auditState} where collSid = #{collSid} + update fin_selected_receivables_detailed + set auditState = #{auditState} + where collSid = #{collSid} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java index 4a855cdd41..471a96a21a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java +++ b/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 fetchByReceivablesSidLimt(String ysSid) { + return finSelectedReceivablesDetailedService.fetchByReceivablesSidLimt(ysSid); + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 0f68eeacd8..e5f9541fc6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/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 fetchByReceivablesSidLimt(String ysSid) { + ResultBean rb = ResultBean.fireFail(); + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = baseMapper.fetchByReceivablesSidLimt(ysSid); + return rb.success().setData(finSelectedReceivablesDetailed); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index c957941b69..2bedc3f1a0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/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 fetchSumYS(String sid) { + ResultBean rb = ResultBean.fireFail(); + String s = finUncollectedReceivablesDetailedService.fetchSumYS(sid); + return rb.success().setData(s); + } + + @Override + public ResultBean> fetchYsSidByOrderVehSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List stringList = finUncollectedReceivablesDetailedService.fetchYsSidByOrderVehSid(sid); + return rb.success().setData(stringList); + } + @Override public ResultBean> selectByContractNo(String contractNo) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java index beb688f30e..ff3db31ac3 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java +++ b/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 sysMenuRoleDataVos = baseMapper.selMenuByRole(qw); + for (SysMenuRoleDataVo sysMenuRoleDataVo : sysMenuRoleDataVos) { + if (StringUtils.isBlank(sysMenuRoleDataVo.getName())){ + sysMenuRoleDataVos.remove(sysMenuRoleDataVo); + } + } return rb.success().setData(sysMenuRoleDataVos); }