diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQlzxxdsj.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQlzxxdsj.java index eb6f8e8..ef66124 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQlzxxdsj.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQlzxxdsj.java @@ -1,5 +1,7 @@ package com.ruoyi.zongzhi.domain; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -9,6 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 清郎专项行动数据统计对象 tc_qlzxxdsj @@ -43,8 +46,8 @@ public class TcQlzxxdsj extends BaseEntity { * 年月 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "年月", width = 30, dateFormat = "yyyy-MM-dd") - private Date yearMonth; + @DateTimeFormat(pattern="yyyy-MM-dd ") + private Date monthYear; /** * 数量 diff --git a/ruoyi-system/src/main/resources/mapper/zongzhi/TcQlzxxdsjMapper.xml b/ruoyi-system/src/main/resources/mapper/zongzhi/TcQlzxxdsjMapper.xml index 7f8b4ff..8d015ab 100644 --- a/ruoyi-system/src/main/resources/mapper/zongzhi/TcQlzxxdsjMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/zongzhi/TcQlzxxdsjMapper.xml @@ -3,46 +3,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + - select id, area_id, type, year_month, count from tc_qlzxxdsj + select id, area_id, type, month_year, count from tc_qlzxxdsj - + - + insert into tc_qlzxxdsj area_id, type, - year_month, + month_year, count, #{areaId}, #{type}, - #{yearMonth}, + #{monthYear}, #{count}, @@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" area_id = #{areaId}, type = #{type}, - year_month = #{yearMonth}, + month_year = #{monthYear}, count = #{count}, where id = #{id} @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from tc_qlzxxdsj where id in + delete from tc_qlzxxdsj where id in #{id}