企业端进度查询bug

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

@@ -1,16 +1,21 @@
 package com.zdxt.app.controller;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSONObject;
 import com.zdxt.auth.dto.DictDataBean;
 import com.zdxt.auth.feign.DictDataApi;
 import com.zdxt.auth.feign.ZdxtFileCommonApi;
 import com.zdxt.code.domain.*;
+import com.zdxt.code.mapper.EnforcementRegistrationMapper;
 import com.zdxt.code.service.IEnforcementRegistrationService;
 import com.zdxt.code.service.IEnterpriseComplaintService;
 import com.zdxt.code.service.IEnterpriseLawEnforcementService;
 import com.zdxt.code.service.MssqApiService;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.Constants;
+import com.zdxt.common.util.ServletUtils;
 import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.util.TableDataInfo;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
@@ -26,10 +31,8 @@ import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 企业执法-在线投诉Controller
@@ -48,6 +51,9 @@ public class AppEnterpriseComplaintController extends BaseController {
     private ZdxtFileCommonApi zdxtFileCommonApi;
     @Autowired private DictDataApi dictDataApi;
     @Autowired private IEnforcementRegistrationService enforcementRegistrationService;
+
+    @Autowired
+    private EnforcementRegistrationMapper enforcementRegistrationMapper;
     @Autowired
     private MssqApiService mssqApiService;
 
@@ -75,9 +81,31 @@ public class AppEnterpriseComplaintController extends BaseController {
     @GetMapping("/queryList")
     @ResponseBody
     public TableDataInfo queryList(EnterpriseComplaint enterpriseComplaint) {
-        startPage();
         List<EnterpriseComplaint> list = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint);
-        return getDataTable(list);
+        //手动分页
+        List<EnterpriseComplaint> pageList = list.stream()
+                .skip(ServletUtils.getParameterToInt(Constants.PAGE_NUM))
+                .limit(ServletUtils.getParameterToInt(Constants.PAGE_SIZE))
+                .collect(Collectors.toList());
+        pageList.forEach(res ->{
+            if(StringUtils.isNotEmpty(res.getComplaintDepartments())){
+                String[] strings = Convert.toStrArray(res.getComplaintDepartments());
+                res.setComplaintDepartmentList(Arrays.asList(strings));
+            }
+        });
+        for (int i = 0; i < pageList.size(); i++) {
+            if(StringUtils.isNotEmpty(pageList.get(i).getRelId())){
+                EnforcementRegistration enforcementRegistration =
+                        enforcementRegistrationMapper.selectEnforcementRegistrationById(pageList.get(i).getRelId());
+                //判断检查事件是否为空
+                if(BeanUtil.isNotEmpty(enforcementRegistration) && StringUtils.isNotEmpty(enforcementRegistration.getLawEnforcementItemText())){
+                    pageList.get(i).setLawEnforcementIncident(enforcementRegistration.getLawEnforcementItemText());
+                }
+            }
+        }
+        TableDataInfo dataTable = getDataTable(list);
+        dataTable.setRows(pageList);
+        return dataTable;
     }
 
     /**

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java

@@ -141,22 +141,6 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
     {
         List<EnterpriseComplaint> enterpriseComplaints =
                 enterpriseComplaintMapper.selectEnterpriseComplaintNew(enterpriseComplaint);
-        enterpriseComplaints.forEach(res ->{
-            if(StringUtils.isNotEmpty(res.getComplaintDepartments())){
-                String[] strings = Convert.toStrArray(res.getComplaintDepartments());
-                res.setComplaintDepartmentList(Arrays.asList(strings));
-            }
-        });
-        for (int i = 0; i < enterpriseComplaints.size(); i++) {
-            if(StringUtils.isNotEmpty(enterpriseComplaints.get(i).getRelId())){
-                EnforcementRegistration enforcementRegistration =
-                        enforcementRegistrationMapper.selectEnforcementRegistrationById(enterpriseComplaints.get(i).getRelId());
-                //判断检查事件是否为空
-                if(BeanUtil.isNotEmpty(enforcementRegistration) && StringUtils.isNotEmpty(enforcementRegistration.getLawEnforcementItemText())){
-                    enterpriseComplaints.get(i).setLawEnforcementIncident(enforcementRegistration.getLawEnforcementItemText());
-                }
-            }
-        }
         return enterpriseComplaints;
     }