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 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}, '%')) + + and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') + + + 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 <= 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()))) + + + and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y') + and DATE_FORMAT(create_time, '%Y-%m') = #{dateSearch}