新增用户和费用相关的基本数据处理 停水的部分字段调整

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

@@ -1,5 +1,11 @@
 package com.slibra.business.domain;
 
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
@@ -11,6 +17,10 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-11-05
  */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class TCutOffWater extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -19,12 +29,14 @@ public class TCutOffWater extends BaseEntity
     private Long id;
 
     /** 停水开始时间 */
-    @Excel(name = "停水开始时间")
-    private String timeBegin;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "停水开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date timeBegin;
 
     /** 停水截止时间 */
-    @Excel(name = "停水截止时间")
-    private String timeEnd;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "停水截止时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date timeEnd;
 
     /** 停水原因 */
     @Excel(name = "停水原因")
@@ -41,85 +53,4 @@ public class TCutOffWater extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setTimeBegin(String timeBegin) 
-    {
-        this.timeBegin = timeBegin;
-    }
-
-    public String getTimeBegin() 
-    {
-        return timeBegin;
-    }
-    public void setTimeEnd(String timeEnd) 
-    {
-        this.timeEnd = timeEnd;
-    }
-
-    public String getTimeEnd() 
-    {
-        return timeEnd;
-    }
-    public void setReason(String reason) 
-    {
-        this.reason = reason;
-    }
-
-    public String getReason() 
-    {
-        return reason;
-    }
-    public void setPumpingStationNeighborhoodBuildingId(String pumpingStationNeighborhoodBuildingId) 
-    {
-        this.pumpingStationNeighborhoodBuildingId = pumpingStationNeighborhoodBuildingId;
-    }
-
-    public String getPumpingStationNeighborhoodBuildingId() 
-    {
-        return pumpingStationNeighborhoodBuildingId;
-    }
-    public void setDelFlag(Long delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setRevision(Long revision) 
-    {
-        this.revision = revision;
-    }
-
-    public Long getRevision() 
-    {
-        return revision;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("timeBegin", getTimeBegin())
-            .append("timeEnd", getTimeEnd())
-            .append("reason", getReason())
-            .append("pumpingStationNeighborhoodBuildingId", getPumpingStationNeighborhoodBuildingId())
-            .append("delFlag", getDelFlag())
-            .append("revision", getRevision())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

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

@@ -1,5 +1,9 @@
 package com.slibra.business.domain;
 
+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;
@@ -11,6 +15,10 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-11-05
  */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class TNeighborhood extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -49,105 +57,5 @@ public class TNeighborhood extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setProvinceId(String provinceId) 
-    {
-        this.provinceId = provinceId;
-    }
-
-    public String getProvinceId() 
-    {
-        return provinceId;
-    }
-    public void setCityId(String cityId) 
-    {
-        this.cityId = cityId;
-    }
-
-    public String getCityId() 
-    {
-        return cityId;
-    }
-    public void setCountryId(String countryId) 
-    {
-        this.countryId = countryId;
-    }
-
-    public String getCountryId() 
-    {
-        return countryId;
-    }
-    public void setAddress(String address) 
-    {
-        this.address = address;
-    }
-
-    public String getAddress() 
-    {
-        return address;
-    }
-    public void setSort(String sort) 
-    {
-        this.sort = sort;
-    }
-
-    public String getSort() 
-    {
-        return sort;
-    }
-    public void setDelFlag(Long delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setRevision(Long revision) 
-    {
-        this.revision = revision;
-    }
-
-    public Long getRevision() 
-    {
-        return revision;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("provinceId", getProvinceId())
-            .append("cityId", getCityId())
-            .append("countryId", getCountryId())
-            .append("address", getAddress())
-            .append("sort", getSort())
-            .append("delFlag", getDelFlag())
-            .append("revision", getRevision())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

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

@@ -1,5 +1,9 @@
 package com.slibra.business.domain;
 
+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;
@@ -11,6 +15,10 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-11-05
  */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class TNeighborhoodBuilding extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -37,75 +45,4 @@ public class TNeighborhoodBuilding extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setNeighborhoodId(Long neighborhoodId) 
-    {
-        this.neighborhoodId = neighborhoodId;
-    }
-
-    public Long getNeighborhoodId() 
-    {
-        return neighborhoodId;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setSort(Long sort) 
-    {
-        this.sort = sort;
-    }
-
-    public Long getSort() 
-    {
-        return sort;
-    }
-    public void setDelFlag(Long delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setRevision(Long revision) 
-    {
-        this.revision = revision;
-    }
-
-    public Long getRevision() 
-    {
-        return revision;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("neighborhoodId", getNeighborhoodId())
-            .append("name", getName())
-            .append("sort", getSort())
-            .append("delFlag", getDelFlag())
-            .append("revision", getRevision())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

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

@@ -1,5 +1,9 @@
 package com.slibra.business.domain;
 
+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;
@@ -11,6 +15,10 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-11-05
  */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class TPumpingStation extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -49,105 +57,4 @@ public class TPumpingStation extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setProvinceId(String provinceId) 
-    {
-        this.provinceId = provinceId;
-    }
-
-    public String getProvinceId() 
-    {
-        return provinceId;
-    }
-    public void setCityId(String cityId) 
-    {
-        this.cityId = cityId;
-    }
-
-    public String getCityId() 
-    {
-        return cityId;
-    }
-    public void setCountryId(String countryId) 
-    {
-        this.countryId = countryId;
-    }
-
-    public String getCountryId() 
-    {
-        return countryId;
-    }
-    public void setAddress(String address) 
-    {
-        this.address = address;
-    }
-
-    public String getAddress() 
-    {
-        return address;
-    }
-    public void setSort(String sort) 
-    {
-        this.sort = sort;
-    }
-
-    public String getSort() 
-    {
-        return sort;
-    }
-    public void setDelFlag(Long delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setRevision(Long revision) 
-    {
-        this.revision = revision;
-    }
-
-    public Long getRevision() 
-    {
-        return revision;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("provinceId", getProvinceId())
-            .append("cityId", getCityId())
-            .append("countryId", getCountryId())
-            .append("address", getAddress())
-            .append("sort", getSort())
-            .append("delFlag", getDelFlag())
-            .append("revision", getRevision())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

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

@@ -1,5 +1,9 @@
 package com.slibra.business.domain;
 
+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;
@@ -11,6 +15,10 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-11-05
  */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class TPumpingStationNeighbourhoodNumber extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -37,75 +45,4 @@ public class TPumpingStationNeighbourhoodNumber extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setPumpingStationId(Long pumpingStationId) 
-    {
-        this.pumpingStationId = pumpingStationId;
-    }
-
-    public Long getPumpingStationId() 
-    {
-        return pumpingStationId;
-    }
-    public void setNeighborhoodId(Long neighborhoodId) 
-    {
-        this.neighborhoodId = neighborhoodId;
-    }
-
-    public Long getNeighborhoodId() 
-    {
-        return neighborhoodId;
-    }
-    public void setNeighborhoodBuildingId(Long neighborhoodBuildingId) 
-    {
-        this.neighborhoodBuildingId = neighborhoodBuildingId;
-    }
-
-    public Long getNeighborhoodBuildingId() 
-    {
-        return neighborhoodBuildingId;
-    }
-    public void setDelFlag(Long delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setRevision(Long revision) 
-    {
-        this.revision = revision;
-    }
-
-    public Long getRevision() 
-    {
-        return revision;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("pumpingStationId", getPumpingStationId())
-            .append("neighborhoodId", getNeighborhoodId())
-            .append("neighborhoodBuildingId", getNeighborhoodBuildingId())
-            .append("delFlag", getDelFlag())
-            .append("revision", getRevision())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

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

@@ -0,0 +1,151 @@
+package com.slibra.business.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+import com.slibra.common.core.domain.BaseEntity;
+
+/**
+ * 用户水费明细对象 t_user_fee_info
+ * 
+ * @author slibra
+ * @date 2024-11-05
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TUserFeeInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private String userId;
+
+    /** 本次统计时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "本次统计时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date statisticsTime;
+
+    /** 账户余额 */
+    @Excel(name = "账户余额")
+    private BigDecimal balanceFees;
+
+    /** 未扣费总额 */
+    @Excel(name = "未扣费总额")
+    private BigDecimal unpaidFees;
+
+    /** 水费 */
+    @Excel(name = "水费")
+    private BigDecimal waterFees;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private Long delFlag;
+
+    /** 乐观锁 */
+    @Excel(name = "乐观锁")
+    private Long revision;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setUserId(String userId) 
+    {
+        this.userId = userId;
+    }
+
+    public String getUserId() 
+    {
+        return userId;
+    }
+    public void setStatisticsTime(Date statisticsTime) 
+    {
+        this.statisticsTime = statisticsTime;
+    }
+
+    public Date getStatisticsTime() 
+    {
+        return statisticsTime;
+    }
+    public void setBalanceFees(BigDecimal balanceFees) 
+    {
+        this.balanceFees = balanceFees;
+    }
+
+    public BigDecimal getBalanceFees() 
+    {
+        return balanceFees;
+    }
+    public void setUnpaidFees(BigDecimal unpaidFees) 
+    {
+        this.unpaidFees = unpaidFees;
+    }
+
+    public BigDecimal getUnpaidFees() 
+    {
+        return unpaidFees;
+    }
+    public void setWaterFees(BigDecimal waterFees) 
+    {
+        this.waterFees = waterFees;
+    }
+
+    public BigDecimal getWaterFees() 
+    {
+        return waterFees;
+    }
+    public void setDelFlag(Long delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setRevision(Long revision) 
+    {
+        this.revision = revision;
+    }
+
+    public Long getRevision() 
+    {
+        return revision;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userId", getUserId())
+            .append("statisticsTime", getStatisticsTime())
+            .append("balanceFees", getBalanceFees())
+            .append("unpaidFees", getUnpaidFees())
+            .append("waterFees", getWaterFees())
+            .append("delFlag", getDelFlag())
+            .append("revision", getRevision())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,287 @@
+package com.slibra.business.domain;
+
+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;
+import com.slibra.common.core.domain.BaseEntity;
+
+/**
+ * 用户信息对象 t_user_info
+ * 
+ * @author slibra
+ * @date 2024-11-05
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TUserInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 户号 */
+    @Excel(name = "户号")
+    private String cardNo;
+
+    /** 用户编号 */
+    @Excel(name = "用户编号")
+    private String userNo;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String name;
+
+    /** 移动电话（来电号码） */
+    @Excel(name = "移动电话", readConverterExp = "来=电号码")
+    private String phone;
+
+    /** 省 */
+    @Excel(name = "省")
+    private String province;
+
+    /** 市 */
+    @Excel(name = "市")
+    private String city;
+
+    /** 区县 */
+    @Excel(name = "区县")
+    private String country;
+
+    /** 街道 */
+    @Excel(name = "街道")
+    private String street;
+
+    /** 小区名称 */
+    @Excel(name = "小区名称")
+    private String address;
+
+    /** 楼号 */
+    @Excel(name = "楼号")
+    private String buildingNo;
+
+    /** 门牌号 */
+    @Excel(name = "门牌号")
+    private String doorNo;
+
+    /** 表身号 */
+    @Excel(name = "表身号")
+    private String ammeterNo;
+
+    /** 泵站名称 */
+    @Excel(name = "泵站名称")
+    private String pumpingStation;
+
+    /** 抄表员名称 */
+    @Excel(name = "抄表员名称")
+    private String meterReader;
+
+    /** 抄表员电话 */
+    @Excel(name = "抄表员电话")
+    private String meterReaderPhone;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private Long delFlag;
+
+    /** 乐观锁 */
+    @Excel(name = "乐观锁")
+    private Long revision;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCardNo(String cardNo) 
+    {
+        this.cardNo = cardNo;
+    }
+
+    public String getCardNo() 
+    {
+        return cardNo;
+    }
+    public void setUserNo(String userNo) 
+    {
+        this.userNo = userNo;
+    }
+
+    public String getUserNo() 
+    {
+        return userNo;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setProvince(String province) 
+    {
+        this.province = province;
+    }
+
+    public String getProvince() 
+    {
+        return province;
+    }
+    public void setCity(String city) 
+    {
+        this.city = city;
+    }
+
+    public String getCity() 
+    {
+        return city;
+    }
+    public void setCountry(String country) 
+    {
+        this.country = country;
+    }
+
+    public String getCountry() 
+    {
+        return country;
+    }
+    public void setStreet(String street) 
+    {
+        this.street = street;
+    }
+
+    public String getStreet() 
+    {
+        return street;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setBuildingNo(String buildingNo) 
+    {
+        this.buildingNo = buildingNo;
+    }
+
+    public String getBuildingNo() 
+    {
+        return buildingNo;
+    }
+    public void setDoorNo(String doorNo) 
+    {
+        this.doorNo = doorNo;
+    }
+
+    public String getDoorNo() 
+    {
+        return doorNo;
+    }
+    public void setAmmeterNo(String ammeterNo) 
+    {
+        this.ammeterNo = ammeterNo;
+    }
+
+    public String getAmmeterNo() 
+    {
+        return ammeterNo;
+    }
+    public void setPumpingStation(String pumpingStation) 
+    {
+        this.pumpingStation = pumpingStation;
+    }
+
+    public String getPumpingStation() 
+    {
+        return pumpingStation;
+    }
+    public void setMeterReader(String meterReader) 
+    {
+        this.meterReader = meterReader;
+    }
+
+    public String getMeterReader() 
+    {
+        return meterReader;
+    }
+    public void setMeterReaderPhone(String meterReaderPhone) 
+    {
+        this.meterReaderPhone = meterReaderPhone;
+    }
+
+    public String getMeterReaderPhone() 
+    {
+        return meterReaderPhone;
+    }
+    public void setDelFlag(Long delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setRevision(Long revision) 
+    {
+        this.revision = revision;
+    }
+
+    public Long getRevision() 
+    {
+        return revision;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("cardNo", getCardNo())
+            .append("userNo", getUserNo())
+            .append("name", getName())
+            .append("phone", getPhone())
+            .append("province", getProvince())
+            .append("city", getCity())
+            .append("country", getCountry())
+            .append("street", getStreet())
+            .append("address", getAddress())
+            .append("buildingNo", getBuildingNo())
+            .append("doorNo", getDoorNo())
+            .append("ammeterNo", getAmmeterNo())
+            .append("pumpingStation", getPumpingStation())
+            .append("meterReader", getMeterReader())
+            .append("meterReaderPhone", getMeterReaderPhone())
+            .append("delFlag", getDelFlag())
+            .append("revision", getRevision())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -1,5 +1,9 @@
 package com.slibra.business.domain;
 
+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;
@@ -11,6 +15,11 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-11-05
  */
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class TWhitelist extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -33,65 +42,4 @@ public class TWhitelist extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setPhone(String phone) 
-    {
-        this.phone = phone;
-    }
-
-    public String getPhone() 
-    {
-        return phone;
-    }
-    public void setDescription(String description) 
-    {
-        this.description = description;
-    }
-
-    public String getDescription() 
-    {
-        return description;
-    }
-    public void setDelFlag(Long delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Long getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setRevision(Long revision) 
-    {
-        this.revision = revision;
-    }
-
-    public Long getRevision() 
-    {
-        return revision;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("phone", getPhone())
-            .append("description", getDescription())
-            .append("delFlag", getDelFlag())
-            .append("revision", getRevision())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

slibra-system/src/main/java/com/slibra/business/mapper/TUserFeeInfoMapper.java

@@ -0,0 +1,61 @@
+package com.slibra.business.mapper;
+
+import java.util.List;
+import com.slibra.business.domain.TUserFeeInfo;
+
+/**
+ * 用户水费明细Mapper接口
+ * 
+ * @author slibra
+ * @date 2024-11-05
+ */
+public interface TUserFeeInfoMapper 
+{
+    /**
+     * 查询用户水费明细
+     * 
+     * @param id 用户水费明细主键
+     * @return 用户水费明细
+     */
+    public TUserFeeInfo selectTUserFeeInfoById(Long id);
+
+    /**
+     * 查询用户水费明细列表
+     * 
+     * @param tUserFeeInfo 用户水费明细
+     * @return 用户水费明细集合
+     */
+    public List<TUserFeeInfo> selectTUserFeeInfoList(TUserFeeInfo tUserFeeInfo);
+
+    /**
+     * 新增用户水费明细
+     * 
+     * @param tUserFeeInfo 用户水费明细
+     * @return 结果
+     */
+    public int insertTUserFeeInfo(TUserFeeInfo tUserFeeInfo);
+
+    /**
+     * 修改用户水费明细
+     * 
+     * @param tUserFeeInfo 用户水费明细
+     * @return 结果
+     */
+    public int updateTUserFeeInfo(TUserFeeInfo tUserFeeInfo);
+
+    /**
+     * 删除用户水费明细
+     * 
+     * @param id 用户水费明细主键
+     * @return 结果
+     */
+    public int deleteTUserFeeInfoById(Long id);
+
+    /**
+     * 批量删除用户水费明细
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTUserFeeInfoByIds(Long[] ids);
+}

slibra-system/src/main/java/com/slibra/business/mapper/TUserInfoMapper.java

@@ -0,0 +1,61 @@
+package com.slibra.business.mapper;
+
+import java.util.List;
+import com.slibra.business.domain.TUserInfo;
+
+/**
+ * 用户信息Mapper接口
+ * 
+ * @author slibra
+ * @date 2024-11-05
+ */
+public interface TUserInfoMapper 
+{
+    /**
+     * 查询用户信息
+     * 
+     * @param id 用户信息主键
+     * @return 用户信息
+     */
+    public TUserInfo selectTUserInfoById(Long id);
+
+    /**
+     * 查询用户信息列表
+     * 
+     * @param tUserInfo 用户信息
+     * @return 用户信息集合
+     */
+    public List<TUserInfo> selectTUserInfoList(TUserInfo tUserInfo);
+
+    /**
+     * 新增用户信息
+     * 
+     * @param tUserInfo 用户信息
+     * @return 结果
+     */
+    public int insertTUserInfo(TUserInfo tUserInfo);
+
+    /**
+     * 修改用户信息
+     * 
+     * @param tUserInfo 用户信息
+     * @return 结果
+     */
+    public int updateTUserInfo(TUserInfo tUserInfo);
+
+    /**
+     * 删除用户信息
+     * 
+     * @param id 用户信息主键
+     * @return 结果
+     */
+    public int deleteTUserInfoById(Long id);
+
+    /**
+     * 批量删除用户信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTUserInfoByIds(Long[] ids);
+}

slibra-system/src/main/java/com/slibra/business/service/ITUserFeeInfoService.java

@@ -0,0 +1,61 @@
+package com.slibra.business.service;
+
+import java.util.List;
+import com.slibra.business.domain.TUserFeeInfo;
+
+/**
+ * 用户水费明细Service接口
+ * 
+ * @author slibra
+ * @date 2024-11-05
+ */
+public interface ITUserFeeInfoService 
+{
+    /**
+     * 查询用户水费明细
+     * 
+     * @param id 用户水费明细主键
+     * @return 用户水费明细
+     */
+    public TUserFeeInfo selectTUserFeeInfoById(Long id);
+
+    /**
+     * 查询用户水费明细列表
+     * 
+     * @param tUserFeeInfo 用户水费明细
+     * @return 用户水费明细集合
+     */
+    public List<TUserFeeInfo> selectTUserFeeInfoList(TUserFeeInfo tUserFeeInfo);
+
+    /**
+     * 新增用户水费明细
+     * 
+     * @param tUserFeeInfo 用户水费明细
+     * @return 结果
+     */
+    public int insertTUserFeeInfo(TUserFeeInfo tUserFeeInfo);
+
+    /**
+     * 修改用户水费明细
+     * 
+     * @param tUserFeeInfo 用户水费明细
+     * @return 结果
+     */
+    public int updateTUserFeeInfo(TUserFeeInfo tUserFeeInfo);
+
+    /**
+     * 批量删除用户水费明细
+     * 
+     * @param ids 需要删除的用户水费明细主键集合
+     * @return 结果
+     */
+    public int deleteTUserFeeInfoByIds(Long[] ids);
+
+    /**
+     * 删除用户水费明细信息
+     * 
+     * @param id 用户水费明细主键
+     * @return 结果
+     */
+    public int deleteTUserFeeInfoById(Long id);
+}

slibra-system/src/main/java/com/slibra/business/service/ITUserInfoService.java

@@ -0,0 +1,61 @@
+package com.slibra.business.service;
+
+import java.util.List;
+import com.slibra.business.domain.TUserInfo;
+
+/**
+ * 用户信息Service接口
+ * 
+ * @author slibra
+ * @date 2024-11-05
+ */
+public interface ITUserInfoService 
+{
+    /**
+     * 查询用户信息
+     * 
+     * @param id 用户信息主键
+     * @return 用户信息
+     */
+    public TUserInfo selectTUserInfoById(Long id);
+
+    /**
+     * 查询用户信息列表
+     * 
+     * @param tUserInfo 用户信息
+     * @return 用户信息集合
+     */
+    public List<TUserInfo> selectTUserInfoList(TUserInfo tUserInfo);
+
+    /**
+     * 新增用户信息
+     * 
+     * @param tUserInfo 用户信息
+     * @return 结果
+     */
+    public int insertTUserInfo(TUserInfo tUserInfo);
+
+    /**
+     * 修改用户信息
+     * 
+     * @param tUserInfo 用户信息
+     * @return 结果
+     */
+    public int updateTUserInfo(TUserInfo tUserInfo);
+
+    /**
+     * 批量删除用户信息
+     * 
+     * @param ids 需要删除的用户信息主键集合
+     * @return 结果
+     */
+    public int deleteTUserInfoByIds(Long[] ids);
+
+    /**
+     * 删除用户信息信息
+     * 
+     * @param id 用户信息主键
+     * @return 结果
+     */
+    public int deleteTUserInfoById(Long id);
+}

slibra-system/src/main/java/com/slibra/business/service/impl/TUserFeeInfoServiceImpl.java

@@ -0,0 +1,96 @@
+package com.slibra.business.service.impl;
+
+import java.util.List;
+import com.slibra.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.slibra.business.mapper.TUserFeeInfoMapper;
+import com.slibra.business.domain.TUserFeeInfo;
+import com.slibra.business.service.ITUserFeeInfoService;
+
+/**
+ * 用户水费明细Service业务层处理
+ * 
+ * @author slibra
+ * @date 2024-11-05
+ */
+@Service
+public class TUserFeeInfoServiceImpl implements ITUserFeeInfoService 
+{
+    @Autowired
+    private TUserFeeInfoMapper tUserFeeInfoMapper;
+
+    /**
+     * 查询用户水费明细
+     * 
+     * @param id 用户水费明细主键
+     * @return 用户水费明细
+     */
+    @Override
+    public TUserFeeInfo selectTUserFeeInfoById(Long id)
+    {
+        return tUserFeeInfoMapper.selectTUserFeeInfoById(id);
+    }
+
+    /**
+     * 查询用户水费明细列表
+     * 
+     * @param tUserFeeInfo 用户水费明细
+     * @return 用户水费明细
+     */
+    @Override
+    public List<TUserFeeInfo> selectTUserFeeInfoList(TUserFeeInfo tUserFeeInfo)
+    {
+        return tUserFeeInfoMapper.selectTUserFeeInfoList(tUserFeeInfo);
+    }
+
+    /**
+     * 新增用户水费明细
+     * 
+     * @param tUserFeeInfo 用户水费明细
+     * @return 结果
+     */
+    @Override
+    public int insertTUserFeeInfo(TUserFeeInfo tUserFeeInfo)
+    {
+        tUserFeeInfo.setCreateTime(DateUtils.getNowDate());
+        return tUserFeeInfoMapper.insertTUserFeeInfo(tUserFeeInfo);
+    }
+
+    /**
+     * 修改用户水费明细
+     * 
+     * @param tUserFeeInfo 用户水费明细
+     * @return 结果
+     */
+    @Override
+    public int updateTUserFeeInfo(TUserFeeInfo tUserFeeInfo)
+    {
+        tUserFeeInfo.setUpdateTime(DateUtils.getNowDate());
+        return tUserFeeInfoMapper.updateTUserFeeInfo(tUserFeeInfo);
+    }
+
+    /**
+     * 批量删除用户水费明细
+     * 
+     * @param ids 需要删除的用户水费明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTUserFeeInfoByIds(Long[] ids)
+    {
+        return tUserFeeInfoMapper.deleteTUserFeeInfoByIds(ids);
+    }
+
+    /**
+     * 删除用户水费明细信息
+     * 
+     * @param id 用户水费明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTUserFeeInfoById(Long id)
+    {
+        return tUserFeeInfoMapper.deleteTUserFeeInfoById(id);
+    }
+}

slibra-system/src/main/java/com/slibra/business/service/impl/TUserInfoServiceImpl.java

@@ -0,0 +1,96 @@
+package com.slibra.business.service.impl;
+
+import java.util.List;
+import com.slibra.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.slibra.business.mapper.TUserInfoMapper;
+import com.slibra.business.domain.TUserInfo;
+import com.slibra.business.service.ITUserInfoService;
+
+/**
+ * 用户信息Service业务层处理
+ * 
+ * @author slibra
+ * @date 2024-11-05
+ */
+@Service
+public class TUserInfoServiceImpl implements ITUserInfoService 
+{
+    @Autowired
+    private TUserInfoMapper tUserInfoMapper;
+
+    /**
+     * 查询用户信息
+     * 
+     * @param id 用户信息主键
+     * @return 用户信息
+     */
+    @Override
+    public TUserInfo selectTUserInfoById(Long id)
+    {
+        return tUserInfoMapper.selectTUserInfoById(id);
+    }
+
+    /**
+     * 查询用户信息列表
+     * 
+     * @param tUserInfo 用户信息
+     * @return 用户信息
+     */
+    @Override
+    public List<TUserInfo> selectTUserInfoList(TUserInfo tUserInfo)
+    {
+        return tUserInfoMapper.selectTUserInfoList(tUserInfo);
+    }
+
+    /**
+     * 新增用户信息
+     * 
+     * @param tUserInfo 用户信息
+     * @return 结果
+     */
+    @Override
+    public int insertTUserInfo(TUserInfo tUserInfo)
+    {
+        tUserInfo.setCreateTime(DateUtils.getNowDate());
+        return tUserInfoMapper.insertTUserInfo(tUserInfo);
+    }
+
+    /**
+     * 修改用户信息
+     * 
+     * @param tUserInfo 用户信息
+     * @return 结果
+     */
+    @Override
+    public int updateTUserInfo(TUserInfo tUserInfo)
+    {
+        tUserInfo.setUpdateTime(DateUtils.getNowDate());
+        return tUserInfoMapper.updateTUserInfo(tUserInfo);
+    }
+
+    /**
+     * 批量删除用户信息
+     * 
+     * @param ids 需要删除的用户信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTUserInfoByIds(Long[] ids)
+    {
+        return tUserInfoMapper.deleteTUserInfoByIds(ids);
+    }
+
+    /**
+     * 删除用户信息信息
+     * 
+     * @param id 用户信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTUserInfoById(Long id)
+    {
+        return tUserInfoMapper.deleteTUserInfoById(id);
+    }
+}

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

@@ -27,8 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTCutOffWaterVo"/>
         <where>
             1 = 1
-            <if test="timeBegin != null  and timeBegin != ''"> and time_begin = #{timeBegin}</if>
-            <if test="timeEnd != null  and timeEnd != ''"> and time_end = #{timeEnd}</if>
+            <if test="timeBegin != null "> and time_begin = #{timeBegin}</if>
+            <if test="timeEnd != null "> and time_end = #{timeEnd}</if>
             <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
             <if test="pumpingStationNeighborhoodBuildingId != null  and pumpingStationNeighborhoodBuildingId != ''"> and pumping_station_neighborhood_building_id = #{pumpingStationNeighborhoodBuildingId}</if>
             <if test="revision != null "> and revision = #{revision}</if>
@@ -44,8 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTCutOffWater" parameterType="TCutOffWater" useGeneratedKeys="true" keyProperty="id">
         insert into t_cut_off_water
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="timeBegin != null and timeBegin != ''">time_begin,</if>
-            <if test="timeEnd != null and timeEnd != ''">time_end,</if>
+            <if test="timeBegin != null">time_begin,</if>
+            <if test="timeEnd != null">time_end,</if>
             <if test="reason != null">reason,</if>
             <if test="pumpingStationNeighborhoodBuildingId != null and pumpingStationNeighborhoodBuildingId != ''">pumping_station_neighborhood_building_id,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -57,8 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="timeBegin != null and timeBegin != ''">#{timeBegin},</if>
-            <if test="timeEnd != null and timeEnd != ''">#{timeEnd},</if>
+            <if test="timeBegin != null">#{timeBegin},</if>
+            <if test="timeEnd != null">#{timeEnd},</if>
             <if test="reason != null">#{reason},</if>
             <if test="pumpingStationNeighborhoodBuildingId != null and pumpingStationNeighborhoodBuildingId != ''">#{pumpingStationNeighborhoodBuildingId},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -74,8 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTCutOffWater" parameterType="TCutOffWater">
         update t_cut_off_water
         <trim prefix="SET" suffixOverrides=",">
-            <if test="timeBegin != null and timeBegin != ''">time_begin = #{timeBegin},</if>
-            <if test="timeEnd != null and timeEnd != ''">time_end = #{timeEnd},</if>
+            <if test="timeBegin != null">time_begin = #{timeBegin},</if>
+            <if test="timeEnd != null">time_end = #{timeEnd},</if>
             <if test="reason != null">reason = #{reason},</if>
             <if test="pumpingStationNeighborhoodBuildingId != null and pumpingStationNeighborhoodBuildingId != ''">pumping_station_neighborhood_building_id = #{pumpingStationNeighborhoodBuildingId},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>

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

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.slibra.business.mapper.TUserFeeInfoMapper">
+    
+    <resultMap type="TUserFeeInfo" id="TUserFeeInfoResult">
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="statisticsTime"    column="statistics_time"    />
+        <result property="balanceFees"    column="balance_fees"    />
+        <result property="unpaidFees"    column="unpaid_fees"    />
+        <result property="waterFees"    column="water_fees"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTUserFeeInfoVo">
+        select id, user_id, statistics_time, balance_fees, unpaid_fees, water_fees, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_user_fee_info
+    </sql>
+
+    <select id="selectTUserFeeInfoList" parameterType="TUserFeeInfo" resultMap="TUserFeeInfoResult">
+        <include refid="selectTUserFeeInfoVo"/>
+        <where>
+            1 = 1
+            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
+            <if test="statisticsTime != null "> and statistics_time = #{statisticsTime}</if>
+            <if test="balanceFees != null "> and balance_fees = #{balanceFees}</if>
+            <if test="unpaidFees != null "> and unpaid_fees = #{unpaidFees}</if>
+            <if test="waterFees != null "> and water_fees = #{waterFees}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTUserFeeInfoById" parameterType="Long" resultMap="TUserFeeInfoResult">
+        <include refid="selectTUserFeeInfoVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+        
+    <insert id="insertTUserFeeInfo" parameterType="TUserFeeInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into t_user_fee_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="statisticsTime != null">statistics_time,</if>
+            <if test="balanceFees != null">balance_fees,</if>
+            <if test="unpaidFees != null">unpaid_fees,</if>
+            <if test="waterFees != null">water_fees,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="statisticsTime != null">#{statisticsTime},</if>
+            <if test="balanceFees != null">#{balanceFees},</if>
+            <if test="unpaidFees != null">#{unpaidFees},</if>
+            <if test="waterFees != null">#{waterFees},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTUserFeeInfo" parameterType="TUserFeeInfo">
+        update t_user_fee_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="statisticsTime != null">statistics_time = #{statisticsTime},</if>
+            <if test="balanceFees != null">balance_fees = #{balanceFees},</if>
+            <if test="unpaidFees != null">unpaid_fees = #{unpaidFees},</if>
+            <if test="waterFees != null">water_fees = #{waterFees},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    
+
+    <delete id="deleteTUserFeeInfoById" parameterType="Long">
+        update t_user_fee_info set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTUserFeeInfoByIds" parameterType="String">
+        update t_user_fee_info set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.slibra.business.mapper.TUserInfoMapper">
+    
+    <resultMap type="TUserInfo" id="TUserInfoResult">
+        <result property="id"    column="id"    />
+        <result property="cardNo"    column="card_no"    />
+        <result property="userNo"    column="user_no"    />
+        <result property="name"    column="name"    />
+        <result property="phone"    column="phone"    />
+        <result property="province"    column="province"    />
+        <result property="city"    column="city"    />
+        <result property="country"    column="country"    />
+        <result property="street"    column="street"    />
+        <result property="address"    column="address"    />
+        <result property="buildingNo"    column="building_no"    />
+        <result property="doorNo"    column="door_no"    />
+        <result property="ammeterNo"    column="ammeter_no"    />
+        <result property="pumpingStation"    column="pumping_station"    />
+        <result property="meterReader"    column="meter_reader"    />
+        <result property="meterReaderPhone"    column="meter_reader_phone"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTUserInfoVo">
+        select id, card_no, user_no, name, phone, province, city, country, street, address, building_no, door_no, ammeter_no, pumping_station, 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">
+        <include refid="selectTUserInfoVo"/>
+        <where>
+            1 = 1
+            <if test="cardNo != null  and cardNo != ''"> and card_no = #{cardNo}</if>
+            <if test="userNo != null  and userNo != ''"> and user_no = #{userNo}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="country != null  and country != ''"> and country = #{country}</if>
+            <if test="street != null  and street != ''"> and street = #{street}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="buildingNo != null  and buildingNo != ''"> and building_no = #{buildingNo}</if>
+            <if test="doorNo != null  and doorNo != ''"> and door_no = #{doorNo}</if>
+            <if test="ammeterNo != null  and ammeterNo != ''"> and ammeter_no = #{ammeterNo}</if>
+            <if test="pumpingStation != null  and pumpingStation != ''"> and pumping_station = #{pumpingStation}</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>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTUserInfoById" parameterType="Long" resultMap="TUserInfoResult">
+        <include refid="selectTUserInfoVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+        
+    <insert id="insertTUserInfo" parameterType="TUserInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into t_user_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cardNo != null">card_no,</if>
+            <if test="userNo != null">user_no,</if>
+            <if test="name != null">name,</if>
+            <if test="phone != null">phone,</if>
+            <if test="province != null">province,</if>
+            <if test="city != null">city,</if>
+            <if test="country != null">country,</if>
+            <if test="street != null">street,</if>
+            <if test="address != null">address,</if>
+            <if test="buildingNo != null">building_no,</if>
+            <if test="doorNo != null">door_no,</if>
+            <if test="ammeterNo != null">ammeter_no,</if>
+            <if test="pumpingStation != null">pumping_station,</if>
+            <if test="meterReader != null">meter_reader,</if>
+            <if test="meterReaderPhone != null">meter_reader_phone,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cardNo != null">#{cardNo},</if>
+            <if test="userNo != null">#{userNo},</if>
+            <if test="name != null">#{name},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="province != null">#{province},</if>
+            <if test="city != null">#{city},</if>
+            <if test="country != null">#{country},</if>
+            <if test="street != null">#{street},</if>
+            <if test="address != null">#{address},</if>
+            <if test="buildingNo != null">#{buildingNo},</if>
+            <if test="doorNo != null">#{doorNo},</if>
+            <if test="ammeterNo != null">#{ammeterNo},</if>
+            <if test="pumpingStation != null">#{pumpingStation},</if>
+            <if test="meterReader != null">#{meterReader},</if>
+            <if test="meterReaderPhone != null">#{meterReaderPhone},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTUserInfo" parameterType="TUserInfo">
+        update t_user_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cardNo != null">card_no = #{cardNo},</if>
+            <if test="userNo != null">user_no = #{userNo},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="country != null">country = #{country},</if>
+            <if test="street != null">street = #{street},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="buildingNo != null">building_no = #{buildingNo},</if>
+            <if test="doorNo != null">door_no = #{doorNo},</if>
+            <if test="ammeterNo != null">ammeter_no = #{ammeterNo},</if>
+            <if test="pumpingStation != null">pumping_station = #{pumpingStation},</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>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    
+
+    <delete id="deleteTUserInfoById" parameterType="Long">
+        update t_user_info set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTUserInfoByIds" parameterType="String">
+        update t_user_info set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>