执法记录查询

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsPageReqVO.java

@@ -24,6 +24,18 @@ public class EnterpriseInspectionsPageReqVO extends PageParam {
     @Schema(description = "用户id", example = "1")
     private Long userId;
 
+    @Schema(description = "企业名称", example = "27002")
+    private String enterpriseName;
+
+    @Schema(description = "任务名称", example = "1")
+    private String taskName ;
+
+    @Schema(description = "企业名称", example = "27002")
+    private List<Long> enterpriseList;
+
+    @Schema(description = "任务名称", example = "1")
+    private List<Long> taskList;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/enterpriseinspections/EnterpriseInspectionsMapper.java

@@ -22,6 +22,8 @@ public interface EnterpriseInspectionsMapper extends BaseMapperX<EnterpriseInspe
                 .eqIfPresent(EnterpriseInspectionsDO::getTaskId, reqVO.getTaskId())
                 .eqIfPresent(EnterpriseInspectionsDO::getEnterpriseId, reqVO.getEnterpriseId())
                 .betweenIfPresent(EnterpriseInspectionsDO::getCreateTime, reqVO.getCreateTime())
+                .inIfPresent(EnterpriseInspectionsDO::getEnterpriseId, reqVO.getEnterpriseList())
+                .inIfPresent(EnterpriseInspectionsDO::getTaskId, reqVO.getTaskList())
                 .orderByDesc(EnterpriseInspectionsDO::getId));
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java

@@ -23,6 +23,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
+
 import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.*;
 import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -146,6 +148,26 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
     @Override
     public PageResult<EnterpriseInspectionsDO> getEnterpriseInspectionsPage(EnterpriseInspectionsPageReqVO pageReqVO) {
 
+        if (pageReqVO.getEnterpriseName() != null) {
+            LambdaQueryWrapper<EnterpriseDO> wrapper = new LambdaQueryWrapper<>();
+            wrapper.like(EnterpriseDO::getEnterprisesName, pageReqVO.getEnterpriseName());
+            final List<EnterpriseDO> enterpriseDOS = enterpriseMapper.selectList(wrapper);
+            if (enterpriseDOS != null || enterpriseDOS.size() > 0) {
+                final List<Long> collect = enterpriseDOS.stream().map(item -> item.getId()).collect(Collectors.toList());
+                pageReqVO.setEnterpriseList(collect);
+            }
+        }
+
+        if (pageReqVO.getTaskName() != null) {
+            LambdaQueryWrapper<TaskInfoDO> wrapper = new LambdaQueryWrapper<>();
+            wrapper.like(TaskInfoDO::getTitle, pageReqVO.getTaskName());
+            final List<TaskInfoDO> taskInfoDOS = taskInfoMapper.selectList(wrapper);
+            if (taskInfoDOS != null || taskInfoDOS.size() > 0) {
+                final List<Long> collect = taskInfoDOS.stream().map(item -> item.getId()).collect(Collectors.toList());
+                pageReqVO.setTaskList(collect);
+            }
+        }
+
         final PageResult<EnterpriseInspectionsDO> enterpriseInspectionsDOPageResult = enterpriseInspectionsMapper.selectPage(pageReqVO);
         if ( enterpriseInspectionsDOPageResult.getList() != null && enterpriseInspectionsDOPageResult.getList().size() > 0 ) {
             enterpriseInspectionsDOPageResult.getList().forEach(item->{