From e84a975fe9977522f725a9dc28b5fff7eb566cb2 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 16 Apr 2025 09:01:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wmsinventory/FittingsInventoryQuery.java | 5 +- .../wmsinventory/FittingsInventoryVo.java | 3 + .../wmsinventory/WmsInventoryMapper.xml | 25 +++++--- .../wmsinventory/WmsInventoryQuery.java | 5 ++ .../wmsinventory/WmsInventoryService.java | 18 ++++++ .../wmsinventory/WmsInventoryVo.java | 5 ++ .../WmsInventoryRecordMapper.xml | 57 ++++++++++--------- .../WmsInventoryRecordService.java | 10 ++++ .../WmsInventoryRecordsQuery.java | 4 ++ .../WmsInventoryRecordsVo.java | 4 ++ 10 files changed, 102 insertions(+), 34 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java index e8b675f783..8b86767963 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java @@ -1,6 +1,7 @@ package com.yxt.wms.biz.inventory.wmsinventory; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -44,5 +45,7 @@ public class FittingsInventoryQuery implements Query { * 仓库 */ private String warehouseName; - + private String warehouseRackCode; + private String wareAreaName; + private String wareZoneName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java index b613a783ad..7d9a4682e6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java @@ -51,5 +51,8 @@ public class FittingsInventoryVo implements Vo { * 仓库 */ private String warehouseName; + private String warehouseRackCode; + private String wareAreaName; + private String wareZoneName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index 086ca43d69..861e4b6129 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -16,6 +16,8 @@ a.manufacturerName, a.warehouseName, a.warehouseRackCode, + wa.areaName wareAreaName, + wz.zoneName wareZoneName, a.count, a.cost, a.taxRate tax, @@ -24,7 +26,10 @@ FROM wms_inventory a LEFT JOIN anrui_portal.sys_organization as s ON a.useOrgSid = s.sid - LEFT JOIN wms_warehouse_info as i ON a.warehouseSid = i.sid + LEFT JOIN wms_warehouse_rack as wr ON a.warehouseRackSid = wr.sid + LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid + LEFT JOIN wms_warehouse_zone as wz ON wr.zoneSid = wz.sid + LEFT JOIN wms_warehouse_info as i ON wr.warehouseSid = i.sid ${ew.sqlSegment} @@ -452,16 +457,22 @@ wi.goodsSkuOwnSpec, wi.unit, wi.warehouseName, + wi.warehouseRackCode, + wa.areaName wareAreaName, + wz.zoneName wareZoneName, wi.manufacturerName, wi.supplierName billObjName, IFNULL(SUM(count),0) as inventoryCount, s.orgSidPath FROM wms_inventory as wi - LEFT JOIN wms_warehouse_info AS i ON wi.warehouseSid = i.sid + LEFT JOIN wms_warehouse_rack as wr ON wi.warehouseRackSid = wr.sid + LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid + LEFT JOIN wms_warehouse_zone as wz ON wr.zoneSid = wz.sid + LEFT JOIN wms_warehouse_info as i ON wr.warehouseSid = i.sid LEFT JOIN anrui_portal.sys_organization as so ON wi.createOrgSid = so.sid LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid - GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseSid,wi.goodsSkuCode,wi.supplierName) as a + GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseRackSid,wi.goodsSkuCode,wi.supplierName) as a ${ew.sqlSegment} @@ -815,12 +826,12 @@ diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryQuery.java index 874a4013e0..251a9ba0eb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryQuery.java @@ -25,6 +25,11 @@ public class WmsInventoryQuery implements Query { @ApiModelProperty("库位编码") private String warehouseRackCode; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域名称") + private String wareZoneName; + @ApiModelProperty("批次号") private String batchNumber; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index a875823308..ac20cec993 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -115,6 +115,12 @@ public class WmsInventoryService extends MybatisBaseService wrapper.like("a.billObjName", query.getName()) .or().like("a.deptName", query.getName()) @@ -927,6 +942,9 @@ public class WmsInventoryService extends MybatisBaseService SELECT IFNULL(SUM(d.currentBalance), 0) AS count FROM wms_inventory_settlebill_detail AS d - LEFT JOIN wms_inventory_settlebill AS s - ON d.billSid = s.sid + LEFT JOIN wms_inventory_settlebill AS s + ON d.billSid = s.sid WHERE s.settleState = 2 AND s.createTime <= #{settleTime} GROUP BY d.billSid ORDER BY s.createTime DESC - LIMIT 1 + LIMIT 1 SELECT IFNULL(SUM(r.count), 0) AS `count`, - r.busTypeValue + r.busTypeValue FROM wms_inventory_record AS r ${ew.sqlSegment} @@ -50,24 +50,24 @@ SELECT - billNo + billNo FROM - wms_inventory_record + wms_inventory_record WHERE billType = '0' AND goodsID = #{content} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java index 9c373a0e93..4e2b3d103f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java @@ -294,10 +294,20 @@ public class WmsInventoryRecordService extends MybatisBaseService Date: Wed, 16 Apr 2025 10:07:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=80=80=E8=BD=A6=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=B8=8B=E6=8E=A8=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorderreturnveh/ReturnPushVo.java | 2 ++ .../BusSalesOrderReturnVehApplyMapper.java | 2 ++ .../BusSalesOrderReturnVehApplyMapper.xml | 9 ++++- .../BusSalesOrderReturnVehApplyService.java | 34 ++++++++++++++----- 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/ReturnPushVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/ReturnPushVo.java index dac8eaa2d6..be11aeae4d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/ReturnPushVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/ReturnPushVo.java @@ -13,4 +13,6 @@ public class ReturnPushVo { private String billNo; private String materialCode; + + private String typeKey; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java index cfb4fbaa5b..2a330757e2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java @@ -90,4 +90,6 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper selectByBillNo(String billNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml index 799f01f13a..8f3a358115 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml @@ -79,9 +79,16 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index 541b3f682b..fa7f5c31f0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java @@ -705,6 +705,31 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService returnPushVoList = baseMapper.selectByBillNo(returnPushVo.getBillNo()); + returnPushVoList.removeAll(Collections.singleton(null)); + if(!returnPushVoList.isEmpty()){ + for (int k = 0; k < returnPushVoList.size(); k++) { + ReturnPushVo l = returnPushVoList.get(k); + if(l.getMaterialCode().equals(returnPushVo.getMaterialCode())){ + String temporaryNumZc = String.format("%02d", j); + salesReturnDetailDto.setBillNo(returnPushVo.getBillNo()+ "-"+temporaryNumZc); + j++; + break; + } + } + } + + } + salesReturnDetailDtoList.add(salesReturnDetailDto); + } List returnVos = baseVehicleOutFeign.selectByVehReturn(vehSid, busSalesOrderReturnVehApply.getContractNo()).getData(); if (null != returnVos) { if (!returnVos.isEmpty()) { @@ -752,14 +777,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService Date: Wed, 16 Apr 2025 10:22:12 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/PayBaseVehicleVo.java | 2 - .../biz/basevehicle/BaseVehicleService.java | 21 ++--- .../LoanRestoreReportApplyDetailsVo.java | 86 ++++++++----------- .../LoanRestoreReportApplyDto.java | 84 ++++++++---------- .../LoanBeCollectionRecordRest.java | 15 +--- .../LoanRestoreReportApplyMapper.java | 48 ++++------- .../LoanRestoreReportApplyRest.java | 17 +--- 7 files changed, 93 insertions(+), 180 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java index 707c3324db..3ad1e34f72 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java @@ -52,8 +52,6 @@ public class PayBaseVehicleVo implements Vo { private String saleTypeValue; @ApiModelProperty("买断状态") private String settlementStatusValue; - @ApiModelProperty("交清状态") - private String finState; @ApiModelProperty(value = "品牌") private String brandName; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 9705ebf140..50b4692335 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3546,6 +3546,11 @@ public class BaseVehicleService extends MybatisBaseService wrapper.isNull("vs.finState").or().eq("vs.finState", 0)); + } if (StringUtils.isNotBlank(query.getVinNo())) { qw.like("bv.vinNo", query.getVinNo()); } @@ -3603,22 +3608,6 @@ public class BaseVehicleService extends MybatisBaseService pagging = baseMapper.selectPayVehicleList(page, qw); - Iterator iterator = pagging.getRecords().iterator(); - if (query.getIsSettle().equals("0")) { - while (iterator.hasNext()) { - PayBaseVehicleVo next = iterator.next(); - if ("1".equals(next.getFinState())) { - pagging.getRecords().remove(next); - } - } - } else if (query.getIsSettle().equals("1")) { - while (iterator.hasNext()) { - PayBaseVehicleVo next = iterator.next(); - if (StringUtils.isBlank(next.getFinState()) || "0".equals(next.getFinState())) { - pagging.getRecords().remove(next); - } - } - } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java index 37f3d68aa0..78be4822e3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java @@ -25,29 +25,13 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanrestorereportapply; - import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.ArrayList; import java.util.List; -/** - * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyVo.java
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyVo
- * Description: 车辆交回事前报备申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "车辆交回事前报备申请 视图数据详情", description = "车辆交回事前报备申请 视图数据详情") public class LoanRestoreReportApplyDetailsVo implements Vo { @@ -60,77 +44,77 @@ public class LoanRestoreReportApplyDetailsVo implements Vo { private String createTime; @ApiModelProperty("创建人sid") private String createBySid; - @ApiModelProperty("创建人") + @ApiModelProperty("创建人") private String createByName; // 创建人 - @ApiModelProperty("申请编号") + @ApiModelProperty("申请编号") private String billNo; // 申请编号 - @ApiModelProperty("申请部门sid") + @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") + @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 @ApiModelProperty("销售订单车辆sid") private String saleVehSid; - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String custName; // 客户名称 - @ApiModelProperty("贷款人") + @ApiModelProperty("贷款人") private String borrName; // 贷款人 - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContractNo; // 贷款合同编号 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 - @ApiModelProperty("资方合同编号") + @ApiModelProperty("资方合同编号") private String bankContractNo; // 资方合同编号 - @ApiModelProperty("已还金额") + @ApiModelProperty("已还金额") private String alRepaidMoney; // 已还金额 - @ApiModelProperty("当前逾期金额") + @ApiModelProperty("当前逾期金额") private String currentBeMoney; // 当前逾期金额 - @ApiModelProperty("其中资金占用费") + @ApiModelProperty("其中资金占用费") private String wheFundOccMoney; // 其中资金占用费 - @ApiModelProperty("未到期金额") + @ApiModelProperty("未到期金额") private String unexpiredMoney; // 未到期金额 - @ApiModelProperty("总期数") + @ApiModelProperty("总期数") private String nper; // 总期数 - @ApiModelProperty("当前期数") + @ApiModelProperty("当前期数") private String currentPeriod; // 当前期数 - @ApiModelProperty("已还金额换算期数") + @ApiModelProperty("已还金额换算期数") private String alRepaidMoneyConPeriod; // 已还金额换算期数 - @ApiModelProperty("逾期金额换算期数") + @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 - - @ApiModelProperty("交回方式key") + + @ApiModelProperty("交回方式key") private String restoreTypeKey; // 交回方式key - @ApiModelProperty("交回方式value") + @ApiModelProperty("交回方式value") private String restoreTypeValue; // 交回方式value - @ApiModelProperty("预交回日期") + @ApiModelProperty("预交回日期") private String restoreDate; // 预交回日期 - @ApiModelProperty("经办人sid") + @ApiModelProperty("经办人sid") private String operatorSid; // 经办人sid - @ApiModelProperty("经办人姓名") + @ApiModelProperty("经办人姓名") private String operatorName; // 经办人姓名 - @ApiModelProperty("涉及相关费用") + @ApiModelProperty("涉及相关费用") private String involveCorrMoney; // 涉及相关费用 - @ApiModelProperty("费用说明") + @ApiModelProperty("费用说明") private String costRemarks; // 费用说明 - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("组织全路径") + @ApiModelProperty("组织全路径") private String orgPath; // 组织全路径 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstSid; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; // 任务id @ApiModelProperty("催收记录sid") private String csjlSid; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java index f0b113ebc4..d5dd1d8c7b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java @@ -25,29 +25,13 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanrestorereportapply; - import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.ArrayList; import java.util.List; -/** - * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyDto.java
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyDto
- * Description: 车辆交回事前报备申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "车辆交回事前报备申请 数据传输对象", description = "车辆交回事前报备申请 数据传输对象") public class LoanRestoreReportApplyDto implements Dto { @@ -58,75 +42,75 @@ public class LoanRestoreReportApplyDto implements Dto { private String remarks; @ApiModelProperty("创建人sid") private String createBySid; - @ApiModelProperty("创建人") + @ApiModelProperty("创建人") private String createByName; // 创建人 - @ApiModelProperty("申请编号") + @ApiModelProperty("申请编号") private String billNo; // 申请编号 - @ApiModelProperty("申请部门sid") + @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") + @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 @ApiModelProperty("销售订单车辆sid") private String saleVehSid; - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String custName; // 客户名称 - @ApiModelProperty("贷款人") + @ApiModelProperty("贷款人") private String borrName; // 贷款人 - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContractNo; // 贷款合同编号 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 - @ApiModelProperty("资方合同编号") + @ApiModelProperty("资方合同编号") private String bankContractNo; // 资方合同编号 - @ApiModelProperty("已还金额") + @ApiModelProperty("已还金额") private String alRepaidMoney; // 已还金额 - @ApiModelProperty("当前逾期金额") + @ApiModelProperty("当前逾期金额") private String currentBeMoney; // 当前逾期金额 - @ApiModelProperty("其中资金占用费") + @ApiModelProperty("其中资金占用费") private String wheFundOccMoney; // 其中资金占用费 - @ApiModelProperty("未到期金额") + @ApiModelProperty("未到期金额") private String unexpiredMoney; // 未到期金额 - @ApiModelProperty("总期数") + @ApiModelProperty("总期数") private String nper; // 总期数 - @ApiModelProperty("当前期数") + @ApiModelProperty("当前期数") private String currentPeriod; // 当前期数 - @ApiModelProperty("已还金额换算期数") + @ApiModelProperty("已还金额换算期数") private String alRepaidMoneyConPeriod; // 已还金额换算期数 - @ApiModelProperty("逾期金额换算期数") + @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 - @ApiModelProperty("交回方式key") + @ApiModelProperty("交回方式key") private String restoreTypeKey; // 交回方式key - @ApiModelProperty("交回方式value") + @ApiModelProperty("交回方式value") private String restoreTypeValue; // 交回方式value - @ApiModelProperty("预交回日期") + @ApiModelProperty("预交回日期") private String restoreDate; // 预交回日期 - @ApiModelProperty("经办人sid") + @ApiModelProperty("经办人sid") private String operatorSid; // 经办人sid - @ApiModelProperty("经办人姓名") + @ApiModelProperty("经办人姓名") private String operatorName; // 经办人姓名 - @ApiModelProperty("涉及相关费用") + @ApiModelProperty("涉及相关费用") private String involveCorrMoney; // 涉及相关费用 - @ApiModelProperty("费用说明") + @ApiModelProperty("费用说明") private String costRemarks; // 费用说明 - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("组织全路径") + @ApiModelProperty("组织全路径") private String orgPath; // 组织全路径 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstSid; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; // 任务id @ApiModelProperty("附件路径") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java index cb348410c8..22c277f272 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java @@ -36,21 +36,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-riskcenter(逾期催收记录)
- * File: LoanBeCollectionRecordFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordRest
- * Description: 逾期催收记录.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-11 13:45:40
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "逾期催收记录") -@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordRest") +@RestController @RequestMapping("v1/loanbecollectionrecord") public class LoanBeCollectionRecordRest implements LoanBeCollectionRecordFeign { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java index b7f6f5e1c0..45809471ec 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java @@ -39,53 +39,37 @@ import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportAppl import java.util.List; import java.util.Map; -/** - * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyMapper.java
- * Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyMapper
- * Description: 车辆交回事前报备申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface LoanRestoreReportApplyMapper extends BaseMapper { - //@Update("update loan_restore_report_apply set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from loan_restore_report_apply") - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from loan_restore_report_apply") + List selectListVo(); int updateFlowFiled(Map map); - String selectNum(String billNo); + String selectNum(String billNo); - String getYhje(String saleVehSid); + String getYhje(String saleVehSid); - String getWdqje(String saleVehSid); + String getWdqje(String saleVehSid); - String getZqs(String saleVehSid); + String getZqs(String saleVehSid); - String getDqqs(String saleVehSid); + String getDqqs(String saleVehSid); - String getYhjehsqs(String saleVehSid); + String getYhjehsqs(String saleVehSid); - String getDqyqje(String saleVehSid); + String getDqyqje(String saleVehSid); - String getQzzjzyf(String saleVehSid); + String getQzzjzyf(String saleVehSid); - String getYqjehsqs(String saleVehSid); + String getYqjehsqs(String saleVehSid); int selectBySid(String join); - LoanRestoreReportCarInfo jkCarInfo(String saleVehSid); + LoanRestoreReportCarInfo jkCarInfo(String saleVehSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java index 97248e9ff6..5444bac0fb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java @@ -40,21 +40,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyRest
- * Description: 车辆交回事前报备申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "车辆交回事前报备申请") -@RestController("com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyRest") +@RestController @RequestMapping("v1/loanrestorereportapply") public class LoanRestoreReportApplyRest implements LoanRestoreReportApplyFeign { @@ -98,7 +85,7 @@ public class LoanRestoreReportApplyRest implements LoanRestoreReportApplyFeign { @Override public ResultBean init(String saleVehSid, String orgPath, String userSid) { ResultBean rb = ResultBean.fireFail(); - LoanRestoreReportApplyDetailsVo loanRestoreReportApplyDetailsVo = loanRestoreReportApplyService.init(saleVehSid, orgPath, userSid); + LoanRestoreReportApplyDetailsVo loanRestoreReportApplyDetailsVo = loanRestoreReportApplyService.init(saleVehSid, orgPath, userSid); return rb.success().setData(loanRestoreReportApplyDetailsVo); } From ca84c368ea4d1f7904dfec1513563a723a1aa496 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 16 Apr 2025 13:37:34 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=9A/?= =?UTF-8?q?=E8=B0=83=E4=BB=B7=E5=AE=A1=E6=89=B9=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppPricestrategyBillFeign.java | 8 ++++---- .../AppPricestrategyBillService.java | 8 ++++---- .../SmsPricestrategyBillService.java | 19 ++++++++++++++++++- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java index 23f6a05d52..48ac63a154 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java @@ -23,22 +23,22 @@ public interface AppPricestrategyBillFeign { /**********************************************流程********************************************/ @ApiOperation("办理") - @PutMapping("/agreeCreditInfo") + @PutMapping("/agreeSpriceInfo") @ResponseBody ResultBean agreeCreditInfo(@RequestBody PricestrategyBillDto dto); @ApiOperation("驳回") - @PutMapping("/rejectCreditInfo") + @PutMapping("/rejectSpriceInfo") @ResponseBody ResultBean rejectCreditInfo(@RequestBody PricestrategyBillTaskQuery query); @ApiOperation("撤回") - @PutMapping("/recallCreditInfo") + @PutMapping("/recallSpriceInfo") @ResponseBody ResultBean recallCreditInfo(@RequestBody PricestrategyBillTaskQuery query); @ApiOperation("终止") - @PutMapping("/stopCreditInfo") + @PutMapping("/stopSpriceInfo") @ResponseBody ResultBean stopCreditInfo(@RequestBody PricestrategyBillTaskQuery query); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java index 45600c0309..5d6e6a9b98 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java @@ -72,7 +72,7 @@ public class AppPricestrategyBillService { }else { String strategyDescribe = ""; for (AppPricestrategyBillGoodstypedetailDetailsVo appPricestrategyBillGoodstypedetailDetailsVo : appPricestrategyBillGoodstypedetailDetailsVos) { - strategyDescribe = strategyDescribe + appPricestrategyBillGoodstypedetailDetailsVo.getRangeStart() + "——" + appPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd() + " " + appPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate() + "; "; + strategyDescribe = strategyDescribe + appPricestrategyBillGoodstypedetailDetailsVo.getRangeStart() + "-" + appPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd() + " " + appPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate() + "%; "; } appPricestrategyBillDetailDetailsVo.setStrategyDescribe(strategyDescribe); } @@ -82,7 +82,7 @@ public class AppPricestrategyBillService { public ResultBean agreeCreditInfo(PricestrategyBillDto dto) { ResultBean rb = ResultBean.fireFail(); - //根据用户sid获取staffSid + /*//根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); if (!userVoResultBean.getSuccess()) { return rb.setMsg(userVoResultBean.getMsg()); @@ -93,10 +93,10 @@ public class AppPricestrategyBillService { return rb.setMsg(staffOrgResultBean.getMsg()); } //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();*/ SmsPricestrategyBillCompleteDto completeInventoryProfitinDto = new SmsPricestrategyBillCompleteDto(); BeanUtil.copyProperties(dto, completeInventoryProfitinDto); - completeInventoryProfitinDto.setOrgPath(orgSidPath); +// completeInventoryProfitinDto.setOrgPath(orgSidPath); ResultBean resultBean = smsPricestrategyBillFeign.complete(completeInventoryProfitinDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java index 4d11036e98..04010da454 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java @@ -67,6 +67,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; @@ -437,10 +438,26 @@ public class SmsPricestrategyBillService extends MybatisBaseService= 0; + } + if (rangeEnd != null) { + inRange &= cost.compareTo(rangeEnd) <= 0; + } + + if (inRange) { + BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); + cost = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100"),2, RoundingMode.HALF_UP)); + smsGoodsService.updateSalesPrice(smsGood.getSid(), cost.toString()); } } } From 08e4910e7e509c97eca734f132f2726e5cbcd5b9 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 16 Apr 2025 15:50:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=9D=E5=A4=96=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairBwBillPageListVo.java | 14 ++++++++++---- .../biz/asbusrepairbill/AsBusrepairBillMapper.xml | 4 +++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java index 454069b3e4..3889a5bf9e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java @@ -36,13 +36,19 @@ public class AsBusrepairBwBillPageListVo { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date entryTime; @ApiModelProperty("工时费") - private BigDecimal hourAmount; + private String hourAmount; @ApiModelProperty("材料费") - private BigDecimal goodsAmount; + private String goodsAmount; @ApiModelProperty("外出费") - private BigDecimal outAmount; + private String outAmount; @ApiModelProperty("其他费用") - private BigDecimal otherAmount; + private String otherAmount; @ApiModelProperty("加税点项目") private String taxItems; + @ApiModelProperty("施救费用") + private String rescueAmount; + @ApiModelProperty("结算金额") + private String settleAmount; + @ApiModelProperty("结算日期") + private String settleTime; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index a5ab843643..4a9b980613 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -224,7 +224,9 @@ a.goodsAmount, a.outAmount, a.otherAmount, - ai.taxItems + ai.taxItems, + a.rescueAmount, + a.settleAmount from as_busrepair_bill a LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid left join as_busrepair_bill_invoice as ai on a.sid = ai.billSid From 230db4b7e648da17beb0f402940af74dc81e05a8 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 16 Apr 2025 16:52:50 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=87=91=E8=9E=8D=E8=AE=A4=E6=AC=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9E=AB=E6=AC=BE=E6=98=AF=E5=90=A6=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectedReceivablesDetailedRsk.java | 2 +- .../FinCollectionConfirmationMapper.java | 2 + .../FinCollectionConfirmationMapper.xml | 8 +++ .../FinCollectionConfirmationService.java | 56 +++++++++---------- 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java index 978709bbd2..03273628d3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java @@ -1,6 +1,6 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation.rsk; -import com.fasterxml.jackson.annotation.JsonProperty; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index a875aad466..644ae44dbc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -202,4 +202,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper selectNotPush(); String selectCurrentMoney(String sid); + + int selBeVehCountByBusVinSidAndPeriod(@Param("busVinSid") String busVinSid, @Param("period") String period); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index e24474177c..30284a354c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -560,4 +560,12 @@ WHERE furd.sid = #{sid} LIMIT 1 + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 4ec78e859e..463f3a1201 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -3990,6 +3990,31 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { + return rb.setMsg("存在未支付垫款数据，认款失败！"); + } + } + } + } } } BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedRsk::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); @@ -4019,20 +4044,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); -// if (sysOrganizationVoResultBean.getData() != null) { -// finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); -// } -// } else - // { //代收款 String orgPath = dto.getOrgPath(); finCollectionConfirmation.setOrgSidPath(orgPath); @@ -4040,10 +4051,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService orgList = Arrays.asList(orgPath.split("/")); -// orgList.set(orgList.size() - 1, dto.getStaffDeptSid()); -// finCollectionConfirmation.setOrgSidPath(String.join("/", orgList)); - // } sid = finCollectionConfirmation.getSid(); finCollectionConfirmation.setCreateBySid(dto.getUserSid()); finCollectionConfirmation.setUseOrgSid(useOrgSid); @@ -4106,22 +4113,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService