导入用户相关表结构调整

slibra-system/src/main/java/com/slibra/business/domain/TUserInfo.java

@@ -4,10 +4,6 @@ import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.slibra.common.annotation.Excel;
@@ -17,12 +13,8 @@ import com.slibra.common.core.domain.BaseEntity;
  * 用户信息对象 t_user_info
  * 
  * @author slibra
- * @date 2024-11-06
+ * @date 2024-11-08
  */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
 public class TUserInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -51,8 +43,8 @@ public class TUserInfo extends BaseEntity
     private String phone;
 
     /** 省[冗余字段] */
-    @Excel(name = "省[冗余字段]")
     @JsonIgnore
+    @Excel(name = "省[冗余字段]")
     private String province;
 
     /** 市[冗余字段] */
@@ -73,9 +65,8 @@ public class TUserInfo extends BaseEntity
     @Excel(name = "地区")
     private String area;
 
-    /** 街道[冗余字段] */
-    @JsonIgnore
-    @Excel(name = "街道[冗余字段]")
+    /** 街道 */
+    @Excel(name = "街道")
     private String street;
 
     /** 小区名称 */
@@ -95,20 +86,26 @@ public class TUserInfo extends BaseEntity
     @Excel(name = "最新抄表日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date statisticsTime;
 
-    /** 未扣费总额 */
-    @Excel(name = "未扣费总额")
+    /** 未扣费总额[冗余字段] */
+    @JsonIgnore
+    @Excel(name = "未扣费总额[冗余字段]")
     private BigDecimal unpaidFees;
 
-    /** 账户余额 */
-    @Excel(name = "账户余额")
+    /** 账户余额[冗余字段] */
+    @JsonIgnore
+    @Excel(name = "账户余额[冗余字段]")
     private BigDecimal balanceFees;
 
-    /** 实际欠费 */
-    @Excel(name = "实际欠费")
+    /** 欠费金额 */
+    @Excel(name = "欠费金额")
     private BigDecimal waterFees;
 
-    /** 抄表员名称 */
-    @Excel(name = "抄表员名称")
+    /** 抄表表数 */
+    @Excel(name = "抄表表数")
+    private BigDecimal meterAmount;
+
+    /** 抄表员姓名 */
+    @Excel(name = "抄表员姓名")
     private String meterReader;
 
     /** 抄表员电话 */
@@ -116,9 +113,11 @@ public class TUserInfo extends BaseEntity
     private String meterReaderPhone;
 
     /** 删除标志（0代表存在 2代表删除） */
+    @JsonIgnore
     private Long delFlag;
 
     /** 乐观锁 */
+    @JsonIgnore
     @Excel(name = "乐观锁")
     private Long revision;
 

slibra-system/src/main/resources/mapper/business/TUserInfoMapper.xml

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unpaidFees"    column="unpaid_fees"    />
         <result property="balanceFees"    column="balance_fees"    />
         <result property="waterFees"    column="water_fees"    />
+        <result property="meterAmount"    column="meter_amount"    />
         <result property="meterReader"    column="meter_reader"    />
         <result property="meterReaderPhone"    column="meter_reader_phone"    />
         <result property="delFlag"    column="del_flag"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTUserInfoVo">
-        select id, user_no, card_no, ammeter_no, name, phone, province, city, country, pumping_station_address, area, street, neighbourhood_name, building_no, door_no, statistics_time, unpaid_fees, balance_fees, water_fees, meter_reader, meter_reader_phone, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_user_info
+        select id, user_no, card_no, ammeter_no, name, phone, province, city, country, pumping_station_address, area, street, neighbourhood_name, building_no, door_no, statistics_time, unpaid_fees, balance_fees, water_fees, meter_amount, meter_reader, meter_reader_phone, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_user_info
     </sql>
 
     <select id="selectTUserInfoList" parameterType="TUserInfo" resultMap="TUserInfoResult">
@@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unpaidFees != null "> and unpaid_fees = #{unpaidFees}</if>
             <if test="balanceFees != null "> and balance_fees = #{balanceFees}</if>
             <if test="waterFees != null "> and water_fees = #{waterFees}</if>
+            <if test="meterAmount != null "> and meter_amount = #{meterAmount}</if>
             <if test="meterReader != null  and meterReader != ''"> and meter_reader = #{meterReader}</if>
             <if test="meterReaderPhone != null  and meterReaderPhone != ''"> and meter_reader_phone = #{meterReaderPhone}</if>
             <if test="revision != null "> and revision = #{revision}</if>
@@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unpaidFees != null">unpaid_fees,</if>
             <if test="balanceFees != null">balance_fees,</if>
             <if test="waterFees != null">water_fees,</if>
+            <if test="meterAmount != null">meter_amount,</if>
             <if test="meterReader != null">meter_reader,</if>
             <if test="meterReaderPhone != null">meter_reader_phone,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -123,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unpaidFees != null">#{unpaidFees},</if>
             <if test="balanceFees != null">#{balanceFees},</if>
             <if test="waterFees != null">#{waterFees},</if>
+            <if test="meterAmount != null">#{meterAmount},</if>
             <if test="meterReader != null">#{meterReader},</if>
             <if test="meterReaderPhone != null">#{meterReaderPhone},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -156,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unpaidFees != null">unpaid_fees = #{unpaidFees},</if>
             <if test="balanceFees != null">balance_fees = #{balanceFees},</if>
             <if test="waterFees != null">water_fees = #{waterFees},</if>
+            <if test="meterAmount != null">meter_amount = #{meterAmount},</if>
             <if test="meterReader != null">meter_reader = #{meterReader},</if>
             <if test="meterReaderPhone != null">meter_reader_phone = #{meterReaderPhone},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>