fix：【实体类】同步Excel字段

ruoyi-api/src/main/java/com/ruoyi/api/domain/WwkjCustomerInfo.java

@@ -67,14 +67,26 @@ public class WwkjCustomerInfo extends BaseEntity {
     @Excel(name = "客户类型")
     private String customerType;
 
+    /** 减免水量：与用户性质关联的水量减免，减免XX吨 */
+    @Excel(name = "减免水量")
+    private String deductMeter;
+
     /** 水价信息 */
     @Excel(name = "水价信息")
     private String waterPrice;
 
+    /** 基础水价 */
+    @Excel(name = "基础水价")
+    private String basePrice;
+
     /** 户主(法人) */
     @Excel(name = "户主(法人)")
     private String houseHolder;
 
+    /** 是否欠费 */
+    @Excel(name = "是否欠费")
+    private String arrearStatus;
+
     /** 客户状态：0:正常;1:销户;2:停用;3:空房;4:临时用水 */
     @Excel(name = "客户状态：0:正常;1:销户;2:停用;3:空房;4:临时用水")
     private String accountStatus;
@@ -108,6 +120,14 @@ public class WwkjCustomerInfo extends BaseEntity {
     @Excel(name = "开票信息")
     private String invoiceTitle;
 
+    /** 当前页数 */
+    @Excel(name = "当前页数")
+    private int pageNum;
+
+    /** 总页数 */
+    @Excel(name = "总页数")
+    private int total;
+
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
@@ -190,37 +210,80 @@ public class WwkjCustomerInfo extends BaseEntity {
     public void setDelFlag(String delFlag) { this.delFlag = delFlag; }
     public String getDelFlag() { return delFlag; }
 
+    public String getDeductMeter() {
+        return deductMeter;
+    }
+
+    public void setDeductMeter(String deductMeter) {
+        this.deductMeter = deductMeter;
+    }
+
+    public String getBasePrice() {
+        return basePrice;
+    }
+
+    public void setBasePrice(String basePrice) {
+        this.basePrice = basePrice;
+    }
+
+    public String getArrearStatus() {
+        return arrearStatus;
+    }
+
+    public void setArrearStatus(String arrearStatus) {
+        this.arrearStatus = arrearStatus;
+    }
+
+    public int getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(int pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("customerCode", getCustomerCode())
-            .append("customerName", getCustomerName())
-            .append("namePinYin", getNamePinYin())
-            .append("detailedAddress", getDetailedAddress())
-            .append("companyCode", getCompanyCode())
-            .append("companyName", getCompanyName())
-            .append("businessCode", getBusinessCode())
-            .append("businessName", getBusinessName())
-            .append("areaName", getAreaName())
-            .append("waterType", getWaterType())
-            .append("waterNature", getWaterNature())
-            .append("customerType", getCustomerType())
-            .append("waterPrice", getWaterPrice())
-            .append("houseHolder", getHouseHolder())
-            .append("accountStatus", getAccountStatus())
-            .append("numsOfUser", getNumsOfUser())
-            .append("contacts", getContacts())
-            .append("mobile", getMobile())
-            .append("openCusDate", getOpenCusDate())
-            .append("certificateType", getCertificateType())
-            .append("certificateCode", getCertificateCode())
-            .append("invoiceTitle", getInvoiceTitle())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
+        return "WwkjCustomerInfo{" +
+                "id=" + id +
+                ", customerCode='" + customerCode + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", namePinYin='" + namePinYin + '\'' +
+                ", detailedAddress='" + detailedAddress + '\'' +
+                ", companyCode='" + companyCode + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", businessCode='" + businessCode + '\'' +
+                ", businessName='" + businessName + '\'' +
+                ", areaName='" + areaName + '\'' +
+                ", waterType='" + waterType + '\'' +
+                ", waterNature='" + waterNature + '\'' +
+                ", customerType='" + customerType + '\'' +
+                ", deductMeter='" + deductMeter + '\'' +
+                ", waterPrice='" + waterPrice + '\'' +
+                ", basePrice='" + basePrice + '\'' +
+                ", houseHolder='" + houseHolder + '\'' +
+                ", arrearStatus='" + arrearStatus + '\'' +
+                ", accountStatus='" + accountStatus + '\'' +
+                ", numsOfUser=" + numsOfUser +
+                ", contacts='" + contacts + '\'' +
+                ", mobile='" + mobile + '\'' +
+                ", openCusDate=" + openCusDate +
+                ", certificateType='" + certificateType + '\'' +
+                ", certificateCode='" + certificateCode + '\'' +
+                ", invoiceTitle='" + invoiceTitle + '\'' +
+                ", pageNum=" + pageNum +
+                ", total=" + total +
+                ", delFlag='" + delFlag + '\'' +
+                ", commonCondition='" + commonCondition + '\'' +
+                '}';
     }
 }

ruoyi-api/src/main/java/com/ruoyi/api/domain/WwkjReadingRecord.java

@@ -54,6 +54,10 @@ public class WwkjReadingRecord extends BaseEntity {
     @Excel(name = "本次抄表状态：0:正常;1:倒转")
     private String thisMeterStatus;
 
+    /** 本期用水量 */
+    @Excel(name = "本期用水量")
+    private BigDecimal thisUsedNumber;
+
     /** 上期水量 */
     @Excel(name = "上期水量")
     private BigDecimal lastUsedNumber;
@@ -196,38 +200,44 @@ public class WwkjReadingRecord extends BaseEntity {
     public void setDelFlag(String delFlag) { this.delFlag = delFlag; }
     public String getDelFlag() { return delFlag; }
 
+
+    public BigDecimal getThisUsedNumber() {
+        return thisUsedNumber;
+    }
+
+    public void setThisUsedNumber(BigDecimal thisUsedNumber) {
+        this.thisUsedNumber = thisUsedNumber;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("usedWaterId", getUsedWaterId())
-            .append("taskCode", getTaskCode())
-            .append("routeCode", getRouteCode())
-            .append("cardCode", getCardCode())
-            .append("meterCode", getMeterCode())
-            .append("thisMeterNumber", getThisMeterNumber())
-            .append("thisMeterDate", getThisMeterDate())
-            .append("thisMeterStatus", getThisMeterStatus())
-            .append("lastUsedNumber", getLastUsedNumber())
-            .append("lastMeteNumber", getLastMeteNumber())
-            .append("lastMeterStatus", getLastMeterStatus())
-            .append("lastMeterDate", getLastMeterDate())
-            .append("readerName", getReaderName())
-            .append("enterName", getEnterName())
-            .append("enterDate", getEnterDate())
-            .append("readingWay", getReadingWay())
-            .append("readingType", getReadingType())
-            .append("remark", getRemark())
-            .append("addReason", getAddReason())
-            .append("progressStatus", getProgressStatus())
-            .append("oldMeterNumber", getOldMeterNumber())
-            .append("newMeterNumber", getNewMeterNumber())
-            .append("changeMeterDate", getChangeMeterDate())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
+        return "WwkjReadingRecord{" +
+                "id=" + id +
+                ", usedWaterId='" + usedWaterId + '\'' +
+                ", taskCode='" + taskCode + '\'' +
+                ", routeCode='" + routeCode + '\'' +
+                ", cardCode='" + cardCode + '\'' +
+                ", meterCode='" + meterCode + '\'' +
+                ", thisMeterNumber=" + thisMeterNumber +
+                ", thisMeterDate=" + thisMeterDate +
+                ", thisMeterStatus='" + thisMeterStatus + '\'' +
+                ", thisUsedNumber=" + thisUsedNumber +
+                ", lastUsedNumber=" + lastUsedNumber +
+                ", lastMeteNumber=" + lastMeteNumber +
+                ", lastMeterStatus='" + lastMeterStatus + '\'' +
+                ", lastMeterDate=" + lastMeterDate +
+                ", readerName='" + readerName + '\'' +
+                ", enterName='" + enterName + '\'' +
+                ", enterDate=" + enterDate +
+                ", readingWay='" + readingWay + '\'' +
+                ", readingType='" + readingType + '\'' +
+                ", remark='" + remark + '\'' +
+                ", addReason='" + addReason + '\'' +
+                ", progressStatus='" + progressStatus + '\'' +
+                ", oldMeterNumber=" + oldMeterNumber +
+                ", newMeterNumber=" + newMeterNumber +
+                ", changeMeterDate=" + changeMeterDate +
+                ", delFlag='" + delFlag + '\'' +
+                '}';
     }
 }

ruoyi-api/src/main/java/com/ruoyi/api/domain/WwkjWaterMeter.java

@@ -53,8 +53,8 @@ public class WwkjWaterMeter extends BaseEntity
     @Excel(name = "抄读类型：0:蓝牙;1:无磁传感;2:光电直读")
     private Long ReadType;
 
-    /** 表分类：0:分表;1:总表;2:单表;3:虚表 */
-    @Excel(name = "表分类：0:分表;1:总表;2:单表;3:虚表")
+    /** 表分类：0:分表;1:总表;2:单表;3:虚表4:观察表 */
+    @Excel(name = "表分类：0:分表;1:总表;2:单表;3:虚表4:观察表")
     private Long Type;
 
     /** 水表厂家：0:潍微科技;1:三川智慧;2:唐山汇中等 */
@@ -112,8 +112,8 @@ public class WwkjWaterMeter extends BaseEntity
     @Excel(name = "运行状态：0:启用;1:停用;2:拆除;3:返修")
     private Long RunStatus;
 
-    /** 阀控状态：00：开 01：关 11：无阀门 */
-    @Excel(name = "阀控状态：00：开 01：关 11：无阀门")
+    /** 阀控状态：00：开 01：关  11：无阀门 011无表前阀，110无表后阀 */
+    @Excel(name = "阀控状态：00：开 01：关  11：无阀门 011无表前阀，110无表后阀")
     private String ValueStatus;
 
     /** ICCID：远传水表通信卡号 */