Merge remote-tracking branch 'origin/master'

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

@@ -48,6 +48,7 @@ import lombok.Data;
 @Data
 public class FinCollectionConfirmationVo implements Vo {
 
+    private static final long serialVersionUID = 6561005289102689912L;
     @ApiModelProperty("收款确认单sid")
     private String sid; // 收款确认单sid
 	@ApiModelProperty("收款日期")
@@ -68,4 +69,10 @@ public class FinCollectionConfirmationVo implements Vo {
     private Integer auditState; // 审核状态
     @ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）")
     private Integer subscriptionState; // 审核状态
+
+    @ApiModelProperty("是否允许认款")
+    private boolean showHandle;
+
+    @ApiModelProperty("余额")
+    private String balance;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java

@@ -27,14 +27,11 @@ package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinUncollectedReceivablesDetailedVo.java <br/>
@@ -71,4 +68,7 @@ public class DetailsOfReceivablesAndUncollectedItemsVo implements Vo {
     private String receivablesName; // 应收项目名称
 	@ApiModelProperty("当前应收金额")
     private String currentReceivableMoney; // 当前应收金额
+
+    @ApiModelProperty("应收金额")
+    private String reveivableMoney;
 }

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

@@ -141,6 +141,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 if (StringUtils.isNotBlank(query.getCreateBySid())) {
                     qw.eq("createBySid", query.getCreateBySid());
                 }
+            }else{
+                qw.ne("auditState",0);
             }
         }
         return qw;
@@ -173,8 +175,26 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         QueryWrapper<FinCollectionConfirmation> qw = createQueryWrapper(query);
         IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
         IPage<FinCollectionConfirmationVo> pagging = baseMapper.selectPageVo(page, qw);
-       /* List<FinCollectionConfirmationVo> records = pagging.getRecords();
+        List<FinCollectionConfirmationVo> records = pagging.getRecords();
         for (FinCollectionConfirmationVo record : records) {
+            //是否有余额
+            if(StringUtils.isNotBlank(record.getBalance())){
+                //余额是0
+                if(new BigDecimal(record.getBalance()).compareTo(BigDecimal.ZERO) == 0){
+                    record.setShowHandle(false);
+                }else{
+                    //是否是待审核状态或已驳回状态
+                    if(record.getAuditState() == 1 || record.getAuditState() == 2){
+                        record.setShowHandle(false);
+                    }else{
+                        record.setShowHandle(true);
+                    }
+                }
+            }else{
+                record.setShowHandle(false);
+            }
+        }
+       /* for (FinCollectionConfirmationVo record : records) {
             String s = "";
             BigDecimal subscriptionMoney = new BigDecimal(0);
             String sid = record.getSid();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java

@@ -64,7 +64,7 @@ public class PaymentApplyVo implements Vo {
     @JsonProperty("procInsId")
     private String procInstId;
 
-    @ApiModelProperty("品牌sid")
+    @ApiModelProperty("品牌")
     private String brand;
 
 }