Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -3543,14 +3543,14 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.eq("bv.createOrgSid", query.getOrgSid());
             if ("1".equals(query.getIsSales())) {
                 qw.isNotNull("bv.salesDate");
+            } else if ("0".equals(query.getIsSales())) {
+                qw.isNull("bv.salesDate");
+            }
             if ("1".equals(query.getIsSettle())) {
                 qw.eq("vs.finState", 1);
             } else if ("0".equals(query.getIsSettle())) {
                 qw.eq("vs.finState", 0);
             }
-            } else if ("0".equals(query.getIsSales())) {
-                qw.isNull("bv.salesDate");
-            }
             if (StringUtils.isNotBlank(query.getVinNo())) {
                 qw.like("bv.vinNo", query.getVinNo());
             }

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

@@ -1,12 +1,13 @@
 package com.yxt.anrui.fin.api.finpaymentapply;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -42,6 +43,10 @@ public class AppFinPaymentApplyVo implements Vo {
     @ApiModelProperty("车辆金额合计")
     private String carTotal;
 
+    private List<FinPaymentapplyEveDetailsVo> eveList = new ArrayList<>();
+    private List<FinPaymentapplyTrailerDetailsVo> trailerList = new ArrayList<>();
+    private List<FinPaymentapplyTopDetailsVo> topList = new ArrayList<>();
+
     private String createBySid;
     private String taskId;
     private String procInstId;

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpaymentapply;
 
-
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
@@ -35,23 +34,9 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: anrui-fin(财务) <br/>
- * File: FinPaymentapplyVo.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo <br/>
- * Description: fin_paymentapply 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-23 13:45:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "fin_paymentapply 视图数据详情", description = "fin_paymentapply 视图数据详情")
 public class FinPaymentapplyDetailsVo implements Vo {

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

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

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

@@ -32,19 +32,6 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 
-/**
- * Project: anrui-fin(平仓) <br/>
- * File: FinPaymentapplyDetailsBelowEveFeignFallback.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeignFallback <br/>
- * Description: 付款申请明细-明细-平仓. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-13 10:03:07 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Component
 public class FinPaymentapplyDetailsBelowEveFeignFallback implements FinPaymentapplyDetailsBelowEveFeign {
 
@@ -55,7 +42,7 @@ public class FinPaymentapplyDetailsBelowEveFeignFallback implements FinPaymentap
 	}
 
 	@Override
-	public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> chooseEve(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
+	public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> chooseEve(PagerQuery<FinPaymentapplyDetailsBelowEveListQuery> pq) {
 		return null;
 	}
 

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

@@ -0,0 +1,39 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "付款申请明细-明细-平仓 查询条件", description = "付款申请明细-明细-平仓 查询条件")
+public class FinPaymentapplyDetailsBelowEveListQuery implements Query {
+
+    private String payCompanySid;
+    private String useOrgSid;
+}

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve;
 
-
 import com.yxt.common.core.query.Query;
 
 import io.swagger.annotations.ApiModel;
@@ -34,19 +33,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: anrui-fin(平仓) <br/>
- * File: FinPaymentapplyDetailsBelowEveQuery.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery <br/>
- * Description: 付款申请明细-明细-平仓 查询条件. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-13 10:03:07 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "付款申请明细-明细-平仓 查询条件", description = "付款申请明细-明细-平仓 查询条件")
 public class FinPaymentapplyDetailsBelowEveQuery implements Query {

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

@@ -30,22 +30,8 @@ import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.math.BigDecimal;
 
-/**
- * Project: anrui-fin(付款申请平仓) <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")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDetailsVo.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpaymentapplytop;
 
-
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -34,19 +33,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: anrui-fin(付款申请) <br/>
- * File: FinPaymentapplyTopVo.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopVo <br/>
- * Description: 付款申请上装 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-14 10:55:50 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "付款申请上装 视图数据详情", description = "付款申请上装 视图数据详情")
 public class FinPaymentapplyTopDetailsVo implements Vo {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDetailsVo.java

@@ -25,28 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpaymentapplytrailer;
 
-
 import com.yxt.common.core.vo.Vo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: anrui-fin(付款申请) <br/>
- * File: FinPaymentapplyTrailerVo.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerVo <br/>
- * Description: 付款申请挂车 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-14 10:55:50 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "付款申请挂车 视图数据详情", description = "付款申请挂车 视图数据详情")
 public class FinPaymentapplyTrailerDetailsVo implements Vo {

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

@@ -699,7 +699,11 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                         //备注
                         finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
                         //本次付款说明
+                        if (StringUtils.isNotBlank(finPaymentapplyDetailVo.getRemarks())){
                             finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailVo.getActualPay() + "/" + finPaymentapplyDetailVo.getRemarks());
+                        }else {
+                            finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailVo.getActualPay());
+                        }
                         finPaymentrecordService.saveDto(finPaymentrecordDto);
                         List<FinPaymentapplyDetailsBelowDetailsVo> finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid());
                         for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) {
@@ -729,7 +733,11 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                             //备注
                             finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
                             //本次付款说明
+                            if (StringUtils.isNotBlank(finPaymentapplyDetailsBelowDetailsVo.getRemarks())){
                                 finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailsBelowDetailsVo.getRemarks());
+                            }else {
+                                finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany());
+                            }
                             finPaymentrecordService.saveDto(finPaymentrecordDto);
                         }
                     }
@@ -764,7 +772,11 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                         //备注
                         finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
                         //本次付款说明
+                        if (StringUtils.isNotBlank(finPaymentapplyEveDetailsVo.getRemarks())){
                             finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyEveDetailsVo.getRemarks());
+                        }else {
+                            finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany());
+                        }
                         finPaymentrecordService.saveDto(finPaymentrecordDto);
                     }
                 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java

@@ -33,6 +33,7 @@ import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
 import org.apache.ibatis.annotations.Update;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -46,4 +47,6 @@ public interface FinPaymentapplyDetailsBelowMapper extends BaseMapper<FinPayment
 
     @Update("update fin_paymentapply_details_below set openDate = #{openDate} where sid = #{sid}")
     void updateOpenDate(@Param("sid") String sid, @Param("openDate") String openDate);
+
+    BigDecimal fetchBzj(String applySid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml

@@ -23,4 +23,15 @@
         WHERE db.costTitleKey = '015'
           AND a.useOrgSid = #{useOrgSid}
     </select>
+
+    <select id="fetchBzj" resultType="java.math.BigDecimal">
+        SELECT
+            fb.payAccount
+        FROM
+            fin_paymentapply_details_below fb
+                LEFT JOIN fin_paymentapply_details fd
+                          ON fb.detailSid = fb.sid
+        WHERE fd.applySid = #{applySid}
+          AND fb.costTitleKey = '015'
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java

@@ -31,6 +31,8 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsB
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto;
 import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -55,4 +57,8 @@ public class FinPaymentapplyDetailsBelowService extends MybatisBaseService<FinPa
     public void updateOpenDate(String sid, String openDate) {
         baseMapper.updateOpenDate(sid, openDate);
     }
+
+    public BigDecimal fetchBzj(String applySid) {
+        return baseMapper.fetchBzj(applySid);
+    }
 }

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

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve;
 
+import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -32,11 +33,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign;
 
 @Api(tags = "付款申请明细-明细-平仓")
 @RestController
@@ -56,7 +52,7 @@ public class FinPaymentapplyDetailsBelowEveRest implements FinPaymentapplyDetail
     }
 
     @Override
-    public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> chooseEve(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
+    public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> chooseEve(PagerQuery<FinPaymentapplyDetailsBelowEveListQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<FinPaymentapplyDetailsBelowEveVo> pv = finPaymentapplyDetailsBelowEveService.chooseEve(pq);
         return rb.success().setData(pv);

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

@@ -28,6 +28,7 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.*;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import org.apache.commons.lang3.StringUtils;
@@ -36,11 +37,6 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -131,39 +127,13 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<Fi
         return p;
     }
 
-    public PagerVo<FinPaymentapplyDetailsBelowEveVo> chooseEve(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
-        FinPaymentapplyDetailsBelowEveQuery query = pq.getParams();
+    public PagerVo<FinPaymentapplyDetailsBelowEveVo> chooseEve(PagerQuery<FinPaymentapplyDetailsBelowEveListQuery> pq) {
+        FinPaymentapplyDetailsBelowEveListQuery query = pq.getParams();
         QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = new QueryWrapper<>();
         qw.eq("fe.useOrgSid", query.getUseOrgSid());
-        if (StringUtils.isNotBlank(query.getPayCompany())) {
+        /*if (StringUtils.isNotBlank(query.getPayCompany())) {
             qw.like("fe.payCompany", query.getPayCompany());
-        }
-        if (StringUtils.isNotBlank(query.getCostTitleValue())) {
-            qw.like("fe.costTitleValue", query.getCostTitleValue());
-        }
-        if (StringUtils.isNotBlank(query.getReceiveCompany())) {
-            qw.like("fe.receiveCompany", query.getReceiveCompany());
-        }
-        if (StringUtils.isNotBlank(query.getPeriod())) {
-            qw.like("fe.period", query.getPeriod());
-        }
-        if (StringUtils.isNotBlank(query.getRemarks())) {
-            qw.like("fe.remarks", query.getRemarks());
-        }
-        if (StringUtils.isNotBlank(query.getPayCompany())) {
-            qw.like("fe.payCompany", query.getPayCompany());
-        }
-        if (StringUtils.isNotBlank(query.getState())) {
-            qw.eq("fe.state", query.getState());
-        }
-        //融资付款开通日期
-        qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (fe.openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (fe.openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')"
-                );
-        //平仓付款日期
-        qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"
-                );
+        }*/
         qw.orderByDesc("fe.createTime");
         IPage<FinPaymentapplyDetailsBelowEve> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentapplyDetailsBelowEveVo> pagging = baseMapper.selectPageVo(page, qw);

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

@@ -32,6 +32,7 @@ import org.apache.ibatis.annotations.Mapper;
 import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve;
 import org.apache.ibatis.annotations.Select;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Mapper
@@ -42,4 +43,7 @@ public interface FinPaymentapplyEveMapper extends BaseMapper<FinPaymentapplyEve>
 
     @Select("select * from fin_paymentapply_eve where applySid = #{mainSid}")
     List<FinPaymentapplyEveDetailsVo> fetchByMainSid(String sid);
+
+    @Select("SELECT SUM(exePayPrice) FROM fin_paymentapply_eve WHERE applySid = #{applySid}")
+    BigDecimal fetchExePriceByMainSid(String applySid);
 }

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

@@ -33,6 +33,7 @@ import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto;
 
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Service
@@ -51,4 +52,8 @@ public class FinPaymentapplyEveService extends MybatisBaseService<FinPaymentappl
     public List<FinPaymentapplyEveDetailsVo> fetchByMainSid(String sid) {
         return baseMapper.fetchByMainSid(sid);
     }
+
+    public BigDecimal fetchExePriceByMainSid(String applySid) {
+        return baseMapper.fetchExePriceByMainSid(applySid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -54,6 +54,7 @@ import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
+import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
@@ -64,6 +65,7 @@ import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
+import com.yxt.anrui.fin.biz.finpaymentapplyeve.FinPaymentapplyEveService;
 import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
 import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService;
 import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
@@ -186,7 +188,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     @Autowired
     private VoucherService voucherService;
     @Autowired
-    private SysMappingFeign sysMappingFeign;
+    private FinPaymentapplyEveService finPaymentapplyEveService;
     @Autowired
     private DictCommonFeign dictCommonFeign;
     @Autowired
@@ -1692,16 +1694,18 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             voucherResultDetailDtos.add(voucherResultDetailDtoDf);
         } else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())) {//平仓款
             //查询平仓总付款金额
-            FinPaymentapplyDetailsBelowEve finPaymentapplyDetailsBelowEve = finPaymentapplyDetailsBelowEveService.fetchBySid(finPaymentrecord.getBusSid());
-            BigDecimal exePayPriceTotal = finPaymentapplyDetailsBelowEveService.selExePayByMainSid(finPaymentapplyDetailsBelowEve.getDetailSid());
+            FinPaymentapplyEve finPaymentapplyEve = finPaymentapplyEveService.fetchBySid(finPaymentrecord.getBusSid());
+            BigDecimal exePayPriceTotal = finPaymentapplyEveService.fetchExePriceByMainSid(finPaymentapplyEve.getApplySid());
             //查询保证金
-            FinPaymentapplyDetailsBelow finPaymentapplyDetailsBelow = finPaymentapplyDetailsBelowService.fetchBySid(finPaymentapplyDetailsBelowEve.getDetailSid());
-            BigDecimal payAccount = finPaymentapplyDetailsBelow.getPayAccount();
+            BigDecimal bzj = finPaymentapplyDetailsBelowService.fetchBzj(finPaymentapplyEve.getApplySid());
+            if (bzj == null){
+                bzj = BigDecimal.ZERO;
+            }
             //查询已付款平仓款金额
             BigDecimal payPriceTotal = baseMapper.selPayPrice(finPaymentrecord.getApplySid());
             if (payPriceTotal.compareTo(exePayPriceTotal) == -1) {
                 //借方
-                voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+                voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
                 voucherResultDetailDtoJF.setSubjectNo("1009.03");
                 SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
                 voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
@@ -1710,29 +1714,29 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoJF);
                 //贷方
-                voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+                voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
                 voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount());
                 voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
             } else {
                 //借方
-                voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+                voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
                 voucherResultDetailDtoJF.setSubjectNo("2111");
                 SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
                 voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
                 String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank(),"bank").getData();
                 voucherResultDetailDtoJF.setBank(key);
-                voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(payAccount).toString());
+                voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(bzj).toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoJF);
                 //贷方1
-                voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+                voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
                 voucherResultDetailDtoDf.setSubjectNo("1009.03");
                 voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
                 voucherResultDetailDtoDf.setBank(key);
-                voucherResultDetailDtoDf.setCredit(payPriceTotal.add(payAccount).subtract(finPaymentrecord.getCost()).toString());
+                voucherResultDetailDtoDf.setCredit(payPriceTotal.add(bzj).subtract(finPaymentrecord.getCost()).toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
                 //贷方2
-                voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+                voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
                 voucherResultDetailDtoDf2.setBankAccount(finPaymentrecord.getPayBankAccount());
                 voucherResultDetailDtoDf2.setCredit(finPaymentrecord.getCost().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf2);

yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapply.java

@@ -28,26 +28,12 @@ package com.yxt.anrui.as.api.asbwinvoiceapply;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.math.BigDecimal;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-as(保外工单) <br/>
- * File: AsBwinvoiceapply.java <br/>
- * Class: com.yxt.anrui.as.api.asbwinvoiceapply.AsBwinvoiceapply <br/>
- * Description: 保外工单开票申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-06-17 13:42:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "保外工单开票申请", description = "保外工单开票申请")
 @TableName("as_bwinvoiceapply")
@@ -78,7 +64,7 @@ public class AsBwinvoiceapply extends BaseEntity {
     private String useOrgSid; // 分公司sid
     @ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("办结日期")
     private Date finishTime; // 办结日期
     @ApiModelProperty("实例id")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapplyVo.java

@@ -25,32 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asbwinvoiceapply;
 
-
 import com.yxt.common.core.vo.Vo;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-as(保外工单) <br/>
- * File: AsBwinvoiceapplyVo.java <br/>
- * Class: com.yxt.anrui.as.api.asbwinvoiceapply.AsBwinvoiceapplyVo <br/>
- * Description: 保外工单开票申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-06-17 13:42:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "保外工单开票申请 视图数据对象", description = "保外工单开票申请 视图数据对象")
 public class AsBwinvoiceapplyVo implements Vo {
@@ -73,6 +56,8 @@ public class AsBwinvoiceapplyVo implements Vo {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("办结日期")
     private Date finishTime;
+    @ApiModelProperty("开票单位名称")
+    private String purchaseSystemName;
     @ApiModelProperty("开票名称")
     private String invoiceTitle;
     @ApiModelProperty("开票类型value")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -1686,9 +1686,6 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     public PagerVo<AsBusrepairBwBillPageListVo> bwBillPageList(PagerQuery<AsBusrepairBwBillPageListQuery> pagerQuery) {
         AsBusrepairBwBillPageListQuery query = pagerQuery.getParams();
         QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
-        String deptSid = query.getDeptSid();
-        SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
-        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
         if (query.getSids() != null) {
             if (query.getSids().size() > 0) {
                 qw.notIn("a.sid", query.getSids());
@@ -1713,7 +1710,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         qw.apply(StringUtils.isNotBlank(query.getSettleTimeStart()), "date_format (a.settleTime,'%Y-%m-%d') >= date_format('" + query.getSettleTimeStart() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getSettleTimeEnd()), "date_format (a.settleTime,'%Y-%m-%d') <= date_format('" + query.getSettleTimeEnd() + "','%Y-%m-%d')"
                 );
-        qw.eq("a.useOrgSid", useOrgSid);
+        qw.eq("a.deptSid", query.getDeptSid());
         qw.eq("a.subject", "保外");
         qw.gt("a.nodeCode", 5);
         IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);