Bladeren bron

收益概览

tanbin 1 jaar geleden
bovenliggende
commit
d6f3b08df9

+ 3 - 0
device-api-service/src/main/java/com/xy/job/MercFeeCountMonthJob.java

@@ -75,6 +75,9 @@ public class MercFeeCountMonthJob {
         List<MercFeeCountDayDto.CountByMonthVO> countByMonthVOS = mercFeeCountDayService.countByMonth(new MercFeeCountDayDto.CountByMonth().setMonthValue(monthValue));
         if (CollUtil.isNotEmpty(countByMonthVOS)) {
             List<MercFeeCountMonth> mercFeeCountMonths = BeanUtil.copyToList(countByMonthVOS, MercFeeCountMonth.class);
+            mercFeeCountMonths.forEach(mfm -> {
+                mfm.setDateValue(monthValue);
+            });
             mercFeeCountMonthService.saveBatch(mercFeeCountMonths);
         }
 

+ 1 - 1
device-api-service/src/main/java/com/xy/mapper/mapper/MercFeeCountDayMapper.xml

@@ -14,7 +14,7 @@
         <result column="update_time" property="updateTime"/>
     </resultMap>
 
-    <select id="countByMonth" resultType="com.xy.dto.MercFeeCountDayDto$CountByMonth">
+    <select id="countByMonth" resultType="com.xy.dto.MercFeeCountDayDto$CountByMonthVO">
         SELECT parent_merc_id,
                merc_id,
                fee_type,

+ 2 - 2
device-api/src/main/java/com/xy/dto/MercFeeCountMonthDto.java

@@ -38,11 +38,11 @@ public class MercFeeCountMonthDto {
     @Accessors(chain = true)
     public static class Page extends Vo {
         @ApiModelProperty(value = "月份-起")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd")
         private LocalDateTime beginTime;
 
         @ApiModelProperty(value = "月份-止")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd")
         private LocalDateTime endTime;
 
         @ApiModelProperty(value = "分页对象", required = true)