值班查岗-列表查询调整

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/BaseCompanyMapper.java

@@ -2,6 +2,7 @@ package com.usky.fire.mapper;
 
 import com.usky.fire.domain.BaseCompany;
 import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author JCB
  * @since 2022-08-23
  */
+@Repository
 public interface BaseCompanyMapper extends CrudMapper<BaseCompany> {
 
 }

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

@@ -1,5 +1,6 @@
 package com.usky.fire.service.impl;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -7,7 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.domain.BaseCompany;
 import com.usky.fire.domain.BaseCompanyPerson;
+import com.usky.fire.mapper.BaseCompanyMapper;
 import com.usky.fire.mapper.BaseCompanyPersonMapper;
 import com.usky.fire.mapper.MhPostInspectMapper;
 import com.usky.fire.service.BaseCompanyPersonService;
@@ -16,10 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -38,30 +38,43 @@ public class BaseCompanyPersonServiceImpl extends AbstractCrudService<BaseCompan
     @Autowired
     private MhPostInspectMapper mhPostInspectMapper;
 
+    @Autowired
+    private BaseCompanyMapper baseCompanyMapper;
+
     @Override
     public CommonPage<BaseCompanyPerson> baseCompanyPersonList(String companyCode, String companyName, Integer pageNum, Integer pageSize) {
-//        List<String> companyIdList = baseUserCompanyService.companyIdList();
+        IPage<BaseCompany> page1 = new Page<>(pageNum, pageSize);
         IPage<BaseCompanyPerson> page = new Page<>(pageNum, pageSize);
-//        if (CollectionUtils.isNotEmpty(companyIdList)) {
-        LambdaQueryWrapper<BaseCompanyPerson> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(companyCode), BaseCompanyPerson::getCompanyCode, companyCode)
-                .like(StringUtils.isNotBlank(companyName), BaseCompanyPerson::getCompanyName, companyName)
-//                    .in(BaseCompanyPerson::getCompanyId, companyIdList)
-                .orderByDesc(BaseCompanyPerson::getId);
-        page = this.page(page, queryWrapper);
-        if (page.getTotal() > 0) {
-            List<BaseCompanyPerson> baseCompanyPeople = mhPostInspectMapper.inspectStatistics(null);
-            for (int i = 0; i < page.getRecords().size(); i++) {
-                for (int j = 0; j < baseCompanyPeople.size(); j++) {
-                    if (page.getRecords().get(i).getCompanyId().equals(baseCompanyPeople.get(j).getCompanyId())) {
-                        page.getRecords().get(i).setInspectCount(baseCompanyPeople.get(j).getInspectCount());
-                        page.getRecords().get(i).setAnswerCount(baseCompanyPeople.get(j).getAnswerCount());
-                        page.getRecords().get(i).setInspectTime(baseCompanyPeople.get(j).getInspectTime());
+        LambdaQueryWrapper<BaseCompany> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.select(BaseCompany::getCompanyId)
+                .eq(BaseCompany::getEnable,0)
+                .like(StringUtils.isNotBlank(companyCode), BaseCompany::getCompanyCode, companyCode)
+                .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName)
+                .orderByDesc(BaseCompany::getId);
+        page1 = baseCompanyMapper.selectPage(page1, queryWrapper1);
+        if (CollectionUtils.isNotEmpty(page1.getRecords())){
+            List<String> companyIdList = new ArrayList<>();
+            for (int i = 0; i < page1.getRecords().size(); i++) {
+                companyIdList.add(page1.getRecords().get(i).getCompanyId());
+            }
+            LambdaQueryWrapper<BaseCompanyPerson> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.in(BaseCompanyPerson::getCompanyId, companyIdList)
+                    .orderByDesc(BaseCompanyPerson::getId);
+            page = this.page(page, queryWrapper);
+            if (page.getTotal() > 0) {
+                List<BaseCompanyPerson> baseCompanyPeople = mhPostInspectMapper.inspectStatistics(null);
+                for (int i = 0; i < page.getRecords().size(); i++) {
+                    for (int j = 0; j < baseCompanyPeople.size(); j++) {
+                        if (page.getRecords().get(i).getCompanyId().equals(baseCompanyPeople.get(j).getCompanyId())) {
+                            page.getRecords().get(i).setInspectCount(baseCompanyPeople.get(j).getInspectCount());
+                            page.getRecords().get(i).setAnswerCount(baseCompanyPeople.get(j).getAnswerCount());
+                            page.getRecords().get(i).setInspectTime(baseCompanyPeople.get(j).getInspectTime());
+                        }
                     }
                 }
             }
+
         }
-//        }
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
     }