Browse Source

1.更新水费等信息,日期支持多种类型 2.给创哥接口优化,从默认空串儿返回null 否则更新用户水费会导致字段覆盖

王苗苗 2 days ago
parent
commit
b09d57ab38

+ 2 - 2
slibra-admin/src/main/java/com/slibra/web/controller/listener/UpdateUserFeeListener.java

@@ -63,12 +63,12 @@ public class UpdateUserFeeListener extends AnalysisEventListener<UserFeeExcelInf
             updateBean.setWaterFees(waterFees);
             updateBean.setMeterAmount(userExcelInfo.getMeterAmount());
             try {
-                updateBean.setStatisticsTime(DateUtils.parseDate(userExcelInfo.getStatisticsTime(), DateUtils.YYYY_MM_DD_HH_MM_SSS));
+                updateBean.setStatisticsTime(DateUtils.parseDate(userExcelInfo.getStatisticsTime(), DateUtils.parsePatterns));
             } catch (ParseException e) {
                 throw new RuntimeException(e);
             }
             updateBean.setUpdateTime(DateUtils.getNowDate());
-            updateBean.setUpdateBy("system");
+            updateBean.setUpdateBy("system-1");
             this.tUserInfoMapper.updateTUserInfo(updateBean);
             successNum++;
         }

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

@@ -133,7 +133,7 @@ public class TUserInfo extends BaseEntity
 
     public String getMeterReaderPhone() {
         if(StringUtils.isBlank(meterReaderPhone))
-            return "";
+            return null;
         return PhoneNumberToChineseUtil.convertPhoneNumber(meterReaderPhone);
     }
 }