修改清楚转项字段名称

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;
 
     /**
      * 数量

ruoyi-system/src/main/resources/mapper/zongzhi/TcQlzxxdsjMapper.xml

@@ -8,12 +8,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="areaId"    column="area_id"    />
         <result property="type"    column="type"    />
-        <result property="yearMonth"    column="year_month"    />
+        <result property="monthYear"    column="month_year"    />
         <result property="count"    column="count"    />
     </resultMap>
 
     <sql id="selectTcQlzxxdsjVo">
-        select id, area_id, type, year_month, count from tc_qlzxxdsj
+        select id, area_id, type, month_year, count from tc_qlzxxdsj
     </sql>
 
     <select id="selectTcQlzxxdsjList" parameterType="TcQlzxxdsj" resultMap="TcQlzxxdsjResult">
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="areaId != null "> and area_id = #{areaId}</if>
             <if test="type != null "> and type = #{type}</if>
-            <if test="yearMonth != null "> and year_month = #{yearMonth}</if>
+            <if test="monthYear != null "> and month_year = #{monthYear}</if>
             <if test="count != null "> and count = #{count}</if>
         </where>
     </select>
@@ -36,13 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaId != null">area_id,</if>
             <if test="type != null">type,</if>
-            <if test="yearMonth != null">year_month,</if>
+            <if test="monthYear != null">month_year,</if>
             <if test="count != null">count,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="areaId != null">#{areaId},</if>
             <if test="type != null">#{type},</if>
-            <if test="yearMonth != null">#{yearMonth},</if>
+            <if test="monthYear != null">#{monthYear},</if>
             <if test="count != null">#{count},</if>
          </trim>
     </insert>
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaId != null">area_id = #{areaId},</if>
             <if test="type != null">type = #{type},</if>
-            <if test="yearMonth != null">year_month = #{yearMonth},</if>
+            <if test="monthYear != null">month_year = #{monthYear},</if>
             <if test="count != null">count = #{count},</if>
         </trim>
         where id = #{id}