执法端-新增查询条件，非行政查询接口开发

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpTaskController.java

@@ -46,11 +46,12 @@ public class AppEnfCpTaskController extends EfcodeCpTaskController {
      * @param planDate 计划执行日期（可选，格式 yyyy-MM-dd）
      * @return 任务列表
      */
+    @SaIgnore
     @GetMapping("/myList")
     public R<List<EfcodeCpTaskVo>> myList(
-            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date planDate,String searchValue) {
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date planDate,String searchValue,Integer dateType,String dateSearch) {
         Long userId = LoginHelper.getUserId();
-        List<EfcodeCpTaskVo> list = cpTaskService.queryMyTaskList(userId, planDate, searchValue);
+        List<EfcodeCpTaskVo> list = cpTaskService.queryMyTaskList(userId, planDate, searchValue, dateType, dateSearch);
         return R.ok(list);
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java

@@ -1,6 +1,5 @@
 package com.zdxt.enforcementcode.controller.app.enforcement;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import com.zdxt.enforcementcode.domain.bo.NonEnforcementRegistrationBo;
 import com.zdxt.enforcementcode.domain.vo.NonEnforcementRegistrationVo;
 import com.zdxt.enforcementcode.service.INonEnforcementRegistrationService;
@@ -27,8 +26,7 @@ public class AppNonEnforcementRegistrationController extends BaseController {
      */
     @PostMapping("/add")
     @ResponseBody
-    public R<Void> addSave(@RequestBody NonEnforcementRegistrationBo bo)
+    public R<Void> addSave(@RequestBody NonEnforcementRegistrationBo bo) {
-    {
 
         int result = enforcementRegistrationService.insertNonEnforcementRegistration(bo);
         return result > 0 ? R.ok() : R.fail("新增失败");
@@ -37,37 +35,32 @@ public class AppNonEnforcementRegistrationController extends BaseController {
     /**
      * 执法端-非行政查询执法登记列表(历史活动) - 分页
      */
-    @SaIgnore
     @GetMapping("/queryList")
-    public TableDataInfo<NonEnforcementRegistrationVo> queryList(NonEnforcementRegistrationBo bo, PageQuery pageQuery)
+    public TableDataInfo<NonEnforcementRegistrationVo> queryList(NonEnforcementRegistrationBo bo, PageQuery pageQuery) {
-    {
         return enforcementRegistrationService.queryPageList(bo, pageQuery);
     }
 
     /**
      * 执法端-非行政查询执法登记列表
-     * @param bo
-     * @param pageQuery
-     * @return
      */
-    @SaIgnore
-    @GetMapping("/list")
-    public TableDataInfo<NonEnforcementRegistrationVo> List(NonEnforcementRegistrationBo bo, PageQuery pageQuery)
-    {
-        bo.setLawEnforcerId(LoginHelper.getDeptId());
-        return enforcementRegistrationService.queryPageList(bo, pageQuery);
-    }
 
-    /**
-     * 执法端-非行政查询执法登记列表
-     */
-    @SaIgnore
     @GetMapping("/queryById")
-    public  R<NonEnforcementRegistrationVo>  queryById(String id)
+    public  R<NonEnforcementRegistrationVo>  queryById(String id) {
-    {
         NonEnforcementRegistrationVo registrations = enforcementRegistrationService.selectNonEnforcementRegistrationById(id);
         return R.ok(registrations);
     }
 
 
+    /**
+     * 执法端-非行政查询执法登记列表
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo<NonEnforcementRegistrationVo> List(NonEnforcementRegistrationBo bo, PageQuery pageQuery) {
+         bo.setLawEnforcerId(LoginHelper.getUserId().toString());
+        return enforcementRegistrationService.queryPageList(bo, pageQuery);
+    }
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntNonEnforcementRegistrationController.java

@@ -1,7 +1,6 @@
 package com.zdxt.enforcementcode.controller.app.enterprise;
 
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import com.zdxt.enforcementcode.domain.bo.NonEnforcementRegistrationBo;
 import com.zdxt.enforcementcode.domain.vo.NonEnforcementRegistrationVo;
 import com.zdxt.enforcementcode.service.INonEnforcementRegistrationService;
@@ -21,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/app-ent/NonEnfRegistraionInfo")
+@RequestMapping("/app-ent/nonEnfRegistraionInfo")
 public class AppEntNonEnforcementRegistrationController {
 
     @Autowired
@@ -33,21 +32,16 @@ public class AppEntNonEnforcementRegistrationController {
      * @param pageQuery
      * @return
      */
-    @SaIgnore
+    @GetMapping("/list")
-    @GetMapping("/queryList")
+    public TableDataInfo<NonEnforcementRegistrationVo> list(NonEnforcementRegistrationBo bo, PageQuery pageQuery) {
-    public TableDataInfo<NonEnforcementRegistrationVo> queryList(NonEnforcementRegistrationBo bo, PageQuery pageQuery)
-    {
-
         return enforcementRegistrationService.queryPageList(bo, pageQuery);
     }
 
     /**
      * 企业端-非行政查询执法登记明细
      */
-    @SaIgnore
     @GetMapping("/queryById")
-    public R<NonEnforcementRegistrationVo> queryById(String id)
+    public R<NonEnforcementRegistrationVo> queryById(String id) {
-    {
         NonEnforcementRegistrationVo registrations = enforcementRegistrationService.selectNonEnforcementRegistrationById(id);
         return R.ok(registrations);
     }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/RegistrationController.java

@@ -38,6 +38,7 @@ public class RegistrationController {
     /**
      * 接口1：涉企执法统计指标
      */
+    @SaIgnore
     @GetMapping("/statistics")
     public R<RegistrationStatisticsVo> statistics(EnforcementRegistrationBo bo) {
         return R.ok(registrationReport.statistics(bo));

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeBo.java

@@ -164,4 +164,11 @@ public class EfcodeCpNoticeBo extends BaseEntity {
      * 搜索值
      */
     private String searchValue;
+
+    private Integer dateType;
+
+    /**
+     * 日期搜索类型：year-年，quarter-季度，month-月，selectTime-自定义时间
+     */
+    private String dateSearch;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpReserveBo.java

@@ -107,4 +107,12 @@ public class EfcodeCpReserveBo extends BaseEntity {
 
     /** 预约是否已读 0：未读 1：已读 */
     private int isRead;
+
+    private Integer dateType;
+
+    /**
+     * 日期搜索类型：year-年，quarter-季度，month-月，selectTime-自定义时间
+     */
+    private String dateSearch;
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpTaskBo.java

@@ -39,4 +39,11 @@ public class EfcodeCpTaskBo extends BaseEntity {
     private String bureauDeptId;
 
     private int isRead;
+
+    private Integer dateType;
+
+    /**
+     * 日期搜索类型：year-年，quarter-季度，month-月，selectTime-自定义时间
+     */
+    private String dateSearch;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementEducationServicesBo.java

@@ -127,4 +127,15 @@ public class EnforcementEducationServicesBo extends BaseEntity {
      * 搜索值
      */
     private String searchValue;
+    /**
+     * 时间类型
+     */
+    private Integer dateType;
+
+
+    /**
+     * 日期搜索类型：year-年，quarter-季度，month-月，selectTime-自定义时间
+     */
+    private String dateSearch;
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java

@@ -22,7 +22,9 @@ public interface EfcodeCpReserveMapper extends BaseMapperPlus<EfcodeCpReserve, E
         @Param("resFrom") Long resFrom,
         @Param("opStatus") Long opStatus,
         @Param("currentUserId") String currentUserId,
-        @Param("searchValue") String searchValue
+        @Param("searchValue") String searchValue,
+        @Param("dateType") Integer dateType,
+        @Param("dateSearch") String dateSearch
     );
 
     /**

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpTaskMapper.java

@@ -23,7 +23,7 @@ public interface EfcodeCpTaskMapper extends BaseMapperPlus<EfcodeCpTask, EfcodeC
      * @param planDate 计划执行日期（可为null）
      * @return 任务列表
      */
-    List<EfcodeCpTaskVo> selectMyTaskList(@Param("userId") Long userId, @Param("planDate") Date planDate,@Param("searchValue") String searchValue);
+    List<EfcodeCpTaskVo> selectMyTaskList(@Param("userId") Long userId, @Param("planDate") Date planDate,@Param("searchValue") String searchValue,@Param("dateType") Integer dateType, @Param("dateSearch") String dateSearch);
 
     /**
      * 查询指定月份中有任务的日期列表（用于日历打点）

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpTaskService.java

@@ -79,7 +79,7 @@ public interface IEfcodeCpTaskService {
      * @param planDate 计划执行日期（可为null）
      * @return 任务列表
      */
-    List<EfcodeCpTaskVo> queryMyTaskList(Long userId, Date planDate,String searchValue);
+    List<EfcodeCpTaskVo> queryMyTaskList(Long userId, Date planDate,String searchValue,Integer dateType,String dateSearch);
 
     /**
      * 查询指定月份中有任务的日期列表（用于日历打点）

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java

@@ -319,6 +319,37 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService {
                 .or().like(StringUtils.isNotBlank(bo.getEnforceContent()), EfcodeCpNotice::getEnforceContent, sv)
             );
         }
+
+        // dateType - 时间范围查询
+        if (bo.getDateType() != null) {
+            if (bo.getDateType() == 1) {
+                // 本月
+                lqw.apply("DATE_FORMAT(enforce_date, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')");
+            } else if (bo.getDateType() == 2) {
+                // 本季度
+                lqw.apply("DATE_FORMAT(enforce_date, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', " +
+                    "CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01' " +
+                    "WHEN QUARTER(CURDATE()) IN (2) THEN '04' " +
+                    "WHEN QUARTER(CURDATE()) IN (3) THEN '07' " +
+                    "ELSE '10' END) " +
+                    "and DATE_FORMAT(enforce_date, '%Y-%m') <= CONCAT(YEAR(CURDATE()), '-', " +
+                    "CASE " +
+                    "WHEN QUARTER(CURDATE()) IN (1) THEN '03' " +
+                    "WHEN QUARTER(CURDATE()) IN (2) THEN '06' " +
+                    "WHEN QUARTER(CURDATE()) IN (3) THEN '09' " +
+                    "ELSE '12' " +
+                    "END)");
+            } else if (bo.getDateType() == 3) {
+                // 本年
+                lqw.apply("DATE_FORMAT(enforce_date, '%Y') = DATE_FORMAT(CURDATE(), '%Y')");
+            }
+        }
+
+        // dateSearch - 时间范围查询
+        if (StringUtils.isNotBlank(bo.getDateSearch())) {
+            lqw.apply("DATE_FORMAT(enforce_date, '%Y-%m') = {0}", bo.getDateSearch());
+        }
+
         return lqw;
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java

@@ -74,7 +74,9 @@ public class EfcodeCpReserveServiceImpl implements IEfcodeCpReserveService {
             bo.getResFrom(),
             bo.getOpStatus(),
             bo.getCreateBy() != null ? String.valueOf(bo.getCreateBy()) : null,
-            bo.getSearchValue()
+            bo.getSearchValue(),
+            bo.getDateType(),
+            bo.getDateSearch()
         );
         return TableDataInfo.build(result);
     }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpTaskServiceImpl.java

@@ -161,8 +161,8 @@ public class EfcodeCpTaskServiceImpl implements IEfcodeCpTaskService {
      * 查询我的任务列表
      */
     @Override
-    public List<EfcodeCpTaskVo> queryMyTaskList(Long userId, Date planDate,String searchValue) {
+    public List<EfcodeCpTaskVo> queryMyTaskList(Long userId, Date planDate,String searchValue,Integer dateType,String dateSearch) {
-        return baseMapper.selectMyTaskList(userId, planDate,searchValue);
+        return baseMapper.selectMyTaskList(userId, planDate,searchValue, dateType,dateSearch);
     }
 
     /**

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java

@@ -291,6 +291,36 @@ public class EnforcementEducationServicesServiceImpl implements IEnforcementEduc
             lqw.le(EnforcementEducationServices::getCreateTime, bo.getEndTime());
         }
 
+        // dateType 时间范围查询
+        if (bo.getDateType() != null) {
+            if (bo.getDateType() == 1) {
+                // 本月
+                lqw.apply("DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')");
+            } else if (bo.getDateType() == 2) {
+                // 本季度
+                lqw.apply("DATE_FORMAT(create_time, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', " +
+                    "CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01' " +
+                    "WHEN QUARTER(CURDATE()) IN (2) THEN '04' " +
+                    "WHEN QUARTER(CURDATE()) IN (3) THEN '07' " +
+                    "ELSE '10' END) " +
+                    "and DATE_FORMAT(create_time, '%Y-%m') <= CONCAT(YEAR(CURDATE()), '-', " +
+                    "CASE " +
+                    "WHEN QUARTER(CURDATE()) IN (1) THEN '03' " +
+                    "WHEN QUARTER(CURDATE()) IN (2) THEN '06' " +
+                    "WHEN QUARTER(CURDATE()) IN (3) THEN '09' " +
+                    "ELSE '12' " +
+                    "END)");
+            } else if (bo.getDateType() == 3) {
+                // 本年
+                lqw.apply("DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')");
+            }
+        }
+
+        // dateSearch - 时间范围查询
+        if (StringUtils.isNotBlank(bo.getDateSearch())) {
+            lqw.apply("DATE_FORMAT(create_time, '%Y-%m') = {0}", bo.getDateSearch());
+        }
+
         return lqw;
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml

@@ -63,6 +63,29 @@
                     OR p2.enterprise_name LIKE CONCAT('%', #{searchValue}, '%')
                 )
             </if>
+            <if test="dateType != null and dateType == 1">
+                and DATE_FORMAT(r.reserve_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+            </if>
+            <if test="dateType != null and dateType == 2">
+                AND DATE_FORMAT(r.reserve_time, '%Y-%m') &gt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01'
+                WHEN QUARTER(CURDATE()) IN (2) THEN '04'
+                WHEN QUARTER(CURDATE()) IN (3) THEN '07'
+                ELSE '10' END)
+                and DATE_FORMAT(r.reserve_time, '%Y-%m') &lt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE
+                WHEN QUARTER(CURDATE()) IN (1) THEN '03'
+                WHEN QUARTER(CURDATE()) IN (2) THEN '06'
+                WHEN QUARTER(CURDATE()) IN (3) THEN '09'
+                ELSE '12'
+                END)
+            </if>
+            <if test="dateType != null and dateType == 3">
+                and DATE_FORMAT(r.reserve_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
+            </if>
+            <if test="dateSearch != null and dateSearch != ''">
+                and DATE_FORMAT(r.reserve_time, '%Y-%m') = #{dateSearch}
+            </if>
         </where>
         ORDER BY r.reserve_time DESC
     </select>

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpTaskMapper.xml

@@ -44,7 +44,29 @@
                     OR p.enterprise_name LIKE CONCAT('%', #{searchValue}, '%')
                 )
             </if>
-
+            <if test="dateType != null and dateType == 1">
+                and DATE_FORMAT(p.create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+            </if>
+            <if test="dateType != null and dateType == 2">
+                AND DATE_FORMAT(p.create_time, '%Y-%m') &gt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01'
+                WHEN QUARTER(CURDATE()) IN (2) THEN '04'
+                WHEN QUARTER(CURDATE()) IN (3) THEN '07'
+                ELSE '10' END)
+                and DATE_FORMAT(p.create_time, '%Y-%m') &lt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE
+                WHEN QUARTER(CURDATE()) IN (1) THEN '03'
+                WHEN QUARTER(CURDATE()) IN (2) THEN '06'
+                WHEN QUARTER(CURDATE()) IN (3) THEN '09'
+                ELSE '12'
+                END)
+            </if>
+            <if test="dateType != null and dateType == 3">
+                and DATE_FORMAT(p.create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
+            </if>
+            <if test="dateSearch != null and dateSearch != ''">
+                and DATE_FORMAT(p.create_time, '%Y-%m') = #{dateSearch}
+            </if>
         </where>
         ORDER BY p.create_time DESC
     </select>