From 8df4e7b7fd304ce185486d22021f51da325781d5 Mon Sep 17 00:00:00 2001
From: liam <2075995406@qq.com>
Date: Mon, 28 Aug 2023 13:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=85=E6=A5=9A=E8=BD=AC?=
 =?UTF-8?q?=E9=A1=B9=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/zongzhi/domain/TcQlzxxdsj.java  |  7 ++++--
 .../mapper/zongzhi/TcQlzxxdsjMapper.xml       | 22 +++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

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">
 <mapper namespace="com.ruoyi.zongzhi.mapper.TcQlzxxdsjMapper">
-    
+
     <resultMap type="TcQlzxxdsj" id="TcQlzxxdsjResult">
         <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">
         <include refid="selectTcQlzxxdsjVo"/>
-        <where>  
+        <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>
-    
+
     <select id="selectTcQlzxxdsjById" parameterType="Long" resultMap="TcQlzxxdsjResult">
         <include refid="selectTcQlzxxdsjVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTcQlzxxdsj" parameterType="TcQlzxxdsj" useGeneratedKeys="true" keyProperty="id">
         insert into tc_qlzxxdsj
         <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}
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTcQlzxxdsjByIds" parameterType="String">
-        delete from tc_qlzxxdsj where id in 
+        delete from tc_qlzxxdsj where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>