From 25c0b8c362a9ca6e5387ff243e54590c0f0dd930 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Sun, 2 Jun 2024 22:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9A=84=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/EnforcementInspectionProgram.java  | 14 ++++++++++++
 .../EnforcementInspectionProgramMapper.xml    | 22 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java
index 6de9cbd4..752d4fe1 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java
@@ -66,6 +66,12 @@ public class EnforcementInspectionProgram extends BaseDomain
      */
     private String dateSearch;
 
+
+    /**
+     *  日期快捷查询 1 本月 2 本季度 3 本年
+     */
+    private Integer dateType;
+
     /**
      * 文件对象
      */
@@ -90,6 +96,14 @@ public class EnforcementInspectionProgram extends BaseDomain
         }
     }
 
+    public Integer getDateType() {
+        return dateType;
+    }
+
+    public void setDateType(Integer dateType) {
+        this.dateType = dateType;
+    }
+
     public void setFileList(List<FileObject> fileList) {
         this.fileList = fileList;
     }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
index 4cf4db6e..f1d80ff2 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
@@ -42,6 +42,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     or enforcement_department like concat('%', #{searchText}, '%')
                     or enforcement_area like concat('%', #{searchText}, '%'))
             </if>
+            <if test="dateType != null and dateType == 1">
+                and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+            </if>
+            <if test="dateType != null and dateType == 2">
+                and create_time >= CONCAT(YEAR(CURDATE()), '-',
+                CASE WHEN QUARTER(CURDATE()) IN (1) THEN 2
+                WHEN QUARTER(CURDATE()) IN (2) THEN 4
+                WHEN QUARTER(CURDATE()) IN (3) THEN 7
+                ELSE 10 END, '-01')
+                and create_time &lt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE
+                WHEN QUARTER(CURDATE()) IN (1) THEN 3
+                WHEN QUARTER(CURDATE()) IN (2) THEN 6
+                WHEN QUARTER(CURDATE()) IN (3) THEN 9
+                ELSE 12
+                END,
+                '-',
+                DAY(LAST_DAY(CURDATE())))
+            </if>
+            <if test="dateType != null and dateType == 3">
+                and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
+            </if>
             <if test="dateSearch != null and dateSearch != ''">
                 and DATE_FORMAT(create_time, '%Y-%m') = #{dateSearch}
             </if>