From bf8f34752cc7584193d490cd6c1fe5850d31a269 Mon Sep 17 00:00:00 2001
From: yanghb <yangbhwork@163.com>
Date: 星期三, 07 五月 2025 16:27:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementBatch/AssetExportResponse.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementBatch/AssetExportResponse.java b/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementBatch/AssetExportResponse.java
index 5790bd0..ddd7ea2 100644
--- a/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementBatch/AssetExportResponse.java
+++ b/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementBatch/AssetExportResponse.java
@@ -1,5 +1,6 @@
package com.ruoyi.bussiness.object.response.placementBatch;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.easyExcel.BigDecimalConverter;
import com.ruoyi.common.easyExcel.DateConverter;
@@ -30,9 +31,17 @@
@ApiModelProperty(value = "户主姓名")
private String householdHead;
+ @ExcelIgnore
+ @ApiModelProperty(value = "户主未通过安置申请提示(1未通过)")
+ private Integer householdHeadWarn;
+
@ExcelProperty(value = "身份证号", index = 4, converter = StringConverter.class)
@ApiModelProperty(value = "身份证号")
private String idCard;
+
+ @ExcelIgnore
+ @ApiModelProperty(value = "身份证不存在安置库")
+ private Integer idCardWarn;
@ExcelProperty(value = "应安置人数(人)", index = 5, converter = NumberConverter.class)
@ApiModelProperty(value = "应安置人数(人)")
@@ -50,20 +59,43 @@
@ApiModelProperty(value = "补偿单价标准-二手住房")
private String priceOldAmount;
+ @ExcelIgnore
+ @ApiModelProperty(value = "多个购房情况警告（新建房和二手住房都录入了）")
+ private Integer twoPriceWarn;
+
+ @ExcelIgnore
+ @ApiModelProperty(value = "补偿标准数据异常（不等于补偿协议里面写的）")
+ private Integer priceAmountWarn;
+
@ExcelProperty(value = "补偿总价(万元)", index = 9, converter = BigDecimalConverter.class)
@ApiModelProperty(value = "补偿总价(万元)")
private BigDecimal compensationAmount;
+
+ @ExcelIgnore
+ @ApiModelProperty(value = "补偿总价异常")
+ private Integer compensationSumWarn;
@ExcelProperty(value = "25%首付款(万元)", index = 10, converter = BigDecimalConverter.class)
@ApiModelProperty(value = "25%首付款(万元)")
private BigDecimal downPaymentAmount;
+ @ExcelIgnore
+ @ApiModelProperty(value = "首付款警告")
+ private Integer downPaymentAmountWarn;
+
@ExcelProperty(value = "每季度需支付款项(万元)", index = 11, converter = BigDecimalConverter.class)
@ApiModelProperty(value = "每季度需支付款项(万元)")
private BigDecimal quarterPayAmount;
+
+ @ExcelIgnore
+ @ApiModelProperty(value = "每季度需支付款警告")
+ private Integer quarterPayAmountWarn;
@ExcelProperty(value = "过渡补贴(万元)", index = 12, converter = BigDecimalConverter.class)
@ApiModelProperty(value = "过渡补贴(万元)")
private BigDecimal subsidyAmount;
+ @ExcelIgnore
+ @ApiModelProperty(value = "过渡补贴警告")
+ private Integer subsidyAmountWarn;
}
--
Gitblit v1.7.1