财务 应收管理 应收应付功能修改

src/main/java/com/ydtech/modules/inv/model/excel/InvSettlementSourceExcel.java

@@ -37,7 +37,7 @@ public class InvSettlementSourceExcel implements Serializable {
     /**
      * 签单日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy年MM月dd日")
     @ExcelProperty("签单日期")
     private String signDate;
 
@@ -141,7 +141,7 @@ public class InvSettlementSourceExcel implements Serializable {
     /**
      * 代理结算时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy年MM月dd日")
     @ExcelProperty("代理结算时间")
     private String agencySettlementTime;
 }

src/main/java/com/ydtech/modules/inv/model/excel/InvSourceExcel.java

@@ -59,13 +59,13 @@ public class InvSourceExcel implements Serializable {
     /**
      * 交强保费(含税)
      */
-    @ExcelProperty(value = "交强保费")
+    @ExcelProperty(value = "交强险保费")
     private String jqPremiumTax;
 
     /**
      * 交强保费(不含税)
      */
-    @ExcelProperty(value = "交强保费不含税")
+    @ExcelProperty(value = "交强险保费不含税")
     private String jqPremium;
 
     /**
@@ -77,13 +77,13 @@ public class InvSourceExcel implements Serializable {
     /**
      * 商业保费(含税)
      */
-    @ExcelProperty("商业保费")
+    @ExcelProperty("商业险保费")
     private String syPremiumTax;
 
     /**
      * 商业保费(不含税)
      */
-    @ExcelProperty("商业保费不含税")
+    @ExcelProperty("商业险保费不含税")
     private String syPremium;
 
     /**
@@ -101,7 +101,7 @@ public class InvSourceExcel implements Serializable {
     /**
      * 非车保费(不含税)
      */
-    @ExcelProperty("非车保费不含税")
+    @ExcelProperty("非车险保费不含税")
     private String nonCarPremium;
 
     /**
@@ -120,14 +120,14 @@ public class InvSourceExcel implements Serializable {
      * 出单日期
      */
     @ExcelProperty(value = "出单日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy年MM月dd日")
     private String signingTime;
 
     /**
      * 结算日期
      */
     @ExcelProperty(value = "结算日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy年MM月dd日")
     private String  clearingTime;
 
     /**

src/main/java/com/ydtech/modules/inv/model/po/InvSource.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.inv.model.po;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ContentFontStyle;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
@@ -28,6 +29,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode
 @HeadFontStyle(fontHeightInPoints = 10)
+@ExcelIgnoreUnannotated
 public class InvSource implements Serializable {
 
 
@@ -92,16 +94,16 @@ public class InvSource implements Serializable {
      * 交强保费(含税)
      */
     @TableField(value = "jq_premium_tax")
-    @ApiModelProperty("交强保费(含税)")
-    @ExcelProperty("交强保费(含税)")
+    @ApiModelProperty("交强险保费")
+    @ExcelProperty("交强险保费")
     private BigDecimal jqPremiumTax;
 
     /**
      * 交强保费(不含税)
      */
     @TableField(value = "jq_premium")
-    @ApiModelProperty("交强保费(不含税)")
-    @ExcelProperty("交强保费(不含税)")
+    @ApiModelProperty("交强险保费不含税")
+    @ExcelProperty("交强险保费不含税")
     private BigDecimal jqPremium;
 
     /**
@@ -116,16 +118,16 @@ public class InvSource implements Serializable {
      * 商业保费(含税)
      */
     @TableField(value = "sy_premium_tax")
-    @ApiModelProperty("商业保费(含税)")
-    @ExcelProperty("商业保费(含税)")
+    @ApiModelProperty("商业险保费")
+    @ExcelProperty("商业险保费")
     private BigDecimal syPremiumTax;
 
     /**
      * 商业保费(不含税)
      */
     @TableField(value = "sy_premium")
-    @ApiModelProperty("商业保费(不含税)")
-    @ExcelProperty("商业保费(不含税)")
+    @ApiModelProperty("商业险保费不含税")
+    @ExcelProperty("商业险保费不含税")
     private BigDecimal syPremium;
 
     /**
@@ -139,25 +141,25 @@ public class InvSource implements Serializable {
     /**
      * 非车保费(含税)
      */
-    @ApiModelProperty("非车保单号")
+    @ApiModelProperty("非车保费")
     @TableField(value = "non_car_premium_tax")
-    @ExcelProperty("非车保费(含税)")
+    @ExcelProperty("非车保费")
     private BigDecimal nonCarPremiumTax;
 
     /**
      * 非车保费(不含税)
      */
     @TableField(value = "non_car_premium")
-    @ApiModelProperty("非车保费(不含税)")
-    @ExcelProperty("非车保费(不含税)")
+    @ApiModelProperty("非车险保费不含税")
+    @ExcelProperty("非车险保费不含税")
     private BigDecimal nonCarPremium;
 
     /**
      * 被保险人名字
      */
     @TableField(value = "insured_name")
-    @ApiModelProperty("被保险人名字")
-    @ExcelProperty("被保险人名字")
+    @ApiModelProperty("被保险人")
+    @ExcelProperty("被保险人")
     private String insuredName;
 
     /**
@@ -314,24 +316,24 @@ public class InvSource implements Serializable {
      * 最大交强应付比例
      */
     @TableField(value = "max_sy_receivable_ratio")
-    @ApiModelProperty("最大交强应付比例")
-    @ExcelProperty("最大交强应付比例")
+    @ApiModelProperty("最大商业应付比例")
+    @ExcelProperty("最大商业应付比例")
     private BigDecimal maxSyReceivableRatio;
 
     /**
      * 最大交强应付比例
      */
     @TableField(value = "max_non_car_receivable_ratio")
-    @ApiModelProperty("最大交强应付比例")
-    @ExcelProperty("最大交强应付比例")
+    @ApiModelProperty("最大非车应付比例")
+    @ExcelProperty("最大非车应付比例")
     private BigDecimal maxNonCarReceivableRatio;
 
     /**
      * 最大应收金额
      */
     @TableField(value = "max_receivable")
-    @ApiModelProperty("最大应收金额")
-    @ExcelProperty("最大应收金额")
+    @ApiModelProperty("最大应付金额")
+    @ExcelProperty("最大应付金额")
     private BigDecimal maxReceivable;
 
     /**

src/main/java/com/ydtech/modules/inv/model/vo/InvSourceQueryVo.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.inv.model.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -283,6 +284,10 @@ public class InvSourceQueryVo extends PageRequest implements Serializable {
     @ApiModelProperty("结算状态 （0 已认领 (未结) 1已认领（结算） 2未认领 3Singleton）")
     private String clearingState;
 
+    @TableField(value = "insurance_clearing_state")
+    @ApiModelProperty("保司结算状态")
+    private String insuranceClearingState;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/ydtech/modules/inv/model/vo/ReceivableAndSettlementVo.java

@@ -50,96 +50,96 @@ public class ReceivableAndSettlementVo {
     @ExcelProperty(value = "部门id")
     private String insuranceDeptId; // 保险部门ID
 
-    @ApiModelProperty(value = "保险部门")
-    @ExcelProperty(value = "保险部门")
-    private String insuranceDept; // 保险部门
+    @ApiModelProperty(value = "保司结构")
+    @ExcelProperty(value = "保司结构")
+    private String insuranceDept; // 保司结构
 
-    @ApiModelProperty(value = "保险类型")
-    @ExcelProperty(value = "保险类型")
+    @ApiModelProperty(value = "险种")
+    @ExcelProperty(value = "险种")
     private String insuranceType; // 保险类型
 
-    @ApiModelProperty(value = "业务所有者")
-    @ExcelProperty(value = "业务所有者")
+    @ApiModelProperty(value = "业务归属")
+    @ExcelProperty(value = "业务归属")
     private String businessOwner; // 业务所有者
 
     @ApiModelProperty(value = "交强保单号")
     @ExcelProperty(value = "交强保单号")
     private String jqPolicyId;
 
-    @ApiModelProperty(value = "交强险税额")
-    @ExcelProperty(value = "交强险税额")
-    private String jqPremiumTax; // 交强险税额
-
     @ApiModelProperty(value = "交强险保费")
     @ExcelProperty(value = "交强险保费")
+    private String jqPremiumTax; // 交强险税额
+
+    @ApiModelProperty(value = "交强险保费不含税")
+    @ExcelProperty(value = "交强险保费不含税")
     private String jqPremium; // 交强险保费
 
     @ApiModelProperty(value = "商业保单号")
     @ExcelProperty(value = "商业保单号")
     private String syPolicyId;
 
-    @ApiModelProperty(value = "商业险税额")
-    @ExcelProperty(value = "商业险税额")
-    private String syPremiumTax; // 商业险税额
-
     @ApiModelProperty(value = "商业险保费")
     @ExcelProperty(value = "商业险保费")
+    private String syPremiumTax; // 商业险税额
+
+    @ApiModelProperty(value = "商业险保费不含税")
+    @ExcelProperty(value = "商业险保费不含税")
     private String syPremium; // 商业险保费
 
     @ApiModelProperty(value = "非车保单号")
     @ExcelProperty(value = "非车保单号")
     private String nonCarPolicyId;
 
-    @ApiModelProperty(value = "非车险税额")
-    @ExcelProperty(value = "非车险税额")
-    private String nonCarPremiumTax; // 非车险税额
-
     @ApiModelProperty(value = "非车险保费")
     @ExcelProperty(value = "非车险保费")
+    private String nonCarPremiumTax; // 非车险税额
+
+    @ApiModelProperty(value = "非车险保费不含税")
+    @ExcelProperty(value = "非车险保费不含税")
     private String nonCarPremium; // 非车险保费
 
     @ApiModelProperty(value = "代理结算时间")
     @ExcelProperty(value = "代理结算时间")
     private String agencySettlementTime; // 代理结算时间
 
-    @ApiModelProperty(value = "税额")
-    @ExcelProperty(value = "税额")
+    @ApiModelProperty(value = "车船税")
+    @ExcelProperty(value = "车船税")
     private String taxAmount; // 税额
 
     @ApiModelProperty(value = "交强险应收比例")
     @ExcelProperty(value = "交强险应收比例")
     private String jqReceivableRatio; // 交强险应收比例
 
-    @ApiModelProperty(value = "交强险保费比例")
-    @ExcelProperty(value = "交强险保费比例")
+    @ApiModelProperty(value = "交强险手续费比例")
+    @ExcelProperty(value = "交强险手续费比例")
     private String jqPremiumRatio; // 交强险保费比例
 
-    @ApiModelProperty(value = "交强险非复制比例")
-    @ExcelProperty(value = "交强险非复制比例")
+    @ApiModelProperty(value = "交强险非跟单比例")
+    @ExcelProperty(value = "交强险非跟单比例")
     private String jqNonCopyingRatio; // 交强险非复制比例
 
     @ApiModelProperty(value = "商业险应收比例")
     @ExcelProperty(value = "商业险应收比例")
     private String syReceivableRatio; // 商业险应收比例
 
-    @ApiModelProperty(value = "商业险保费比例")
-    @ExcelProperty(value = "商业险保费比例")
+    @ApiModelProperty(value = "商业险手续费比例")
+    @ExcelProperty(value = "商业险手续费比例")
     private String syPremiumRatio; // 商业险保费比例
 
-    @ApiModelProperty(value = "商业险非复制比例")
-    @ExcelProperty(value = "商业险非复制比例")
+    @ApiModelProperty(value = "商业险非跟单比例")
+    @ExcelProperty(value = "商业险非跟单比例")
     private String syNonCopyingRatio; // 商业险非复制比例
 
     @ApiModelProperty(value = "非车险应收比例")
     @ExcelProperty(value = "非车险应收比例")
     private String nonCarReceivableRatio; // 非车险应收比例
 
-    @ApiModelProperty(value = "非车险保费比例")
-    @ExcelProperty(value = "非车险保费比例")
+    @ApiModelProperty(value = "非车险手续费比例")
+    @ExcelProperty(value = "非车险手续费比例")
     private String nonCarPremiumRatio; // 非车险保费比例
 
-    @ApiModelProperty(value = "非车险非复制比例")
-    @ExcelProperty(value = "非车险非复制比例")
+    @ApiModelProperty(value = "非车险非跟单比例")
+    @ExcelProperty(value = "非车险非跟单比例")
     private String nonCarNonCopyingRatio; // 非车险非复制比例
 
     @ApiModelProperty(value = "手续费金额")
@@ -162,18 +162,30 @@ public class ReceivableAndSettlementVo {
     @ExcelProperty(value = "补贴金额")
     private String subsidyAmount; // 补贴金额
 
-    @ApiModelProperty(value = "最大交强险应收比例")
-    @ExcelProperty(value = "最大交强险应收比例")
+    @ApiModelProperty(value = "最大交强险应付比例")
+    @ExcelProperty(value = "最大交强险应付比例")
     private String maxJqReceivableRatio; // 最大交强险应收比例
 
-    @ApiModelProperty(value = "最大商业险应收比例")
-    @ExcelProperty(value = "最大商业险应收比例")
+    @ApiModelProperty(value = "最大商业险应付比例")
+    @ExcelProperty(value = "最大商业险应付比例")
     private String maxSyReceivableRatio; // 最大商业险应收比例
 
-    @ApiModelProperty(value = "最大非车险应收比例")
-    @ExcelProperty(value = "最大非车险应收比例")
+    @ApiModelProperty(value = "最大非车险应付比例")
+    @ExcelProperty(value = "最大非车险应付比例")
     private String maxNonCarReceivableRatio; // 最大非车险应收比例
 
+    @ApiModelProperty(value = "最大应付金额")
+    @ExcelProperty(value = "最大应付金额")
+    private String maxReceivable; // 最大应付金额
+
+    @ApiModelProperty(value = "总应收金额")
+    @ExcelProperty(value = "总应收金额")
+    private String totalReceivableAmount;
+
+    @ApiModelProperty(value = "结算金额")
+    @ExcelProperty(value = "结算金额")
+    private String settlementAmount;
+
     @ApiModelProperty(value = "结算状态")
     @ExcelProperty(value = "结算状态")
     private String clearingState; // 结算状态

src/main/java/com/ydtech/modules/inv/service/impl/InvReceivableServiceImpl.java

@@ -388,7 +388,32 @@ public class InvReceivableServiceImpl implements InvReceivableService {
             String[] split = invSourceQueryVo.getSigningTime().split(",");
             queryWrapper.between(InvSource::getSigningTime,split[0],split[1]);
         }
+        if(invSourceQueryVo.getClearingState() != null && !"".equals(invSourceQueryVo.getClearingState()))
+        {
+            queryWrapper.eq(InvSource::getClearingState,invSourceQueryVo.getClearingState());
+        }
+        if(invSourceQueryVo.getInsuranceClearingState() != null && !"".equals(invSourceQueryVo.getInsuranceClearingState()))
+        {
+            queryWrapper.eq(InvSource::getInsuranceClearingState,invSourceQueryVo.getInsuranceClearingState());
+        }
         Page pageData = invSourceMapper.selectPage(page, queryWrapper);
+        List<InvSource> records = pageData.getRecords();
+        records.forEach(x->{
+            if("0".equals(x.getClearingState())){
+                x.setClearingState("未结算");
+            }else if("1".equals(x.getClearingState()))
+            {
+                x.setClearingState("已结算");
+            }
+
+            if("0".equals(x.getInsuranceClearingState())){
+                x.setInsuranceClearingState("未结算");
+            }else if("1".equals(x.getInsuranceClearingState()))
+            {
+                x.setInsuranceClearingState("已结算");
+            }
+        });
+        pageData.setRecords(records);
         return pageData;
     }
 
@@ -425,6 +450,21 @@ public class InvReceivableServiceImpl implements InvReceivableService {
             queryWrapper.between(InvSource::getSigningTime,split[0],split[1]);
         }
         List<InvSource> pageData = invSourceMapper.selectList(queryWrapper);
+        pageData.forEach(x->{
+            if("0".equals(x.getClearingState())){
+                x.setClearingState("未结算");
+            }else if("1".equals(x.getClearingState()))
+            {
+                x.setClearingState("已结算");
+            }
+
+            if("0".equals(x.getInsuranceClearingState())){
+                x.setInsuranceClearingState("未结算");
+            }else if("1".equals(x.getInsuranceClearingState()))
+            {
+                x.setInsuranceClearingState("已结算");
+            }
+        });
         return pageData;
     }
 

src/main/java/com/ydtech/modules/inv/utils/excel/InvSettlementSourceDataListener.java

@@ -9,6 +9,8 @@ import com.ydtech.modules.inv.model.excel.InvSourceExcel;
 import java.lang.reflect.Field;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,7 +50,9 @@ public class InvSettlementSourceDataListener implements ReadListener<InvSettleme
                             field.set(data,"0");
                         }else {
                             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-                            LocalDate o = LocalDate.parse(field.get(data).toString(), DateTimeFormatter.ISO_DATE);
+                            DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy年MM月d日");
+                            String dateString = field.get(data).toString().replaceAll("(\\D)(\\d)(\\D)", "$10$2$3");
+                            LocalDate o = LocalDate.parse(dateString,formatter1);
                             field.set(data, formatter.format(o));
                         }
                     }else{

src/main/java/com/ydtech/modules/inv/utils/excel/InvSourceDataListener.java

@@ -50,7 +50,9 @@ public class InvSourceDataListener implements ReadListener<InvSourceExcel> {
                             field.set(data,"0");
                         }else{
                             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-                            LocalDate o = LocalDate.parse(field.get(data).toString(),DateTimeFormatter.ISO_DATE);
+                            DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy年MM月d日");
+                            String dateString = field.get(data).toString().replaceAll("(\\D)(\\d)(\\D)", "$10$2$3");
+                            LocalDate o = LocalDate.parse(dateString,formatter1);
                             field.set(data,formatter.format(o));
                         }
 

src/main/resources/mapper/modules/inv/InvReceivableMapper.xml

@@ -218,6 +218,9 @@
             ivs.max_jq_receivable_ratio,
             ivs.max_sy_receivable_ratio,
             ivs.max_non_car_receivable_ratio,
+            ivs.max_receivable,
+            ivs.total_receivable_amount,
+            iss.settlement_amount,
             (CASE ivs.clearing_state
             WHEN 1 THEN '已结算'
             WHEN 0 THEN '未结算'