From 35c5d65f644f3fcaf6ad8705a093822cc61bcf5c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 5 Jul 2023 18:17:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationJYDDKYDJVo.java | 2 + .../AppFinFundsCarriedForwardYXYSKXVo.java | 86 +++++++ .../FinFundsCarriedForwardApplyDetailsVo.java | 31 ++- .../FinFundsCarriedForwardApplyDto.java | 20 +- .../FinFundsCarriedForwardApplyFeign.java | 5 + ...FundsCarriedForwardApplyFeignFallback.java | 5 + .../FinFundsCarriedForwardApplyInitQuery.java | 61 +++++ .../FinFundsCarriedForwardApplyQuery.java | 49 ++-- .../FinFundsCarriedForwardApplyVo.java | 50 ++--- .../FinFundsCarriedForwardVeh.java | 2 + .../FinFundsCarriedForwardVehDetailsVo.java | 2 + .../FinFundsCarriedForwardVehDto.java | 2 + .../FinFundsCarriedForwardVehFeign.java | 14 +- ...inFundsCarriedForwardVehFeignFallback.java | 10 + .../FinSelectReceivablesDetailedVo.java | 5 + ...FinSelectReceivablesDetailedWCKCLRKVo.java | 4 + .../FinSelectedReceivablesDetailed.java | 5 + .../FinSelectedReceivablesDetailedDto.java | 5 + .../FinSelectedReceivablesDetailedVo.java | 5 + .../FinCollectionConfirmationMapper.xml | 7 +- .../FinCollectionConfirmationService.java | 7 +- .../FinFundsCarriedForwardApplyMapper.java | 2 +- .../FinFundsCarriedForwardApplyMapper.xml | 41 +++- .../FinFundsCarriedForwardApplyRest.java | 15 +- .../FinFundsCarriedForwardApplyService.java | 209 ++++++++++++++---- .../FinFundsCarriedForwardVehMapper.java | 4 + .../FinFundsCarriedForwardVehMapper.xml | 45 +++- .../FinFundsCarriedForwardVehRest.java | 15 ++ .../FinFundsCarriedForwardVehService.java | 8 + .../FinSelectedReceivablesDetailedMapper.xml | 6 +- ...FinSelectedReceivablesDetailedService.java | 31 +-- 31 files changed, 572 insertions(+), 181 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyInitQuery.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java index 6617bf59f2..3ab0c5048b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java @@ -56,6 +56,8 @@ public class FinCollectionConfirmationJYDDKYDJVo implements Vo { private String useOrgSid; @ApiModelProperty("销售专员部门名称") private String staffDeptName; + @ApiModelProperty("销售专员sid") + private String staffSid; @ApiModelProperty("销售专员名称") private String staffName; @ApiModelProperty("单据编号") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java new file mode 100644 index 0000000000..a424d31c55 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java @@ -0,0 +1,86 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finfundscarriedforwardapply; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +/** + * Project: anrui-fin(销售相关)
+ * File: FinCustomerBillDetailedDto.java
+ * Class: com.yxt.anrui.fin.api.fincustomerbilldetailed.FinCustomerBillDetailedDto
+ * Description: 客户账单明细表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-12 17:57:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "客户账单明细表 数据传输对象", description = "客户账单明细表 数据传输对象") +@Data +public class AppFinFundsCarriedForwardYXYSKXVo implements Dto { + + @ApiModelProperty("合同sid") + private String contractSid; + @ApiModelProperty("合同号") + private String contractId; + @ApiModelProperty("客户名") + private String name; + @ApiModelProperty("应收项目") + private String projectName; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("应收金额") + private String receivable; + @ApiModelProperty("认款金额") + private String confirmMoney; + private Boolean checked; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("认款日期") + private String confirmDate; + private String state; + private String sid; + @ApiModelProperty("应收未收sid") + private String receivablesSid; + @ApiModelProperty("付款方式value") + private String payType; + @ApiModelProperty("付款方式key:1全款、2贷款") + private String payTypeKey; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + private int subscribedOf; +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java index 38cf835058..433b9dc475 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java @@ -26,12 +26,16 @@ package com.yxt.anrui.fin.api.finfundscarriedforwardapply; +import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDetailsVo; 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: FinFundsCarriedForwardApplyVo.java
@@ -51,6 +55,14 @@ public class FinFundsCarriedForwardApplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("申请日期") + private String createByDate; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid + @ApiModelProperty("部门-人员名") + private String publishInfo; @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 @ApiModelProperty("申请部门sid") @@ -73,17 +85,14 @@ public class FinFundsCarriedForwardApplyDetailsVo implements Vo { private String useOrgName; // 分公司名称 @ApiModelProperty("组织全路径") private String orgSidPath; // 组织全路径 - @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") - private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") - private String procInstSid; // 流程实例的sid - @ApiModelProperty("流程状态") - private String nodeState; // 流程状态 - @ApiModelProperty("任务id") - private String taskId; // 任务id @ApiModelProperty("申请编号") private String billNo; // 申请编号 - + @ApiModelProperty("款项确认书附件") + private List kxqrsImages; + @ApiModelProperty("款项结转车辆列表") + private List finFundsCarriedForwardVehDetailsVos = new ArrayList<>(); + @ApiModelProperty("应收未收款项明细") + private List yswsFinFundsCarriedForwardYXYSKXVos = new ArrayList<>(); + @ApiModelProperty("已选应收款项明细") + private List yxysFinFundsCarriedForwardYXYSKXVos = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java index 6fbc6914c7..ab7a9ce5a3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java @@ -26,12 +26,17 @@ package com.yxt.anrui.fin.api.finfundscarriedforwardapply; +import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDetailsVo; +import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDto; 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-fin(款项结转申请)
* File: FinFundsCarriedForwardApplyDto.java
@@ -51,6 +56,8 @@ public class FinFundsCarriedForwardApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 @ApiModelProperty("申请部门sid") @@ -73,17 +80,8 @@ public class FinFundsCarriedForwardApplyDto implements Dto { private String useOrgName; // 分公司名称 @ApiModelProperty("组织全路径") private String orgSidPath; // 组织全路径 - @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") - private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") - private String procInstSid; // 流程实例的sid - @ApiModelProperty("流程状态") - private String nodeState; // 流程状态 - @ApiModelProperty("任务id") - private String taskId; // 任务id @ApiModelProperty("申请编号") private String billNo; // 申请编号 - + @ApiModelProperty("款项结转车辆列表") + private List finFundsCarriedForwardVehDetailsVos = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java index 4402d19e0c..06749ac2e0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java @@ -75,4 +75,9 @@ public interface FinFundsCarriedForwardApplyFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("初始化款项结转申请") + @PostMapping("/init") + @ResponseBody + public ResultBean init(@RequestBody FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeignFallback.java index b33bd39d5b..916223d4a7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeignFallback.java @@ -69,4 +69,9 @@ public class FinFundsCarriedForwardApplyFeignFallback implements FinFundsCarried ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-fin/finfundscarriedforwardapply/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyInitQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyInitQuery.java new file mode 100644 index 0000000000..2d6b4e01f4 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyInitQuery.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finfundscarriedforwardapply; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-fin(款项结转申请)
+ * File: FinFundsCarriedForwardApplyQuery.java
+ * Class: com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyQuery
+ * Description: 款项结转申请表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-07-04 08:59:22
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "款项结转申请表 查询条件", description = "款项结转申请表 查询条件") +public class FinFundsCarriedForwardApplyInitQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgSidPath; + @ApiModelProperty("来源(汉字)") + private String source; + @ApiModelProperty("业务sid") + private List busSids; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java index 7bdca916f5..9d585bf57f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java @@ -49,39 +49,24 @@ import lombok.Data; @ApiModel(value = "款项结转申请表 查询条件", description = "款项结转申请表 查询条件") public class FinFundsCarriedForwardApplyQuery implements Query { + @ApiModelProperty("用户sid") + private String userSid; @ApiModelProperty("创建人接口") - private String createByName; // 创建人接口 - @ApiModelProperty("申请部门sid") - private String applyDeptSid; // 申请部门sid + private String createByName; @ApiModelProperty("申请部门名称") - private String applyDeptName; // 申请部门名称 - @ApiModelProperty("销售部门sid") - private String saleDeptSid; // 销售部门sid - @ApiModelProperty("销售部门名称") - private String saleDeptName; // 销售部门名称 - @ApiModelProperty("业务员sid") - private String staffSid; // 业务员sid - @ApiModelProperty("业务员姓名") - private String staffName; // 业务员姓名 - @ApiModelProperty("来源") - private String source; // 来源 - @ApiModelProperty("分公司sid") - private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") - private String useOrgName; // 分公司名称 + private String applyDeptName; + @ApiModelProperty("申请开始日期") + private String applyStartDate; + @ApiModelProperty("申请结束日期") + private String applyEndDate; + @ApiModelProperty("最小结转金额") + private String jzSmallMoney; + @ApiModelProperty("最大结转金额") + private String jzBigMoney; @ApiModelProperty("组织全路径") - private String orgSidPath; // 组织全路径 - @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") - private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") - private String procInstSid; // 流程实例的sid - @ApiModelProperty("流程状态") - private String nodeState; // 流程状态 - @ApiModelProperty("任务id") - private String taskId; // 任务id - @ApiModelProperty("申请编号") - private String billNo; // 申请编号 - + private String orgSidPath; + private String menuUrl; + private String menuSid; + @ApiModelProperty("移动端查询条件") + private String name; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java index 2a0279f899..475ed0a49f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java @@ -49,41 +49,23 @@ import lombok.Data; @ApiModel(value = "款项结转申请表 视图数据对象", description = "款项结转申请表 视图数据对象") public class FinFundsCarriedForwardApplyVo implements Vo { - private String sid; // sid - - @ApiModelProperty("创建人接口") - private String createByName; // 创建人接口 - @ApiModelProperty("申请部门sid") - private String applyDeptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") - private String applyDeptName; // 申请部门名称 - @ApiModelProperty("销售部门sid") - private String saleDeptSid; // 销售部门sid - @ApiModelProperty("销售部门名称") - private String saleDeptName; // 销售部门名称 - @ApiModelProperty("业务员sid") - private String staffSid; // 业务员sid - @ApiModelProperty("业务员姓名") - private String staffName; // 业务员姓名 + private String sid; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("申请部门名称") + private String applyDeptName; + @ApiModelProperty("申请人") + private String createByName; + @ApiModelProperty("申请日期") + private String createTime; @ApiModelProperty("来源") - private String source; // 来源 - @ApiModelProperty("分公司sid") - private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") - private String useOrgName; // 分公司名称 - @ApiModelProperty("组织全路径") - private String orgSidPath; // 组织全路径 + private String source; + @ApiModelProperty("结转金额") + private String carryForwardMoney; + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") - private String nodeSid; // 环节定义的sid + private String procDefId; @ApiModelProperty("流程实例的sid") - private String procInstSid; // 流程实例的sid - @ApiModelProperty("流程状态") - private String nodeState; // 流程状态 - @ApiModelProperty("任务id") - private String taskId; // 任务id - @ApiModelProperty("申请编号") - private String billNo; // 申请编号 - + private String procInstSid; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java index 6f1077e62b..aabaeeff39 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVeh.java @@ -52,6 +52,8 @@ public class FinFundsCarriedForwardVeh extends BaseEntity { @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 + @ApiModelProperty("业务sid") + private String busSid; // 业务sid @ApiModelProperty("业务编号") private String busBillNo; // 业务编号 @ApiModelProperty("主表sid") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java index a8624d4e77..56da7aba51 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java @@ -53,6 +53,8 @@ public class FinFundsCarriedForwardVehDetailsVo implements Vo { @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 + @ApiModelProperty("业务sid") + private String busSid; // 业务sid @ApiModelProperty("业务编号") private String busBillNo; // 业务编号 @ApiModelProperty("主表sid") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java index 4b69803f17..211775a1b6 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java @@ -53,6 +53,8 @@ public class FinFundsCarriedForwardVehDto implements Dto { @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 + @ApiModelProperty("业务sid") + private String busSid; // 业务sid @ApiModelProperty("业务编号") private String busBillNo; // 业务编号 @ApiModelProperty("主表sid") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehFeign.java index 0c36f45af3..f65e16684b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehFeign.java @@ -65,14 +65,24 @@ public interface FinFundsCarriedForwardVehFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody FinFundsCarriedForwardVehDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据订金业务sid计算审核过程中的结转金额之和") + @GetMapping("/fetchDJSumMoneyByBusSid/{busSid}") + @ResponseBody + public ResultBean fetchDJSumMoneyByBusSid(@PathVariable("busSid") String busSid); + + @ApiOperation("根据收款业务sid计算审核过程中的结转金额之和") + @GetMapping("/fetchSKSumMoneyByBusSid/{busSid}") + @ResponseBody + public ResultBean fetchSKSumMoneyByBusSid(@PathVariable("busSid") String busSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehFeignFallback.java index 6afebc102b..1d4d55c7fc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehFeignFallback.java @@ -69,4 +69,14 @@ public class FinFundsCarriedForwardVehFeignFallback implements FinFundsCarriedFo ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-fin/finfundscarriedforwardveh/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean fetchDJSumMoneyByBusSid(String busSid) { + return null; + } + + @Override + public ResultBean fetchSKSumMoneyByBusSid(String busSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java index bb838e5ae1..a0fdd24b26 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java @@ -53,4 +53,9 @@ public class FinSelectReceivablesDetailedVo implements Vo { @ApiModelProperty("分公司sid") private String useOrgSid; + + @ApiModelProperty("余额") + private String balance; + @ApiModelProperty("款项状态") + private String kxState; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java index 55e723e4c5..272df0b47f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java @@ -21,6 +21,8 @@ public class FinSelectReceivablesDetailedWCKCLRKVo implements Vo { private String useOrgName; @ApiModelProperty("销售专员部门名称") private String staffDeptName; + @ApiModelProperty("销售专员sid") + private String staffSid; @ApiModelProperty("销售专员名称") private String staffName; @ApiModelProperty("合同编号") @@ -41,4 +43,6 @@ public class FinSelectReceivablesDetailedWCKCLRKVo implements Vo { private String subscriptionMoney; @ApiModelProperty("剩余金额") private String reveivableMoney; + @ApiModelProperty("款项状态") + private String state; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java index 7d5519e1d0..ffb96cc136 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java @@ -93,4 +93,9 @@ public class FinSelectedReceivablesDetailed extends BaseEntity { @ApiModelProperty("是否是已认款中的数据选择过来的，0不是（应收未收），1是（已认款）") private int subscribedOf; + + @ApiModelProperty("余额") + private String balance; + @ApiModelProperty("款项状态") + private String kxState; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java index 71f282c3ed..ba6e4396f2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java @@ -91,4 +91,9 @@ public class FinSelectedReceivablesDetailedDto implements Dto { private String payType; private int subscribedOf; + + @ApiModelProperty("余额") + private String balance; + @ApiModelProperty("款项状态") + private String kxState; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java index 72f9b030c4..aeb119d1dc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java @@ -116,4 +116,9 @@ public class FinSelectedReceivablesDetailedVo implements Vo { private String payTypeKey; @ApiModelProperty("全款贷款") private String payType; + + @ApiModelProperty("余额") + private String balance; + @ApiModelProperty("款项状态") + private String kxState; } 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 a0c26afd23..0aa0f35d54 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 @@ -201,18 +201,21 @@ - SELECT * FROM fin_funds_carried_forward_apply ${ew.sqlSegment} - - - + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java index 398c290d76..64a3fba10f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java @@ -25,21 +25,17 @@ *********************************************************/ package com.yxt.anrui.fin.biz.finfundscarriedforwardapply; +import com.yxt.anrui.fin.api.finfundscarriedforwardapply.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Delete; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApply; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyQuery; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyDetailsVo; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyDto; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyFeign; /** * Project: anrui-fin(款项结转申请)
@@ -82,7 +78,7 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp @Override @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); finFundsCarriedForwardApplyService.delBySids(sids); @@ -97,4 +93,9 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp FinFundsCarriedForwardApplyDetailsVo vo = finFundsCarriedForwardApplyService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) { + return finFundsCarriedForwardApplyService.init(finFundsCarriedForwardApplyInitQuery); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index 6b10d0b75c..2c3a3ba62c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -26,23 +26,34 @@ package com.yxt.anrui.fin.biz.finfundscarriedforwardapply; import cn.hutool.core.bean.BeanUtil; +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.fin.api.fincollectionconfirmation.FinCollectionConfirmation; +import com.yxt.anrui.fin.api.finfundscarriedforwardapply.*; +import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDetailsVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; +import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService; +import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; 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.finfundscarriedforwardapply.FinFundsCarriedForwardApply; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyQuery; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyDetailsVo; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyDto; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyFeign; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -60,51 +71,153 @@ import java.util.List; */ @Service public class FinFundsCarriedForwardApplyService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(FinFundsCarriedForwardApplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - FinFundsCarriedForwardApplyQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(FinFundsCarriedForwardApplyDto dto){ + + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private FinCollectionConfirmationService finCollectionConfirmationService; + @Autowired + private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService; + + public PagerVo listPageVo(PagerQuery pq) { + FinFundsCarriedForwardApplyQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgSidPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("fa.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("fa.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("fa.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("fa.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("fa.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getApplyDeptName())) { + qw.like("fa.applyDeptName", query.getApplyDeptName()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("fa.createByName", query.getCreateByName()); + } + String applyStartDate = query.getApplyStartDate(); + String applyEndDate = query.getApplyEndDate(); + qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (bacva.createTime,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(applyEndDate), "date_format (bacva.createTime,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw, query.getJzSmallMoney(), query.getJzBigMoney()); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(FinFundsCarriedForwardApplyDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(FinFundsCarriedForwardApplyDto dto){ - FinFundsCarriedForwardApply entity = new FinFundsCarriedForwardApply(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(FinFundsCarriedForwardApplyDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(FinFundsCarriedForwardApplyDto dto) { + FinFundsCarriedForwardApply entity = new FinFundsCarriedForwardApply(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(FinFundsCarriedForwardApplyDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - FinFundsCarriedForwardApply entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public FinFundsCarriedForwardApplyDetailsVo fetchDetailsVoBySid(String sid){ - FinFundsCarriedForwardApply entity = fetchBySid(sid); - FinFundsCarriedForwardApplyDetailsVo vo = new FinFundsCarriedForwardApplyDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + FinFundsCarriedForwardApply entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public FinFundsCarriedForwardApplyDetailsVo fetchDetailsVoBySid(String sid) { + FinFundsCarriedForwardApply entity = fetchBySid(sid); + FinFundsCarriedForwardApplyDetailsVo vo = new FinFundsCarriedForwardApplyDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public ResultBean init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) { + ResultBean rb = ResultBean.fireFail(); + List busSids = finFundsCarriedForwardApplyInitQuery.getBusSids(); + List finFundsCarriedForwardVehDetailsVos = new ArrayList<>(); + FinFundsCarriedForwardApplyDetailsVo finFundsCarriedForwardApplyDetailsVo = new FinFundsCarriedForwardApplyDetailsVo(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(finFundsCarriedForwardApplyInitQuery.getUserSid()).getData(); + finFundsCarriedForwardApplyDetailsVo.setCreateBySid(sysUserVo.getSid()); + finFundsCarriedForwardApplyDetailsVo.setCreateByName(sysUserVo.getName()); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(finFundsCarriedForwardApplyInitQuery.getOrgSidPath()).getData(); + finFundsCarriedForwardApplyDetailsVo.setApplyDeptSid(sysOrganizationVo.getSid()); + finFundsCarriedForwardApplyDetailsVo.setApplyDeptName(sysOrganizationVo.getName()); + finFundsCarriedForwardApplyDetailsVo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName()); + finFundsCarriedForwardApplyDetailsVo.setCreateByDate(DateUtil.formatDate(new Date())); + FinCollectionConfirmation finCollectionConfirmation = null; + for (String busSid : busSids) { + FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo = new FinFundsCarriedForwardVehDetailsVo(); + finFundsCarriedForwardVehDetailsVo.setBusSid(busSid); + if ("简易订单订金".equals(finFundsCarriedForwardApplyInitQuery.getSource())){ + finCollectionConfirmation = finCollectionConfirmationService.fetchBySid(busSid); + finFundsCarriedForwardVehDetailsVo.setBusBillNo(finCollectionConfirmation.getBillNo()); + finFundsCarriedForwardVehDetailsVo.setCustomerName(finCollectionConfirmation.getPayerName()); + finFundsCarriedForwardVehDetailsVo.setBalance(finCollectionConfirmation.getBalance().toString()); + }else if ("已认款".equals(finFundsCarriedForwardApplyInitQuery.getSource())){ + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(busSid); + finCollectionConfirmation = finCollectionConfirmationService.fetchBySid(finSelectedReceivablesDetailed.getCollSid()); + finFundsCarriedForwardVehDetailsVo.setBusBillNo(finSelectedReceivablesDetailed.getContractNo()); + finFundsCarriedForwardVehDetailsVo.setCustomerSid(finSelectedReceivablesDetailed.getCustomerSid()); + finFundsCarriedForwardVehDetailsVo.setCustomerName(finSelectedReceivablesDetailed.getCustomerName()); + finFundsCarriedForwardVehDetailsVo.setVinNo(finSelectedReceivablesDetailed.getVIN()); + finFundsCarriedForwardVehDetailsVo.setBalance(finSelectedReceivablesDetailed.getBalance()); + } + finFundsCarriedForwardVehDetailsVos.add(finFundsCarriedForwardVehDetailsVo); + } + finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finCollectionConfirmation.getStaffDeptSid()); + finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finCollectionConfirmation.getStaffDeptName()); + finFundsCarriedForwardApplyDetailsVo.setStaffSid(finCollectionConfirmation.getStaffUserSid()); + finFundsCarriedForwardApplyDetailsVo.setStaffName(finCollectionConfirmation.getStaffName()); + finFundsCarriedForwardApplyDetailsVo.setSource(finFundsCarriedForwardApplyInitQuery.getSource()); + finFundsCarriedForwardApplyDetailsVo.setFinFundsCarriedForwardVehDetailsVos(finFundsCarriedForwardVehDetailsVos); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(finFundsCarriedForwardApplyInitQuery.getOrgSidPath()).getData(); + String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName(); + finFundsCarriedForwardApplyDetailsVo.setUseOrgSid(useOrgSid); + finFundsCarriedForwardApplyDetailsVo.setUseOrgName(useOrgName); + return rb.success().setData(finFundsCarriedForwardApplyDetailsVo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java index 79d99ed03c..9a0ba7f834 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java @@ -62,4 +62,8 @@ public interface FinFundsCarriedForwardVehMapper extends BaseMapper selectListVo(); + + String fetchDJSumMoneyByBusSid(String busSid); + + String fetchSKSumMoneyByBusSid(String busSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml index 3d82a605cc..2226a9c219 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml @@ -1,13 +1,40 @@ - - - - - + + + + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehRest.java index 9db21b9b07..09c6b1ac59 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehRest.java @@ -97,4 +97,19 @@ public class FinFundsCarriedForwardVehRest implements FinFundsCarriedForwardVehF FinFundsCarriedForwardVehDetailsVo vo = finFundsCarriedForwardVehService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean fetchDJSumMoneyByBusSid(String busSid) { + ResultBean rb = ResultBean.fireFail(); + String sumMoney = finFundsCarriedForwardVehService.fetchDJSumMoneyByBusSid(busSid); + return rb.success().setData(sumMoney); + } + + @Override + public ResultBean fetchSKSumMoneyByBusSid(String busSid) { + ResultBean rb = ResultBean.fireFail(); + String sumMoney = finFundsCarriedForwardVehService.fetchSKSumMoneyByBusSid(busSid); + return rb.success().setData(sumMoney); + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java index f5f893e0c9..a7ac40ada7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java @@ -107,4 +107,12 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService SELECT + ferd.sid, fcc.`useOrgSid`, fcc.`staffDeptName`, + fcc.staffUserSid AS staffSid, fcc.`staffName`, ferd.`contractNo`, ferd.`payType`, @@ -333,7 +335,9 @@ ferd.`VIN` AS vinNo, ferd.`receivablesName`, ferd.`auditDate`, - ferd.`subscriptionMoney` + ferd.`subscriptionMoney`, + ferd.balance AS reveivableMoney, + ferd.kxState AS state FROM fin_selected_receivables_detailed ferd LEFT JOIN fin_collection_confirmation fcc 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 1d560734a5..c7fcccfa64 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 @@ -503,27 +503,32 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService wrapper.like("ferd.contractNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("fcc.staffName", query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName())); + } IPage page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.noOutVehRecPageList(page, qw); for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) {