更改

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java

@@ -27,6 +27,8 @@ package com.yxt.anrui.fin.api.finpaymentapply;
 
 
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
 import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
@@ -84,12 +86,14 @@ public class FinPaymentapplyDetailsVo implements Vo {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    private List<FinPaymentapplyEveDetailsVo> eveList = new ArrayList<>();
+
     private List<FinPaymentapplyDetailVo> detailsList = new ArrayList<>();
 
     private List<FinPaymentapplyVehicleVo> vehicleList = new ArrayList<>();
 
-    private List<FinPaymentapplyTrailerDetailsVo> trailerList;
+    private List<FinPaymentapplyTrailerDetailsVo> trailerList = new ArrayList<>();
-    private List<FinPaymentapplyTopDetailsVo> topList;
+    private List<FinPaymentapplyTopDetailsVo> topList = new ArrayList<>();
 
     private String isVeh;
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.fin.api.finpaymentapply;
 
 
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
 import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
@@ -36,6 +37,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -77,12 +79,14 @@ public class FinPaymentapplyDto implements Dto {
     @ApiModelProperty(value = "业务关联:编号")
     private String busSid;
 
-    private List<FinPaymentapplyDetailDto> detailsList;
+    private List<FinPaymentapplyEveDto> eveList = new ArrayList<>();
 
-    private List<FinPaymentapplyVehicleDto> vehicleList;
+    private List<FinPaymentapplyDetailDto> detailsList = new ArrayList<>();
 
-    private List<FinPaymentapplyTrailerDto> trailerList;
+    private List<FinPaymentapplyVehicleDto> vehicleList = new ArrayList<>();
-    private List<FinPaymentapplyTopDto> topList;
+
+    private List<FinPaymentapplyTrailerDto> trailerList = new ArrayList<>();
+    private List<FinPaymentapplyTopDto> topList = new ArrayList<>();
 
     @ApiModelProperty("是否涉及车辆，1是，0否")
     @NotBlank(message = "请选择是否涉及车辆")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java

@@ -67,6 +67,10 @@ public class FinPaymentapplyDetailsBelowEve extends BaseEntity {
     private String exePayDate;
     @ApiModelProperty("平仓付款金额")
     private BigDecimal exePayPrice;
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String deptName;
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
     @ApiModelProperty("分公司名称")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java

@@ -61,26 +61,34 @@ public class FinPaymentapplyDetailsBelowEveDetailsVo implements Vo {
     private String costTypeKey;
     @ApiModelProperty("款项类别")
     private String costTypeValue;
-	@ApiModelProperty("付款申请明细的明细sid")
+    @ApiModelProperty("付款申请明细的明细sid")
     private String detailSid; // 付款申请明细的明细sid
-	@ApiModelProperty("融资付款开通日期")
+    @ApiModelProperty("融资付款开通日期")
     private String openDate; // 融资付款开通日期
-	@ApiModelProperty("期数")
+    @ApiModelProperty("期数")
     private String period; // 期数
-	@ApiModelProperty("付款单位sid")
+    @ApiModelProperty("付款单位sid")
     private String payCompanySid; // 付款单位sid
-	@ApiModelProperty("付款单位名称")
+    @ApiModelProperty("付款单位名称")
     private String payCompany; // 付款单位名称
-	@ApiModelProperty("收款单位名称")
+    @ApiModelProperty("收款单位名称")
     private String receiveCompany; // 收款单位名称
-	@ApiModelProperty("收款单位sid")
+    @ApiModelProperty("收款单位sid")
     private String receiveCompanySid; // 收款单位sid
-	@ApiModelProperty("收款银行账号")
+    @ApiModelProperty("收款银行账号")
     private String receivingAccount; // 收款银行账号
-	@ApiModelProperty("开户行")
+    @ApiModelProperty("开户行")
     private String bank; // 开户行
     @ApiModelProperty("平仓付款日期")
     private String exePayDate;
     @ApiModelProperty("平仓付款金额")
     private BigDecimal exePayPrice;
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String deptName;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java

@@ -85,6 +85,10 @@ public class FinPaymentapplyDetailsBelowEveDto implements Dto {
     private String exePayDate;
     @ApiModelProperty("平仓付款金额")
     private BigDecimal exePayPrice;
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String deptName;
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
     @ApiModelProperty("分公司名称")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java

@@ -61,6 +61,11 @@ public interface FinPaymentapplyDetailsBelowEveFeign {
     @ResponseBody
     public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> listPage(@RequestBody PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq);
 
+    @ApiOperation("选择平仓信息")
+    @PostMapping("/chooseEve")
+    @ResponseBody
+    public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> chooseEve(@RequestBody PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq);
+
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java

@@ -54,6 +54,11 @@ public class FinPaymentapplyDetailsBelowEveFeignFallback implements FinPaymentap
 		return rb.setMsg("接口anrui-fin/finpaymentapplydetailsbeloweve/listPage无法访问");
 	}
 
+	@Override
+	public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> chooseEve(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean save(FinPaymentapplyDetailsBelowEveDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentapplydetailsbeloweve/save无法访问");

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplyeve;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请平仓) <br/>
+ * File: FinPaymentapplyEve.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve <br/>
+ * Description: 付款申请-平仓. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-20 11:20:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请-平仓", description = "付款申请-平仓")
+@TableName("fin_paymentapply_eve")
+public class FinPaymentapplyEve extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+    @ApiModelProperty("平仓款名称")
+    private String costTitleValue; // 平仓款名称
+    @ApiModelProperty("融资付款开通日期")
+    private String openDate; // 融资付款开通日期
+    @ApiModelProperty("期数")
+    private String period; // 期数
+    @ApiModelProperty("付款方式Key")
+    private String payWayKey; // 付款方式Key
+    @ApiModelProperty("付款方式Value")
+    private String payWayValue; // 付款方式Value
+    @ApiModelProperty("收款单位名称")
+    private String receiveCompany; // 收款单位名称
+    @ApiModelProperty("收款银行账号")
+    private String receivingAccount; // 收款银行账号
+    @ApiModelProperty("开户行")
+    private String bank; // 开户行
+    @ApiModelProperty("平仓付款金额")
+    private BigDecimal exePayPrice; // 平仓付款金额
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplyeve;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请平仓) <br/>
+ * File: FinPaymentapplyEveVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveVo <br/>
+ * Description: 付款申请-平仓 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-20 11:20:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请-平仓 视图数据详情", description = "付款申请-平仓 视图数据详情")
+public class FinPaymentapplyEveDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+    @ApiModelProperty("平仓款名称")
+    private String costTitleValue; // 平仓款名称
+    @ApiModelProperty("融资付款开通日期")
+    private String openDate; // 融资付款开通日期
+    @ApiModelProperty("期数")
+    private String period; // 期数
+    @ApiModelProperty("付款方式Key")
+    private String payWayKey; // 付款方式Key
+    @ApiModelProperty("付款方式Value")
+    private String payWayValue; // 付款方式Value
+    @ApiModelProperty("收款单位名称")
+    private String receiveCompany; // 收款单位名称
+    @ApiModelProperty("收款银行账号")
+    private String receivingAccount; // 收款银行账号
+    @ApiModelProperty("开户行")
+    private String bank; // 开户行
+    @ApiModelProperty("平仓付款金额")
+    private BigDecimal exePayPrice; // 平仓付款金额
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplyeve;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请平仓) <br/>
+ * File: FinPaymentapplyEveDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto <br/>
+ * Description: 付款申请-平仓 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-20 11:20:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请-平仓 数据传输对象", description = "付款申请-平仓 数据传输对象")
+public class FinPaymentapplyEveDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+    @ApiModelProperty("平仓款名称")
+    private String costTitleValue; // 平仓款名称
+    @ApiModelProperty("融资付款开通日期")
+    private String openDate; // 融资付款开通日期
+    @ApiModelProperty("期数")
+    private String period; // 期数
+    @ApiModelProperty("付款方式Key")
+    private String payWayKey; // 付款方式Key
+    @ApiModelProperty("付款方式Value")
+    private String payWayValue; // 付款方式Value
+    @ApiModelProperty("收款单位名称")
+    private String receiveCompany; // 收款单位名称
+    @ApiModelProperty("收款银行账号")
+    private String receivingAccount; // 收款银行账号
+    @ApiModelProperty("开户行")
+    private String bank; // 开户行
+    @ApiModelProperty("平仓付款金额")
+    private BigDecimal exePayPrice; // 平仓付款金额
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveFeign.java

@@ -0,0 +1,41 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplyeve;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "付款申请-平仓")
+@FeignClient(
+        contextId = "anrui-fin-FinPaymentapplyEve",
+        name = "anrui-fin",
+        path = "v1/finpaymentapplyeve")
+public interface FinPaymentapplyEveFeign {
+
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java

@@ -75,7 +75,7 @@ public class FinPaymentapplyRest implements FinPaymentapplyFeign {
 
     @Override
     public ResultBean delBySids(String[] sids) {
-       return finPaymentapplyService.deleteAllBySid(sids);
+        return finPaymentapplyService.deleteAllBySid(sids);
     }
 
     @Override

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -48,6 +48,8 @@ import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
 import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
@@ -61,6 +63,7 @@ import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
+import com.yxt.anrui.fin.biz.finpaymentapplyeve.FinPaymentapplyEveService;
 import com.yxt.anrui.fin.biz.finpaymentapplytop.FinPaymentapplyTopService;
 import com.yxt.anrui.fin.biz.finpaymentapplytrailer.FinPaymentapplyTrailerService;
 import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
@@ -140,6 +143,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
     @Autowired
     private FinPaymentapplyDetailsService finPaymentapplyDetailsService;
     @Autowired
+    private FinPaymentapplyEveService finPaymentapplyEveService;
+    @Autowired
     private FinPaymentapplyVehicleService finPaymentapplyVehicleService;
     @Autowired
     private FinPaymentapplyDetailsBelowService finPaymentapplyDetailsBelowService;
@@ -272,10 +277,18 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             finPaymentapply.setUseOrgName(organizationVo.getName());
             List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
             if (detailsList != null && detailsList.size() > 0) {
-                String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
+                String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(),finPaymentapply);
                 finPaymentapply.setPaymentTotal(new BigDecimal(i));
             }
 
+            if ("004".equals(dto.getCostTypeKey())){//融资付款
+                List<FinPaymentapplyEveDto> eveList = dto.getEveList();
+                for (FinPaymentapplyEveDto finPaymentapplyEveDto : eveList) {
+                    finPaymentapplyEveDto.setApplySid(finPaymentapply.getSid());
+                    finPaymentapplyEveService.insertByDto(finPaymentapplyEveDto);
+                }
+            }
+
             if ("1".equals(dto.getIsVeh())) {
                 List<FinPaymentapplyVehicleDto> vehicleDtoList = dto.getVehicleList();
                 if (vehicleDtoList != null && vehicleDtoList.size() > 0) {
@@ -313,7 +326,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
 
             List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
             if (detailsList != null && detailsList.size() > 0) {
-                String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
+                String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(),finPaymentapply);
                 finPaymentapply.setPaymentTotal(new BigDecimal(i));
             }
 
@@ -329,6 +342,15 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
 
             finPaymentapplyTrailerService.delByMainSid(dtoSid);
             finPaymentapplyTopService.delByMainSid(dtoSid);
+            finPaymentapplyEveService.delByMainSid(dtoSid);
+
+            if ("004".equals(dto.getCostTypeKey())){//融资付款
+                List<FinPaymentapplyEveDto> eveList = dto.getEveList();
+                for (FinPaymentapplyEveDto finPaymentapplyEveDto : eveList) {
+                    finPaymentapplyEveDto.setApplySid(dtoSid);
+                    finPaymentapplyEveService.insertByDto(finPaymentapplyEveDto);
+                }
+            }
 
             if ("002".equals(dto.getCostTypeKey())){//挂车采购
                 List<FinPaymentapplyTrailerDto> trailerList = dto.getTrailerList();
@@ -384,8 +406,10 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(sid);
         vo.setDetailsList(detailsList);
         vo.setVehicleList(vehicleList);
+        List<FinPaymentapplyEveDetailsVo> finPaymentapplyEveDetailsVos = finPaymentapplyEveService.fetchByMainSid(sid);
         List<FinPaymentapplyTrailerDetailsVo> finPaymentapplyTrailerDetailsVos = finPaymentapplyTrailerService.fetchByMainSid(sid);
         List<FinPaymentapplyTopDetailsVo> finPaymentapplyTopDetailsVos = finPaymentapplyTopService.fetchByMainSid(sid);
+        vo.setEveList(finPaymentapplyEveDetailsVos);
         vo.setTrailerList(finPaymentapplyTrailerDetailsVos);
         vo.setTopList(finPaymentapplyTopDetailsVos);
         return vo;
@@ -636,8 +660,6 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 FinCompanyInvoicing finCompanyInvoicing = finCompanyInvoicingService.fetchBySid(finPaymentapply.getPayCompanySid());
                 finPaymentrecordDto.setPurchaseSystemSid(finCompanyInvoicing.getPurchaseSystemSid());
                 finPaymentrecordDto.setPurchaseSystemName(finCompanyInvoicing.getPurchaseSystemName());
-                //备注
-                finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
                 List<FinPaymentapplyDetailVo> detailVoList = vo.getDetailsList();
                 detailVoList.removeAll(Collections.singleton(null));
                 if (!detailVoList.isEmpty()) {
@@ -670,6 +692,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                             finPaymentrecordDto.setCost(finPaymentapplyDetailVo.getPayAccount());
                             finPaymentrecordDto.setAccountsReceive(finPaymentapplyDetailVo.getPayAccount());
                         }
+                        //备注
+                        finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
                         finPaymentrecordService.saveDto(finPaymentrecordDto);
                         List<FinPaymentapplyDetailsBelowDetailsVo> finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid());
                         for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) {
@@ -695,6 +719,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                                 finPaymentrecordDto.setCost(finPaymentapplyDetailsBelowDetailsVo.getPayAccount().toString());
                                 finPaymentrecordDto.setAccountsReceive(finPaymentapplyDetailsBelowDetailsVo.getPayAccount().toString());
                             }
+                            //备注
+                            finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
                             finPaymentrecordService.saveDto(finPaymentrecordDto);
                         }
                     }
@@ -986,6 +1012,9 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         for (String s : sidsList) {
             finPaymentapplyDetailsService.deleteByApplySid(s);
             finPaymentapplyVehicleService.deleteVehicle(s);
+            finPaymentapplyEveService.delByMainSid(s);
+            finPaymentapplyTopService.delByMainSid(s);
+            finPaymentapplyTrailerService.delByMainSid(s);
         }
         return rb.success().setMsg("删除成功");
     }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.fin.biz.finpaymentapplydetails;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
@@ -33,7 +34,7 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService<FinPayment
         return baseMapper.getDetailsList(sid);
     }
 
-    public String saveDetailsList(List<FinPaymentapplyDetailDto> detailsList, String sid) {
+    public String saveDetailsList(List<FinPaymentapplyDetailDto> detailsList, String sid, FinPaymentapply finPaymentapply) {
         //删除
         baseMapper.deleteDetail(sid);
         BigDecimal bigDecimal = new BigDecimal("0");
@@ -55,6 +56,11 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService<FinPayment
                 String belowSid = finPaymentapplyDetailsBelowService.insertByDto(finPaymentapplyDetailsBelowDto);
                 List<FinPaymentapplyDetailsBelowEveDto> finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDto.getFinPaymentapplyDetailsBelowEveList();
                 for (FinPaymentapplyDetailsBelowEveDto finPaymentapplyDetailsBelowEveDto : finPaymentapplyDetailsBelowEveList) {
+                    finPaymentapplyDetailsBelowEveDto.setCreateBySid(finPaymentapply.getCreateBySid());
+                    finPaymentapplyDetailsBelowEveDto.setDeptSid(finPaymentapply.getDeptSid());
+                    finPaymentapplyDetailsBelowEveDto.setDeptName(finPaymentapply.getDeptName());
+                    finPaymentapplyDetailsBelowEveDto.setUseOrgSid(finPaymentapply.getUseOrgSid());
+                    finPaymentapplyDetailsBelowEveDto.setUseOrgName(finPaymentapply.getUseOrgName());
                     finPaymentapplyDetailsBelowEveDto.setDetailSid(belowSid);
                     finPaymentapplyDetailsBelowEveDto.setCostTypeKey("004");
                     finPaymentapplyDetailsBelowEveDto.setCostTypeValue("融资付款");

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java

@@ -54,8 +54,8 @@ import java.util.List;
 @Mapper
 public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper<FinPaymentapplyDetailsBelowEve> {
 
-	IPage<FinPaymentapplyDetailsBelowEveVo> selectPageVo(IPage<FinPaymentapplyDetailsBelowEve> page, @Param(Constants.WRAPPER) Wrapper<FinPaymentapplyDetailsBelowEve> qw);
+    IPage<FinPaymentapplyDetailsBelowEveVo> selectPageVo(IPage<FinPaymentapplyDetailsBelowEve> page, @Param(Constants.WRAPPER) Wrapper<FinPaymentapplyDetailsBelowEve> qw);
 
-	@Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}")
+    @Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}")
     List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml

@@ -4,9 +4,8 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo">
-		SELECT * FROM fin_paymentapply_details_below_eve
+		SELECT * FROM fin_paymentapply_details_below_eve fe
-		<!--LEFT JOIN anrui_portal.sys_organization as s ON ab.deptSid = s.sid-->
+		LEFT JOIN anrui_portal.sys_organization as s ON fe.useOrgSid = s.sid
 		<where> ${ew.sqlSegment} </where>
-		ORDER BY createTime DESC
 	</select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java

@@ -72,6 +72,13 @@ public class FinPaymentapplyDetailsBelowEveRest implements FinPaymentapplyDetail
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> chooseEve(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<FinPaymentapplyDetailsBelowEveVo> pv = finPaymentapplyDetailsBelowEveService.chooseEve(pq);
+        return rb.success().setData(pv);
+    }
+
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java

@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo;
+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 org.apache.commons.lang3.StringUtils;
@@ -67,78 +68,122 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<Fi
 
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     public PagerVo<FinPaymentapplyDetailsBelowEveVo> listPageVo(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
         FinPaymentapplyDetailsBelowEveQuery query = pq.getParams();
         QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = new QueryWrapper<>();
         //========================================数据授权开始
-		/*if (StringUtils.isNotBlank(query.getMenuUrl())) {
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
-			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-			privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setOrgPath(query.getOrgPath());
-			privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
-			privilegeQuery.setUserSid(query.getUserSid());
+            privilegeQuery.setUserSid(query.getUserSid());
-			ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-			if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-				//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-				String orgSidPath = query.getOrgPath();
+                String orgSidPath = query.getOrgPath();
-				orgSidPath = orgSidPath + "/";
+                orgSidPath = orgSidPath + "/";
-				int i1 = orgSidPath.indexOf("/");
+                int i1 = orgSidPath.indexOf("/");
-				int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
-				int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
-				int i4 = orgSidPath.indexOf("/", i3 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
-				String orgLevelKey = defaultIdReltBean.getData();
+                String orgLevelKey = defaultIdReltBean.getData();
-				if ("1".equals(orgLevelKey)) {
+                if ("1".equals(orgLevelKey)) {
-					orgSidPath = orgSidPath.substring(0, i1);
+                    orgSidPath = orgSidPath.substring(0, i1);
-					qw.like("fp.orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
-				} else if ("2".equals(orgLevelKey)) {
+                } else if ("2".equals(orgLevelKey)) {
-					orgSidPath = orgSidPath.substring(0, i2);
+                    orgSidPath = orgSidPath.substring(0, i2);
-					qw.like("fp.orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
-				} else if ("3".equals(orgLevelKey)) {
+                } else if ("3".equals(orgLevelKey)) {
-					orgSidPath = orgSidPath.substring(0, i3);
+                    orgSidPath = orgSidPath.substring(0, i3);
-					qw.like("fp.orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
-				} else if ("4".equals(orgLevelKey)) {
+                } else if ("4".equals(orgLevelKey)) {
-					orgSidPath = orgSidPath.substring(0, i4);
+                    orgSidPath = orgSidPath.substring(0, i4);
-					qw.like("fp.orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
-				} else if ("5".equals(orgLevelKey)) {
+                } else if ("5".equals(orgLevelKey)) {
-					qw.eq("fp.createBySid", query.getUserSid());
+                    qw.eq("fe.createBySid", query.getUserSid());
-				} else {
+                } else {
-					PagerVo<FinPaymentapplyDetailsBelowEveVo> p = new PagerVo<>();
+                    PagerVo<FinPaymentapplyDetailsBelowEveVo> p = new PagerVo<>();
-					return p;
+                    return p;
-				}
+                }
-			} else {
+            } else {
-				PagerVo<FinPaymentapplyDetailsBelowEveVo> p = new PagerVo<>();
+                PagerVo<FinPaymentapplyDetailsBelowEveVo> p = new PagerVo<>();
-				return p;
+                return p;
-			}
+            }
-		}*/
+        }
+        if (StringUtils.isNotBlank(query.getPayCompany())) {
+            qw.like("fe.payCompany", query.getPayCompany());
+        }
+        if (StringUtils.isNotBlank(query.getCostTitleValue())) {
+            qw.like("fe.costTitleValue", query.getCostTitleValue());
+        }
+        if (StringUtils.isNotBlank(query.getReceiveCompany())) {
+            qw.like("fe.receiveCompany", query.getReceiveCompany());
+        }
+        if (StringUtils.isNotBlank(query.getPeriod())) {
+            qw.like("fe.period", query.getPeriod());
+        }
+        if (StringUtils.isNotBlank(query.getRemarks())) {
+            qw.like("fe.remarks", query.getRemarks());
+        }
+        if (StringUtils.isNotBlank(query.getPayCompany())) {
+            qw.like("fe.payCompany", query.getPayCompany());
+        }
+        if (StringUtils.isNotBlank(query.getState())) {
+            qw.eq("fe.state", query.getState());
+        }
+        //融资付款开通日期
+        qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (fe.openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (fe.openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')"
+                );
+        //平仓付款日期
+        qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"
+                );
+        qw.orderByDesc("fe.createTime");
+        IPage<FinPaymentapplyDetailsBelowEve> page = PagerUtil.queryToPage(pq);
+        IPage<FinPaymentapplyDetailsBelowEveVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<FinPaymentapplyDetailsBelowEveVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public PagerVo<FinPaymentapplyDetailsBelowEveVo> chooseEve(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
+        FinPaymentapplyDetailsBelowEveQuery query = pq.getParams();
+        QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = new QueryWrapper<>();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+        qw.eq("fe.useOrgSid", useOrgSid);
         if (StringUtils.isNotBlank(query.getPayCompany())) {
-            qw.like("payCompany", query.getPayCompany());
+            qw.like("fe.payCompany", query.getPayCompany());
         }
         if (StringUtils.isNotBlank(query.getCostTitleValue())) {
-            qw.like("costTitleValue", query.getCostTitleValue());
+            qw.like("fe.costTitleValue", query.getCostTitleValue());
         }
         if (StringUtils.isNotBlank(query.getReceiveCompany())) {
-            qw.like("receiveCompany", query.getReceiveCompany());
+            qw.like("fe.receiveCompany", query.getReceiveCompany());
         }
         if (StringUtils.isNotBlank(query.getPeriod())) {
-            qw.like("period", query.getPeriod());
+            qw.like("fe.period", query.getPeriod());
         }
         if (StringUtils.isNotBlank(query.getRemarks())) {
-            qw.eq("remarks", query.getRemarks());
+            qw.like("fe.remarks", query.getRemarks());
         }
         if (StringUtils.isNotBlank(query.getPayCompany())) {
-            qw.like("fp.payCompany", query.getPayCompany());
+            qw.like("fe.payCompany", query.getPayCompany());
         }
         if (StringUtils.isNotBlank(query.getState())) {
-            qw.eq("fp.state", query.getState());
+            qw.eq("fe.state", query.getState());
         }
         //融资付款开通日期
-        qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')").
+        qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (fe.openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')"
+                apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (fe.openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')"
                 );
         //平仓付款日期
-        qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')").
+        qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"
+                apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"
                 );
+        qw.orderByDesc("fe.createTime");
         IPage<FinPaymentapplyDetailsBelowEve> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentapplyDetailsBelowEveVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<FinPaymentapplyDetailsBelowEveVo> p = PagerUtil.pageToVo(pagging, null);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java

@@ -0,0 +1,45 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplyeve;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface FinPaymentapplyEveMapper extends BaseMapper<FinPaymentapplyEve> {
+
+	@Delete("delete from fin_paymentapply_eve where applySid = #{dtoSid}")
+	void delByMainSid(String dtoSid);
+
+	@Select("select * from fin_paymentapply_eve where applySid = #{mainSid}")
+	List<FinPaymentapplyEveDetailsVo> fetchByMainSid(String sid);
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.fin.biz.finpaymentapplyeve.FinPaymentapplyEveMapper">
+
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveRest.java

@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplyeve;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveFeign;
+
+@Api(tags = "付款申请-平仓")
+@RestController
+@RequestMapping("v1/finpaymentapplyeve")
+public class FinPaymentapplyEveRest implements FinPaymentapplyEveFeign {
+
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java

@@ -0,0 +1,54 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplyeve;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class FinPaymentapplyEveService extends MybatisBaseService<FinPaymentapplyEveMapper, FinPaymentapplyEve> {
+
+    public void insertByDto(FinPaymentapplyEveDto dto) {
+        FinPaymentapplyEve entity = new FinPaymentapplyEve();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void delByMainSid(String dtoSid) {
+        baseMapper.delByMainSid(dtoSid);
+    }
+
+    public List<FinPaymentapplyEveDetailsVo> fetchByMainSid(String sid) {
+        return baseMapper.fetchByMainSid(sid);
+    }
+}