From 98395661bad070958639452b2ca4baf4403134db Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 9 Apr 2025 11:16:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/basevehicle/BaseVehicleService.java | 10 ++--- .../finpaymentapply/AppFinPaymentApplyVo.java | 9 +++- .../FinPaymentapplyDetailsVo.java | 15 ------- .../FinPaymentapplyDetailsBelowEveFeign.java | 2 +- ...mentapplyDetailsBelowEveFeignFallback.java | 15 +------ ...nPaymentapplyDetailsBelowEveListQuery.java | 39 +++++++++++++++++ .../FinPaymentapplyDetailsBelowEveQuery.java | 14 ------ .../FinPaymentapplyEve.java | 14 ------ .../FinPaymentapplyTopDetailsVo.java | 40 ++++++----------- .../FinPaymentapplyTrailerDetailsVo.java | 43 ++++++------------- .../FinPaymentapplyService.java | 18 ++++++-- .../FinPaymentapplyDetailsBelowMapper.java | 3 ++ .../FinPaymentapplyDetailsBelowMapper.xml | 11 +++++ .../FinPaymentapplyDetailsBelowService.java | 6 +++ .../FinPaymentapplyDetailsBelowEveRest.java | 8 +--- ...FinPaymentapplyDetailsBelowEveService.java | 40 +++-------------- .../FinPaymentapplyEveMapper.java | 12 ++++-- .../FinPaymentapplyEveService.java | 5 +++ .../FinPaymentrecordService.java | 28 ++++++------ 19 files changed, 151 insertions(+), 181 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveListQuery.java 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 aef6e2537e..384812e425 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 @@ -3543,14 +3543,14 @@ public class BaseVehicleService extends MybatisBaseService eveList = new ArrayList<>(); + private List trailerList = new ArrayList<>(); + private List topList = new ArrayList<>(); + private String createBySid; private String taskId; private String procInstId; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java index 4b3a93f339..1881ffe5bc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.fin.api.finpaymentapply; - import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo; import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo; @@ -35,23 +34,9 @@ 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-fin(财务)
- * File: FinPaymentapplyVo.java
- * Class: com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo
- * Description: fin_paymentapply 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "fin_paymentapply 视图数据详情", description = "fin_paymentapply 视图数据详情") public class FinPaymentapplyDetailsVo implements Vo { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java index 60c88b127d..9de2bd48fc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java @@ -49,7 +49,7 @@ public interface FinPaymentapplyDetailsBelowEveFeign { @ApiOperation("选择平仓信息") @PostMapping("/chooseEve") @ResponseBody - public ResultBean> chooseEve(@RequestBody PagerQuery pq); + public ResultBean> chooseEve(@RequestBody PagerQuery pq); @ApiOperation("新增或修改") @PostMapping("/save") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java index 3033e6efae..20684c5195 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java @@ -32,19 +32,6 @@ import org.springframework.stereotype.Component; import java.util.List; -/** - * Project: anrui-fin(平仓)
- * File: FinPaymentapplyDetailsBelowEveFeignFallback.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeignFallback
- * Description: 付款申请明细-明细-平仓.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 10:03:07
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Component public class FinPaymentapplyDetailsBelowEveFeignFallback implements FinPaymentapplyDetailsBelowEveFeign { @@ -55,7 +42,7 @@ public class FinPaymentapplyDetailsBelowEveFeignFallback implements FinPaymentap } @Override - public ResultBean> chooseEve(PagerQuery pq) { + public ResultBean> chooseEve(PagerQuery pq) { return null; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveListQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveListQuery.java new file mode 100644 index 0000000000..a250f7b663 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveListQuery.java @@ -0,0 +1,39 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "付款申请明细-明细-平仓 查询条件", description = "付款申请明细-明细-平仓 查询条件") +public class FinPaymentapplyDetailsBelowEveListQuery implements Query { + + private String payCompanySid; + private String useOrgSid; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java index 37741e6ebc..395a728974 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve; - import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; @@ -34,19 +33,6 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: anrui-fin(平仓)
- * File: FinPaymentapplyDetailsBelowEveQuery.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery
- * Description: 付款申请明细-明细-平仓 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 10:03:07
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "付款申请明细-明细-平仓 查询条件", description = "付款申请明细-明细-平仓 查询条件") public class FinPaymentapplyDetailsBelowEveQuery implements Query { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java index 4633acd4aa..39ff028f1f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java @@ -30,22 +30,8 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.math.BigDecimal; -/** - * Project: anrui-fin(付款申请平仓)
- * File: FinPaymentapplyEve.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve
- * Description: 付款申请-平仓.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 11:20:11
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "付款申请-平仓", description = "付款申请-平仓") @TableName("fin_paymentapply_eve") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDetailsVo.java index e28d88d47d..f9b7e051f8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.fin.api.finpaymentapplytop; - import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -34,50 +33,37 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: anrui-fin(付款申请)
- * File: FinPaymentapplyTopVo.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopVo
- * Description: 付款申请上装 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-14 10:55:50
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "付款申请上装 视图数据详情", description = "付款申请上装 视图数据详情") public class FinPaymentapplyTopDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("付款申请sid") + @ApiModelProperty("付款申请sid") private String applySid; // 付款申请sid - @ApiModelProperty("上装名称") + @ApiModelProperty("上装名称") private String installNameValue; // 上装名称 - @ApiModelProperty("货箱内部尺寸") + @ApiModelProperty("货箱内部尺寸") private String size; // 货箱内部尺寸 - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("上装sid") + @ApiModelProperty("上装sid") private String topSid; // 上装sid - @ApiModelProperty("箱体颜色") + @ApiModelProperty("箱体颜色") private String color; // 箱体颜色 - @ApiModelProperty("厂家结算价") + @ApiModelProperty("厂家结算价") private BigDecimal costPrice; // 厂家结算价 - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("车型别名") + @ApiModelProperty("车型别名") private String vehModel; // 车型别名 - @ApiModelProperty("合同编号") + @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - @ApiModelProperty("销售订单号") + @ApiModelProperty("销售订单号") private String saleOrderNo; // 销售订单号 - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("销售类型") + @ApiModelProperty("销售类型") private String payType; // 销售类型 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDetailsVo.java index 11af968f6f..6535b53e77 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDetailsVo.java @@ -25,61 +25,46 @@ *********************************************************/ package com.yxt.anrui.fin.api.finpaymentapplytrailer; - import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; -/** - * Project: anrui-fin(付款申请)
- * File: FinPaymentapplyTrailerVo.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerVo
- * Description: 付款申请挂车 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-14 10:55:50
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "付款申请挂车 视图数据详情", description = "付款申请挂车 视图数据详情") public class FinPaymentapplyTrailerDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("付款申请sid") + @ApiModelProperty("付款申请sid") private String applySid; // 付款申请sid - @ApiModelProperty("挂车名称") + @ApiModelProperty("挂车名称") private String trailerTypeValue; // 挂车名称 - @ApiModelProperty("外观尺寸") + @ApiModelProperty("外观尺寸") private String size; // 外观尺寸 - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("挂车sid") + @ApiModelProperty("挂车sid") private String trailerSid; // 挂车sid - @ApiModelProperty("箱体颜色") + @ApiModelProperty("箱体颜色") private String color; // 箱体颜色 - @ApiModelProperty("厂家结算价") + @ApiModelProperty("厂家结算价") private BigDecimal costPrice; // 厂家结算价 - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("车型别名") + @ApiModelProperty("车型别名") private String vehModel; // 车型别名 - @ApiModelProperty("主车车架号") + @ApiModelProperty("主车车架号") private String zcVinNo; // 主车车架号 - @ApiModelProperty("合同编号") + @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - @ApiModelProperty("销售订单号") + @ApiModelProperty("销售订单号") private String saleOrderNo; // 销售订单号 - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("销售类型") + @ApiModelProperty("销售类型") private String payType; // 销售类型 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 357ca03430..461fedf25d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -699,7 +699,11 @@ public class FinPaymentapplyService extends MybatisBaseService finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid()); for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) { @@ -729,7 +733,11 @@ public class FinPaymentapplyService extends MybatisBaseService + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java index 14965bebdb..b4d83a48d8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java @@ -31,6 +31,8 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsB import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo; import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto; import org.springframework.stereotype.Service; + +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -55,4 +57,8 @@ public class FinPaymentapplyDetailsBelowService extends MybatisBaseService> chooseEve(PagerQuery pq) { + public ResultBean> chooseEve(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); PagerVo pv = finPaymentapplyDetailsBelowEveService.chooseEve(pq); return rb.success().setData(pv); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java index 0e6193028c..23ab9027a9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.*; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import org.apache.commons.lang3.StringUtils; @@ -36,11 +37,6 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve; -import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery; -import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo; -import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo; -import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -131,39 +127,13 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService chooseEve(PagerQuery pq) { - FinPaymentapplyDetailsBelowEveQuery query = pq.getParams(); + public PagerVo chooseEve(PagerQuery pq) { + FinPaymentapplyDetailsBelowEveListQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); qw.eq("fe.useOrgSid", query.getUseOrgSid()); - if (StringUtils.isNotBlank(query.getPayCompany())) { + /*if (StringUtils.isNotBlank(query.getPayCompany())) { qw.like("fe.payCompany", query.getPayCompany()); - } - if (StringUtils.isNotBlank(query.getCostTitleValue())) { - qw.like("fe.costTitleValue", query.getCostTitleValue()); - } - if (StringUtils.isNotBlank(query.getReceiveCompany())) { - qw.like("fe.receiveCompany", query.getReceiveCompany()); - } - if (StringUtils.isNotBlank(query.getPeriod())) { - qw.like("fe.period", query.getPeriod()); - } - if (StringUtils.isNotBlank(query.getRemarks())) { - qw.like("fe.remarks", query.getRemarks()); - } - if (StringUtils.isNotBlank(query.getPayCompany())) { - qw.like("fe.payCompany", query.getPayCompany()); - } - if (StringUtils.isNotBlank(query.getState())) { - qw.eq("fe.state", query.getState()); - } - //融资付款开通日期 - qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (fe.openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (fe.openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')" - ); - //平仓付款日期 - qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')" - ); + }*/ qw.orderByDesc("fe.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java index f653af8342..ad667f192d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java @@ -32,14 +32,18 @@ import org.apache.ibatis.annotations.Mapper; import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve; import org.apache.ibatis.annotations.Select; +import java.math.BigDecimal; import java.util.List; @Mapper public interface FinPaymentapplyEveMapper extends BaseMapper { - @Delete("delete from fin_paymentapply_eve where applySid = #{dtoSid}") - void delByMainSid(String dtoSid); + @Delete("delete from fin_paymentapply_eve where applySid = #{dtoSid}") + void delByMainSid(String dtoSid); - @Select("select * from fin_paymentapply_eve where applySid = #{mainSid}") - List fetchByMainSid(String sid); + @Select("select * from fin_paymentapply_eve where applySid = #{mainSid}") + List fetchByMainSid(String sid); + + @Select("SELECT SUM(exePayPrice) FROM fin_paymentapply_eve WHERE applySid = #{applySid}") + BigDecimal fetchExePriceByMainSid(String applySid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java index c901749d19..d70df20a30 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java @@ -33,6 +33,7 @@ import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; @Service @@ -51,4 +52,8 @@ public class FinPaymentapplyEveService extends MybatisBaseService fetchByMainSid(String sid) { return baseMapper.fetchByMainSid(sid); } + + public BigDecimal fetchExePriceByMainSid(String applySid) { + return baseMapper.fetchExePriceByMainSid(applySid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 216378768f..413e541a6b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -54,6 +54,7 @@ import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails; import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import com.yxt.anrui.fin.api.finpaymentrecord.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; @@ -64,6 +65,7 @@ import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService; import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService; import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService; import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService; +import com.yxt.anrui.fin.biz.finpaymentapplyeve.FinPaymentapplyEveService; import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService; import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService; import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; @@ -186,7 +188,7 @@ public class FinPaymentrecordService extends MybatisBaseService