轮播留存一周/通知搜索条件增加单位，计划名称(后)

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementInspectionProgramController.java

@@ -69,12 +69,22 @@ public class AppEnforcementInspectionProgramController extends BaseController
     @ResponseBody
     public TableDataInfo queryListNoPermission(EnforcementInspectionProgram enforcementInspectionProgram)
     {
-        startPage();
         List<EnforcementInspectionProgram> list =
                 enforcementInspectionProgramService.selectEnforcementInspectionProgramListNoPermission(enforcementInspectionProgram);
         return getDataTable(list);
     }
 
+    /**
+     * 查询执法检查计划列表不分页
+     */
+//    @RequiresPermissions("code:enforcementInspectionProgram:queryList")
+    @GetMapping("/queryListNoPermissionNoPaging")
+    @ResponseBody
+    public ZDResponse queryListNoPermissionNoPaging(EnforcementInspectionProgram enforcementInspectionProgram)
+    {
+        return ZDResponse.success("成功", enforcementInspectionProgramService.selectEnforcementInspectionProgramListNoPermission(enforcementInspectionProgram));
+    }
+
 
     /**
      * 新增执法检查计划

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java

@@ -31,7 +31,7 @@ public class EnforcementInspectionProgram extends BaseDomain
     /** 执法部门ID */
     private String enforcementDepartmentId;
 
-    /** 执法时间 */
+    /** 上传时间 */
     private String  enforcementTime;
 
     /** 执法区域 */
@@ -70,6 +70,11 @@ public class EnforcementInspectionProgram extends BaseDomain
      */
     private String searchText;
 
+    /**
+     * 类型搜索 notice/plan
+     */
+    private String searchType;
+
     /**
      * 日期搜索
      */
@@ -77,7 +82,7 @@ public class EnforcementInspectionProgram extends BaseDomain
 
 
     /**
-     *  日期快捷查询 1 本月 2 本季度 3 本年
+     *  日期快捷查询 1 本月 2 本季度 3 本年 4 本周
      */
     private Integer dateType;
 
@@ -253,6 +258,14 @@ public class EnforcementInspectionProgram extends BaseDomain
         this.bureauDeptName = bureauDeptName;
     }
 
+    public String getSearchType() {
+        return searchType;
+    }
+
+    public void setSearchType(String searchType) {
+        this.searchType = searchType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml

@@ -42,11 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
             <if test="isPublish != null "> and is_publish = #{isPublish}</if>
-            <if test="searchText != null and searchText != ''">
+            <if test="searchText != null and searchText != ''and searchType =='plan'">
                 and (plan_name like concat('%', #{searchText}, '%')
                     or enforcement_department like concat('%', #{searchText}, '%')
                     or enforcement_area like concat('%', #{searchText}, '%'))
             </if>
+            <if test="searchText != null and searchText != '' and searchType =='notice'">
+                and (plan_name like concat('%', #{searchText}, '%')
+                or bureau_dept_name like concat('%', #{searchText}, '%'))
+            </if>
             <if test="dateType != null and dateType == 1">
                 and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
             </if>
@@ -67,6 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dateType != null and dateType == 3">
                 and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
             </if>
+            <if test="dateType != null and dateType == 4">
+                and date_sub(now(),interval 1 week) &lt; create_time
+            </if>
             <if test="dateSearch != null and dateSearch != ''">
                 and DATE_FORMAT(create_time, '%Y-%m') = #{dateSearch}
             </if>