Browse Source

通过用户编号更新费用和日期接口完善

王苗苗 3 months ago
parent
commit
f31472541d

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

@@ -17,6 +17,7 @@ import org.apache.ibatis.session.SqlSession;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.*;
 
 @Component
@@ -61,7 +62,11 @@ public class UpdateUserFeeListener extends AnalysisEventListener<UserFeeExcelInf
             updateBean.setId(tUserInfo.getId());
             updateBean.setWaterFees(waterFees);
             updateBean.setMeterAmount(userExcelInfo.getMeterAmount());
-            updateBean.setStatisticsTime(userExcelInfo.getStatisticsTime());
+            try {
+                updateBean.setStatisticsTime(DateUtils.parseDate(userExcelInfo.getStatisticsTime(), DateUtils.YYYY_MM_DD_HH_MM_SSS));
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
             updateBean.setUpdateTime(DateUtils.getNowDate());
             updateBean.setUpdateBy("system");
             this.tUserInfoMapper.updateTUserInfo(updateBean);

+ 1 - 0
slibra-common/src/main/java/com/slibra/common/utils/DateUtils.java

@@ -40,6 +40,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYYMMDD_TS = "yyyy/MM/dd";
     public static String YYYYMM_TS = "yyyy/MM";
     public static String YYYYMMDDHH_CHINESE = "yyyy年MM月dd日 HH";
+    public static String YYYY_MM_DD_HH_MM_SSS = "yyyy-MM-dd HH:mm:ss.SSS";
 
     private static String[] parsePatterns = {
             "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 

+ 3 - 1
slibra-system/src/main/java/com/slibra/business/res/UserFeeExcelInfo.java

@@ -1,5 +1,6 @@
 package com.slibra.business.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.slibra.common.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -36,8 +37,9 @@ public class UserFeeExcelInfo
     private BigDecimal waterFees;
 
     /** 截止统计时间 */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
     @Excel(name = "截止统计时间")
-    private Date statisticsTime;
+    private String statisticsTime;
 
 
 }