款项结转模块开发

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("单据编号")

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(销售相关) <br/>
+ * File: FinCustomerBillDetailedDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.fincustomerbilldetailed.FinCustomerBillDetailedDto <br/>
+ * Description: 客户账单明细表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @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;
+}

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(款项结转申请) <br/>
  * File: FinFundsCarriedForwardApplyVo.java <br/>
@@ -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<String> kxqrsImages;
+    @ApiModelProperty("款项结转车辆列表")
+    private List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = new ArrayList<>();
+    @ApiModelProperty("应收未收款项明细")
+    private List<AppFinFundsCarriedForwardYXYSKXVo> yswsFinFundsCarriedForwardYXYSKXVos = new ArrayList<>();
+    @ApiModelProperty("已选应收款项明细")
+    private List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = new ArrayList<>();
 }

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(款项结转申请) <br/>
  * File: FinFundsCarriedForwardApplyDto.java <br/>
@@ -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<FinFundsCarriedForwardVehDto> finFundsCarriedForwardVehDetailsVos = new ArrayList<>();
 }

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<FinFundsCarriedForwardApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("初始化款项结转申请")
+    @PostMapping("/init")
+    @ResponseBody
+    public ResultBean<FinFundsCarriedForwardApplyDetailsVo> init(@RequestBody FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery);
 }

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<FinFundsCarriedForwardApplyDetailsVo> init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) {
+		return null;
+	}
 }

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(款项结转申请) <br/>
+ * File: FinFundsCarriedForwardApplyQuery.java <br/>
+ * Class: com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyQuery <br/>
+ * Description: 款项结转申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-07-04 08:59:22 <br/>
+ *
+ * @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<String> busSids;
+}

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;
 }

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
+    private String sid;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
     @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 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;
 }

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")

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")

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")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehFeign.java

@@ -75,4 +75,14 @@ public interface FinFundsCarriedForwardVehFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<FinFundsCarriedForwardVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据订金业务sid计算审核过程中的结转金额之和")
+    @GetMapping("/fetchDJSumMoneyByBusSid/{busSid}")
+    @ResponseBody
+    public ResultBean<String> fetchDJSumMoneyByBusSid(@PathVariable("busSid") String busSid);
+
+    @ApiOperation("根据收款业务sid计算审核过程中的结转金额之和")
+    @GetMapping("/fetchSKSumMoneyByBusSid/{busSid}")
+    @ResponseBody
+    public ResultBean<String> fetchSKSumMoneyByBusSid(@PathVariable("busSid") String busSid);
 }

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<String> fetchDJSumMoneyByBusSid(String busSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<String> fetchSKSumMoneyByBusSid(String busSid) {
+		return null;
+	}
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -201,18 +201,21 @@
     <select id="jyddkydjListPage"
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo">
         SELECT
+        fcc.sid,
+        fcc.useOrgSid,
         fcc.staffDeptName,
+        fcc.staffUserSid as staffSid,
         fcc.staffName,
         fcc.`billNo`,
         fcc.`payerName`,
-        bd.`draweeMobile`,
+        bd.`draweeMobile` as phone,
         fcc.collectionDate,
         fcc.collectionMoney,
         fcc.balance
         FROM
         fin_collection_confirmation fcc
         LEFT JOIN anrui_buscenter.`bus_deposit` bd
-        ON fcc.`busSid` f = bd.`billSid`
+        ON fcc.`busSid` = bd.`billSid`
         <where>
             ${ew.sqlSegment}
         </where>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -2341,7 +2341,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 );
         String collectionSmallMoney = query.getCollectionSmallMoney();
         String collectionBigMoney = query.getCollectionBigMoney();
+        if (StringUtils.isNotBlank(collectionSmallMoney) && StringUtils.isNotBlank(collectionBigMoney)){
             qw.between("fcc.balance",collectionSmallMoney,collectionBigMoney);
+        }
+        if (StringUtils.isNotBlank(query.getName())){
+            qw.and(wrapper -> wrapper.like("fcc.billNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("fcc.staffName", query.getName()).or().like("fcc.payerName", query.getName()).or().like("bd.draweeMobile", query.getName()));
+        }
         IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
         IPage<FinCollectionConfirmationJYDDKYDJVo> pagging = baseMapper.jyddkydjListPage(page, qw);
         List<FinCollectionConfirmationJYDDKYDJVo> records = pagging.getRecords();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.java

@@ -56,7 +56,7 @@ public interface FinFundsCarriedForwardApplyMapper extends BaseMapper<FinFundsCa
 	//@Update("update fin_funds_carried_forward_apply set name=#{msg} where id=#{id}")
 	//IPage<FinFundsCarriedForwardApplyVo> voPage(IPage<FinFundsCarriedForwardApply> page, @Param(Constants.WRAPPER) QueryWrapper<FinFundsCarriedForwardApply> qw);
 	
-	IPage<FinFundsCarriedForwardApplyVo> selectPageVo(IPage<FinFundsCarriedForwardApply> page, @Param(Constants.WRAPPER) Wrapper<FinFundsCarriedForwardApply> qw);
+	IPage<FinFundsCarriedForwardApplyVo> selectPageVo(IPage<FinFundsCarriedForwardApply> page, @Param(Constants.WRAPPER) Wrapper<FinFundsCarriedForwardApply> qw,@Param("jzSmallMoney") String jzSmallMoney,@Param("jzBigMoney") String jzBigMoney);
 	
 	List<FinFundsCarriedForwardApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinFundsCarriedForwardApply> qw);
 	

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml

@@ -3,11 +3,34 @@
 <mapper namespace="com.yxt.anrui.fin.biz.finfundscarriedforwardapply.FinFundsCarriedForwardApplyMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo">
-		SELECT * FROM fin_funds_carried_forward_apply <where> ${ew.sqlSegment} </where>
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo">
+        SELECT fa.sid,
+        fa.nodeState,
+        fa.procDefId,
+        fa.procInstSid,
+        fa.`applyDeptName`,
+        fa.`createByName`,
+        fa.`createTime`,
+        fa.`source`,
+        SUM(fv.`thisUseMoney`) AS carryForwardMoney,
+        fa.`remarks`
+        FROM fin_funds_carried_forward_apply fa
+        LEFT JOIN fin_funds_carried_forward_veh fv
+        ON fa.`sid` = fv.`mainSid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        <if test="jzSmallMoney != null and jzSmallMoney != '' and jzBigMoney != null and jzBigMoney != ''">
+            HAVING carryForwardMoney BETWEEN #{jzSmallMoney} AND #{jzBigMoney}
+        </if>
     </select>
 
-	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo">
-		SELECT * FROM fin_funds_carried_forward_apply <where> ${ew.sqlSegment} </where>
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo">
+        SELECT * FROM fin_funds_carried_forward_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>

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(款项结转申请) <br/>
@@ -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<FinFundsCarriedForwardApplyDetailsVo> init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) {
+		return finFundsCarriedForwardApplyService.init(finFundsCarriedForwardApplyInitQuery);
+	}
 }

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,18 +71,74 @@ import java.util.List;
  */
 @Service
 public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFundsCarriedForwardApplyMapper, FinFundsCarriedForwardApply> {
-	private QueryWrapper<FinFundsCarriedForwardApply> createQueryWrapper(FinFundsCarriedForwardApplyQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<FinFundsCarriedForwardApply> qw = new QueryWrapper<>();
-		return qw;
-	}
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private FinCollectionConfirmationService finCollectionConfirmationService;
+    @Autowired
+    private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService;
 
     public PagerVo<FinFundsCarriedForwardApplyVo> listPageVo(PagerQuery<FinFundsCarriedForwardApplyQuery> pq) {
         FinFundsCarriedForwardApplyQuery query = pq.getParams();
-		QueryWrapper<FinFundsCarriedForwardApply> qw = createQueryWrapper(query);
+        QueryWrapper<FinFundsCarriedForwardApply> 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<String> 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<FinFundsCarriedForwardApplyVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<FinFundsCarriedForwardApplyVo> 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<FinFundsCarriedForwardApply> page = PagerUtil.queryToPage(pq);
-		IPage<FinFundsCarriedForwardApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        IPage<FinFundsCarriedForwardApplyVo> pagging = baseMapper.selectPageVo(page, qw, query.getJzSmallMoney(), query.getJzBigMoney());
         PagerVo<FinFundsCarriedForwardApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -107,4 +174,50 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
+
+    public ResultBean<FinFundsCarriedForwardApplyDetailsVo> init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> busSids = finFundsCarriedForwardApplyInitQuery.getBusSids();
+        List<FinFundsCarriedForwardVehDetailsVo> 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);
+    }
 }

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<FinFundsCarr
 	
 	@Select("select * from fin_funds_carried_forward_veh")
 	List<FinFundsCarriedForwardVehVo> selectListVo();
+
+    String fetchDJSumMoneyByBusSid(String busSid);
+
+	String fetchSKSumMoneyByBusSid(String busSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml

@@ -4,10 +4,37 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehVo">
-		SELECT * FROM fin_funds_carried_forward_veh <where> ${ew.sqlSegment} </where>
+        SELECT * FROM fin_funds_carried_forward_veh
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
-	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehVo">
-		SELECT * FROM fin_funds_carried_forward_veh <where> ${ew.sqlSegment} </where>
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehVo">
+        SELECT * FROM fin_funds_carried_forward_veh
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="fetchDJSumMoneyByBusSid" resultType="java.lang.String">
+        SELECT SUM(fv.thisUseMoney) AS thisUseMoney
+        FROM fin_funds_carried_forward_veh fv
+                     LEFT JOIN fin_funds_carried_forward_apply fa
+                ON fv.`mainSid` = fa.`sid`
+                     LEFT JOIN fin_collection_confirmation fc
+                ON fv.`busSid` = fc.`sid`
+        WHERE fa.`nodeState` != "待提交" AND fa.`nodeState` != "终止"
+    </select>
+
+    <select id="fetchSKSumMoneyByBusSid" resultType="java.lang.String">
+        SELECT SUM(fv.thisUseMoney) AS thisUseMoney
+        FROM fin_funds_carried_forward_veh fv
+                     LEFT JOIN fin_funds_carried_forward_apply fa
+                ON fv.`mainSid` = fa.`sid`
+                     LEFT JOIN fin_selected_receivables_detailed fd
+                ON fv.`busSid` = fd.`sid`
+        WHERE fa.`nodeState` != "待提交" AND fa.`nodeState` != "终止"
     </select>
 </mapper>

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<String> fetchDJSumMoneyByBusSid(String busSid) {
+		ResultBean rb = ResultBean.fireFail();
+		String sumMoney = finFundsCarriedForwardVehService.fetchDJSumMoneyByBusSid(busSid);
+		return rb.success().setData(sumMoney);
+	}
+
+	@Override
+	public ResultBean<String> fetchSKSumMoneyByBusSid(String busSid) {
+		ResultBean rb = ResultBean.fireFail();
+		String sumMoney = finFundsCarriedForwardVehService.fetchSKSumMoneyByBusSid(busSid);
+		return rb.success().setData(sumMoney);
+	}
+
 }

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<FinFund
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public String fetchDJSumMoneyByBusSid(String busSid) {
+		return baseMapper.fetchDJSumMoneyByBusSid(busSid);
+	}
+
+	public String fetchSKSumMoneyByBusSid(String busSid) {
+		return baseMapper.fetchSKSumMoneyByBusSid(busSid);
+	}
 }

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

@@ -323,8 +323,10 @@
     <select id="noOutVehRecPageList"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo">
         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

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

@@ -523,7 +523,12 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         }
         String balanceSmallMoney = query.getBalanceSmallMoney();
         String balanceBigMoney = query.getBalanceBigMoney();
-        //TODO 缺少可用余额查询条件
+        if (StringUtils.isNotBlank(balanceSmallMoney) && StringUtils.isNotBlank(balanceBigMoney)) {
+            qw.between("ferd.balance", balanceSmallMoney, balanceBigMoney);
+        }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> 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<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pagerQuery);
         IPage<FinSelectReceivablesDetailedWCKCLRKVo> pagging = baseMapper.noOutVehRecPageList(page, qw);
         for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) {