处理--年度计划审核导出数据与列表不一致

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -188,8 +188,7 @@ public class PlanYearsController extends BaseController {
     @PostMapping("/exportPlanExamine")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.EXPORT)
     public void exportPlanExamine(HttpServletResponse response, @RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) throws Exception {
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        List<PlanYearsResponseVo> list = planYearsService.selectPlanYearsExamineListEXP(yearsStandardVo, loginUser);
+        List<PlanYearsResponseVo> list = planYearsService.selectPlanYearsExamineListEXP(yearsStandardVo);
         InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/plan_year.xlsx");
         OutputStream outputStream = null;
         try {

purchase-system/src/main/java/com/ozs/plan/service/PlanYearsService.java

@@ -38,7 +38,7 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public List<PlanYearsResponseVo> selectPlanYearsExamineListEXP(PlanYearsStandardVo vo, LoginUser loginUser);
+    public List<PlanYearsResponseVo> selectPlanYearsExamineListEXP(PlanYearsStandardVo vo);
 
     /**
      * 创建年度计划

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -156,53 +156,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     }
 
     @Override
-    public List<PlanYearsResponseVo> selectPlanYearsExamineListEXP(PlanYearsStandardVo vo, LoginUser loginUser) {
-        List<PlanYears> list = new ArrayList<>();
-        List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
+    public List<PlanYearsResponseVo> selectPlanYearsExamineListEXP(PlanYearsStandardVo vo) {
+        List<PlanYears> list = null;
         try {
-            int num = 1;
-            int size = 200;
-            while (size == 200) {
-                LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
-                if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
-                    lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                }
-                if (!ObjectUtils.isEmpty(vo.getProjectName())) {
-                    lw.like(PlanYears::getProjectName, vo.getProjectName());
-                }
-                if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
-                    lw.eq(PlanYears::getPurchaseServices, vo.getPurchaseServices());
-                }
-                if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
-                    lw.eq(PlanYears::getProjectStatus, vo.getProjectStatus());
-                } else {
-                    lw.in(PlanYears::getProjectStatus, "1,2,3");
-                }
-                if (!ObjectUtils.isEmpty(vo.getParams())) {
-                    if (!ObjectUtils.isEmpty(vo.getParams().get("beginTime"))) {
-                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM");
-                        Date ofMonth = dateFormat.parse(vo.getParams().get("beginTime").toString() + "-01");
-                        lw.ge(PlanYears::getPlanDemandSubTime, ofMonth);
-                    }
-                    if (!ObjectUtils.isEmpty(vo.getParams().get("endTime"))) {
-                        SimpleDateFormat dateFormaH = new SimpleDateFormat("yyyy-MM");
-                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                        SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-                        Date ofMonth = DateUtils.getLastDayOfMonth(dateFormaH.parse(vo.getParams().get("endTime").toString()));
-                        Date parse = dateFormatT.parse(dateFormat.format(ofMonth) + " 23:59:59:999");
-                        lw.le(PlanYears::getPlanDemandSubTime, parse);
-                    }
-                }
-                lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
-                Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
-                list.addAll(page.getRecords());
-                size = page.getRecords().size();
-                num++;
-            }
-            planYearsList = changeTo(list);
-        } catch (Exception e) {
+            list = queryPage(vo);
+        } catch (ParseException e) {
             e.printStackTrace();
         }
+        List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
+        planYearsList = changeTo(list);
         return planYearsList;
     }