Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -87,7 +87,7 @@ public interface FinCollectionConfirmationFeign {
 
     @ApiOperation("出纳驳回")
     @PostMapping("/cashierReject")
-    public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery);
+    public ResultBean cashierReject(@Valid FinCollectionRejectQuery finCollectionRejectQuery);
 
     @ApiOperation("生成收款单pdf")
     @PostMapping("/createPdf")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java

@@ -69,4 +69,8 @@ public class FinCollectionConfirmationQuery implements Query {
 
     @ApiModelProperty("当前组织机构分公司sid全路径")
     private String orgPath;
+
+    private String payerName;
+
+    private String auditState;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java

@@ -3,6 +3,8 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Author dimengzhe
  * @Date 2023/1/9 13:48
@@ -13,6 +15,7 @@ public class FinCollectionRejectQuery {
     @ApiModelProperty("款项确认sid")
     private String sid;
     @ApiModelProperty("驳回原因")
+    @NotBlank(message = "驳回原因不能为空")
     private String reason;
     @ApiModelProperty("当前登录人用户sid")
     private String userSid;

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

@@ -203,6 +203,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (StringUtils.isNotBlank(query.getSubscriptionState())) {
             qw.eq("paymentState", query.getSubscriptionState());
         }
+        if(StringUtils.isNotBlank(query.getPayerName())){
+            qw.like("payerName",query.getPayerName());
+        }
         //0是申请管理的，1是出纳款项管理
         if (StringUtils.isNotBlank(query.getState())) {
             if ("0".equals(query.getState())) {
@@ -210,6 +213,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                /* if (StringUtils.isNotBlank(query.getCreateBySid())) {
                     qw.eq("createBySid", query.getCreateBySid());
                 }*/
+            }else{
+                if(StringUtils.isNotBlank(query.getAuditState())){
+                    qw.eq("auditState",query.getAuditState());
+                }
             }
         }
         return qw;
@@ -342,7 +349,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
 
             BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
             if (subscriptionMoneyAll.compareTo(new BigDecimal(dto.getCollectionMoney())) != 0) {
-                return rb.setMsg("认款不完全，提交失败");
+                return rb.setMsg("认款总额与收款金额不符");
             }
             List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
             List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
@@ -1012,7 +1019,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 return rb.setMsg("认款金额不允许超过收款金额");
             }
             if (subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney()) != 0) {
-                return rb.setMsg("认款不完全，不允许提交");
+                return rb.setMsg("认款总额与收款金额不符");
             }
         }
         //再次认款
@@ -1260,6 +1267,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
             finSelectedReceivablesDetailed.setAuditState(2);
             finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
+            BigDecimal subscriptionMoney = new BigDecimal(v.getSubscriptionMoney());
+            FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
+            BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney();
+            String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney));
+            finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, finUncollectedReceivablesDetailed.getSid());
         });
         confirmation.setAuditState(2);
         //更新驳回原因