ychk 4 месяцев назад
Родитель
Сommit
117ff33142

+ 14 - 16
app/src/main/java/com/tofly/yxpc/entity/WaterMeterEntity.java

@@ -47,11 +47,11 @@ public class WaterMeterEntity {
     /**
      * 最新最近止码
      */
-    private String recent_mark;
+    private String currentPeriodMark;
     /**
      * 抄表月份
      */
-    private String cb_month;
+    private String cbMonth;
     private String checkUser;
     private String navigationId;
     /**
@@ -121,14 +121,13 @@ public class WaterMeterEntity {
     @Convert(columnType = String.class, converter = FileConverter.class)
     private List<FileBean> bpAroundFileList;
 
-
-    @Generated(hash = 134026873)
+    @Generated(hash = 77622612)
     public WaterMeterEntity(Long id, String batch, String userNum, String userName,
                             String waterMeterNum, String waterMeterCaliber, String useWaterProperties,
                             String qbNum, String userAddr, String createTime, String createUser,
                             String longitude, String latitude, String internetIdCard, String installPosition,
                             Long taskId, String brand, String installTime, String type, String recentMark,
-                            String recent_mark, String cb_month, String checkUser, String navigationId,
+                            String currentPeriodMark, String cbMonth, String checkUser, String navigationId,
                             int state, String detailsState, List<FileBean> bpFileList,
                             List<FileBean> exceptionFileList, List<FileBean> wfbdFileList,
                             KbdDescribesBean kbdDescribes, KbdDescribesBean wfDescribes,
@@ -157,8 +156,8 @@ public class WaterMeterEntity {
         this.installTime = installTime;
         this.type = type;
         this.recentMark = recentMark;
-        this.recent_mark = recent_mark;
-        this.cb_month = cb_month;
+        this.currentPeriodMark = currentPeriodMark;
+        this.cbMonth = cbMonth;
         this.checkUser = checkUser;
         this.navigationId = navigationId;
         this.state = state;
@@ -188,7 +187,6 @@ public class WaterMeterEntity {
     public WaterMeterEntity() {
     }
 
-
     public Long getId() {
         return this.id;
     }
@@ -541,20 +539,20 @@ public class WaterMeterEntity {
         this.bpAroundFileList = bpAroundFileList;
     }
 
-    public String getRecent_mark() {
-        return recent_mark;
+    public String getCbMonth() {
+        return this.cbMonth;
     }
 
-    public void setRecent_mark(String recent_mark) {
-        this.recent_mark = recent_mark;
+    public void setCbMonth(String cbMonth) {
+        this.cbMonth = cbMonth;
     }
 
-    public String getCb_month() {
-        return cb_month;
+    public String getCurrentPeriodMark() {
+        return this.currentPeriodMark;
     }
 
-    public void setCb_month(String cb_month) {
-        this.cb_month = cb_month;
+    public void setCurrentPeriodMark(String currentPeriodMark) {
+        this.currentPeriodMark = currentPeriodMark;
     }
 
 }

+ 1 - 1
app/src/main/java/com/tofly/yxpc/ui/fragment/WaterCheckFragment.java

@@ -650,7 +650,7 @@ public class WaterCheckFragment extends PhotoFragment {
             }
             binding.tvOldRecentMark.setText(waterMeterEntity.getRecentMarkOld() == null ? "" : waterMeterEntity.getRecentMarkOld());
             binding.edRecentMark.setText(waterMeterEntity.getRecentMark() == null ? "" : waterMeterEntity.getRecentMark());
-            binding.tvLastRecentRemark.setText(waterMeterEntity.getRecent_mark() == null ? "" : waterMeterEntity.getRecent_mark() + "(" + (waterMeterEntity.getCb_month() == null ? "" : waterMeterEntity.getCb_month()) + ")");
+            binding.tvLastRecentRemark.setText(waterMeterEntity.getCurrentPeriodMark() == null ? "" : waterMeterEntity.getCurrentPeriodMark() + "(" + (waterMeterEntity.getCbMonth() == null ? "" : waterMeterEntity.getCbMonth()) + ")");
             binding.edRemark.setText(waterMeterEntity.getAddressDetails() == null ? "" : waterMeterEntity.getAddressDetails());
             if (waterMeterEntity != null && waterMeterEntity.getBpFileList() != null) {
                 bpPhotoList.addAll(waterMeterEntity.getBpFileList());