电子及人工督察单查询增加编号筛选

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DataJinganAnalysisController.java

@@ -27,6 +27,7 @@ public class DataJinganAnalysisController {
      *
      * @param startTime  开始时间
      * @param endTime  结束时间
+     * @param superviseCode  督察单编号
      * @param id  主键ID
      * @param handleStatus  处理状态
      * @param pageNum      当前页
@@ -36,12 +37,12 @@ public class DataJinganAnalysisController {
     @GetMapping("analysisList")
     public ApiResult<CommonPage<DataJinganAnalysis>> analysisList(@RequestParam(value = "startTime", required = false) String startTime,
                                                                   @RequestParam(value = "endTime", required = false) String endTime,
+                                                                  @RequestParam(value = "endTime", required = false) String superviseCode,
                                                                   @RequestParam(value = "id", required = false) Integer id,
                                                                   @RequestParam(value = "handleStatus", required = false) Integer handleStatus,
                                                                   @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                                   @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(dataJinganAnalysisService.analysisList(startTime,endTime,id,handleStatus,pageNum,
-                pageSize));
+        return ApiResult.success(dataJinganAnalysisService.analysisList(startTime,endTime,superviseCode,id, handleStatus,pageNum, pageSize));
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DataJinganPersonController.java

@@ -31,6 +31,7 @@ public class DataJinganPersonController {
      *
      * @param startTime  开始时间
      * @param endTime  结束时间
+     * @param artificialCode  督察单编号
      * @param id  主键ID
      * @param handleStatus  处理状态
      * @param pageNum      当前页
@@ -40,11 +41,13 @@ public class DataJinganPersonController {
     @GetMapping("personList")
     public ApiResult<CommonPage<DataJinganPerson>> personList(@RequestParam(value = "startTime", required = false) String startTime,
                                                               @RequestParam(value = "endTime", required = false) String endTime,
+                                                              @RequestParam(value = "endTime", required = false) String artificialCode,
                                                               @RequestParam(value = "id", required = false) Integer id,
                                                               @RequestParam(value = "handleStatus", required = false) Integer handleStatus,
                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(dataJinganPersonService.personList(startTime,endTime,id,handleStatus,pageNum, pageSize));
+        return ApiResult.success(dataJinganPersonService.personList(startTime,endTime,artificialCode,id,handleStatus,
+                pageNum, pageSize));
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DataJinganAnalysisService.java

@@ -19,13 +19,15 @@ public interface DataJinganAnalysisService extends CrudService<DataJinganAnalysi
      *
      * @param startTime  开始时间
      * @param endTime  结束时间
+     * @param superviseCode  督察单编号
      * @param id  主键ID
      * @param handleStatus  处理状态
      * @param pageNum      当前页
      * @param pageSize     每页条数
      * @return
      */
-    CommonPage<DataJinganAnalysis> analysisList(String startTime, String endTime,Integer id, Integer handleStatus, Integer pageNum, Integer pageSize);
+    CommonPage<DataJinganAnalysis> analysisList(String startTime, String endTime,String superviseCode,Integer id,
+                                                Integer handleStatus, Integer pageNum, Integer pageSize);
 
     void update(DataJinganAnalysis dataJinganAnalysis);
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DataJinganPersonService.java

@@ -19,13 +19,14 @@ public interface DataJinganPersonService extends CrudService<DataJinganPerson> {
      *
      * @param startTime  开始时间
      * @param endTime  结束时间
+     * @param artificialCode  督察单编号
      * @param id  主键ID
      * @param handleStatus  处理状态
      * @param pageNum      当前页
      * @param pageSize     每页条数
      * @return
      */
-    CommonPage<DataJinganPerson> personList(String startTime, String endTime,Integer id, Integer handleStatus, Integer pageNum, Integer pageSize);
+    CommonPage<DataJinganPerson> personList(String startTime, String endTime,String artificialCode,Integer id, Integer handleStatus, Integer pageNum, Integer pageSize);
 
     void update(DataJinganPerson dataJinganPerson);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DataJinganAnalysisServiceImpl.java

@@ -30,13 +30,14 @@ import java.util.List;
 public class DataJinganAnalysisServiceImpl extends AbstractCrudService<DataJinganAnalysisMapper, DataJinganAnalysis> implements DataJinganAnalysisService {
 
     @Override
-    public CommonPage<DataJinganAnalysis> analysisList(String startTime, String endTime,Integer id,
+    public CommonPage<DataJinganAnalysis> analysisList(String startTime, String endTime, String superviseCode,Integer id,
                                                        Integer handleStatus, Integer pageNum, Integer pageSize) {
         IPage<DataJinganAnalysis> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DataJinganAnalysis> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DataJinganAnalysis::getTenantId, SecurityUtils.getTenantId())
                 .eq(null != handleStatus,DataJinganAnalysis::getHandleStatus, handleStatus)
                 .eq(null != id,DataJinganAnalysis::getId, id)
+                .like(StringUtils.isNotBlank(superviseCode),DataJinganAnalysis::getSuperviseCode,superviseCode)
                 .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime),
                         DataJinganAnalysis::getTimestamp, startTime, endTime)
                 .orderByDesc(DataJinganAnalysis::getId);

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DataJinganPersonServiceImpl.java

@@ -27,12 +27,13 @@ import java.time.LocalDateTime;
 @Service
 public class DataJinganPersonServiceImpl extends AbstractCrudService<DataJinganPersonMapper, DataJinganPerson> implements DataJinganPersonService {
     @Override
-    public CommonPage<DataJinganPerson> personList(String startTime, String endTime,Integer id, Integer handleStatus, Integer pageNum, Integer pageSize) {
+    public CommonPage<DataJinganPerson> personList(String startTime, String endTime,String artificialCode,Integer id, Integer handleStatus, Integer pageNum, Integer pageSize) {
         IPage<DataJinganPerson> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DataJinganPerson> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DataJinganPerson::getTenantId, SecurityUtils.getTenantId())
                 .eq(null != handleStatus,DataJinganPerson::getHandleStatus, handleStatus)
                 .eq(null != id,DataJinganPerson::getId, id)
+                .like(StringUtils.isNotBlank(artificialCode),DataJinganPerson::getArtificialCode,artificialCode)
                 .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime),
                         DataJinganPerson::getTimestamp, startTime, endTime)
                 .orderByDesc(DataJinganPerson::getId);