处理--类型不同导致的未成功赋值

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

@@ -215,7 +215,8 @@ public class PlanQuarterController extends BaseController {
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('plan:quarter:exportPlan')")
     @PostMapping("/exportPlan")
-    public void exportPlan(HttpServletResponse response, @RequestBody PlanQuarterStandardVo quarterStandardVo, LoginUser loginUser) throws Exception {
+    public void exportPlan(HttpServletResponse response, @RequestBody PlanQuarterStandardVo quarterStandardVo, HttpServletRequest request) throws Exception {
+        LoginUser loginUser = tokenService.getLoginUser(request);
         List<PlanQuarterResponseVo> list = quarterService.selectPlanQuarterListEXP(quarterStandardVo, loginUser);
         ExcelUtil<PlanQuarterResponseVo> util = new ExcelUtil<>(PlanQuarterResponseVo.class);
         util.exportExcel(response, list, "季度计划数据");
@@ -225,8 +226,9 @@ public class PlanQuarterController extends BaseController {
     @PostMapping("/exportPlanExamine")
     @PreAuthorize("@ss.hasPermi('plan:quarter:exportPlanExamine')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.EXPORT)
-    public void exportPlanExamine(HttpServletResponse response, @RequestBody PlanQuarterStandardVo quarterStandardVo) throws Exception {
-        List<PlanQuarterResponseVo> list = quarterService.selectPlanQuarterExamineListEXP(quarterStandardVo);
+    public void exportPlanExamine(HttpServletResponse response, @RequestBody PlanQuarterStandardVo quarterStandardVo, HttpServletRequest request) throws Exception {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        List<PlanQuarterResponseVo> list = quarterService.selectPlanQuarterExamineListEXP(quarterStandardVo, loginUser);
         ExcelUtil<PlanQuarterResponseVo> util = new ExcelUtil<>(PlanQuarterResponseVo.class);
         util.exportExcel(response, list, "季度计划数据(审核单位)");
     }

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

@@ -215,8 +215,9 @@ public class PlanYearsController extends BaseController {
     @PostMapping("/exportPlan")
     @PreAuthorize("@ss.hasPermi('plan:planYears:exportPlan')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.EXPORT)
-    public void exportPlan(HttpServletResponse response, @RequestBody PlanYearsStandardVo yearsStandardVo) throws Exception {
-        List<PlanYearsResponseVo> list = planYearsService.selectPlanYearsListEXP(yearsStandardVo);
+    public void exportPlan(HttpServletResponse response, @RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) throws Exception {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        List<PlanYearsResponseVo> list = planYearsService.selectPlanYearsListEXP(yearsStandardVo, loginUser);
         ExcelUtil<PlanYearsResponseVo> util = new ExcelUtil<>(PlanYearsResponseVo.class);
         util.exportExcel(response, list, "年度计划数据");
     }
@@ -225,8 +226,9 @@ public class PlanYearsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('plan:planYears:exportPlanExamine')")
     @PostMapping("/exportPlanExamine")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.EXPORT)
-    public void exportPlanExamine(HttpServletResponse response, @RequestBody PlanYearsStandardVo yearsStandardVo) throws Exception {
-        List<PlanYearsResponseVo> list = planYearsService.selectPlanYearsExamineListEXP(yearsStandardVo);
+    public void exportPlanExamine(HttpServletResponse response, @RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) throws Exception {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        List<PlanYearsResponseVo> list = planYearsService.selectPlanYearsExamineListEXP(yearsStandardVo, loginUser);
         ExcelUtil<PlanYearsResponseVo> util = new ExcelUtil<>(PlanYearsResponseVo.class);
         util.exportExcel(response, list, "年度计划数据(审核单位)");
     }

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

@@ -33,7 +33,7 @@ public interface PlanQuarterService extends IService<PlanQuarter> {
      * @param vo 季度计划请求对象
      * @return 季度计划记录集合
      */
-    public List<PlanQuarterResponseVo> selectPlanQuarterExamineListEXP(PlanQuarterStandardVo vo);
+    public List<PlanQuarterResponseVo> selectPlanQuarterExamineListEXP(PlanQuarterStandardVo vo, LoginUser loginUser);
 
     /**
      * 创建季度计划

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

@@ -26,7 +26,7 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public List<PlanYearsResponseVo> selectPlanYearsListEXP(PlanYearsStandardVo vo);
+    public List<PlanYearsResponseVo> selectPlanYearsListEXP(PlanYearsStandardVo vo, LoginUser loginUser);
 
     /**
      * 查询年度计划记录集合(审核单位--导出）
@@ -34,7 +34,7 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public List<PlanYearsResponseVo> selectPlanYearsExamineListEXP(PlanYearsStandardVo vo);
+    public List<PlanYearsResponseVo> selectPlanYearsExamineListEXP(PlanYearsStandardVo vo, LoginUser loginUser);
 
     /**
      * 创建年度计划

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

@@ -156,7 +156,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     }
 
     @Override
-    public List<PlanQuarterResponseVo> selectPlanQuarterExamineListEXP(PlanQuarterStandardVo vo) {
+    public List<PlanQuarterResponseVo> selectPlanQuarterExamineListEXP(PlanQuarterStandardVo vo, LoginUser loginUser) {
         List<PlanQuarter> list = new ArrayList<>();
         List<PlanQuarterResponseVo> planQuarterList = new ArrayList<>();
         try {
@@ -185,6 +185,38 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
                 }
                 lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
+                // 添加数据权限
+                List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+                if (roleKeys.contains(Constants.DEMAND_UNIT)) {
+                    // 需求单位
+                    /*（purchase_dept_id = 当前用户deptID） */
+                    lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
+                } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
+                        || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
+                    // 采购管理部门  或  采购办
+                    SysDept sysDept = new SysDept();
+                    sysDept.setParentId(loginUser.getDeptId());
+                    sysDept.setStatus("0");
+                    List<Long> childDeptIds = deptService.selectDeptList(sysDept)
+                            .stream()
+                            .map(SysDept::getDeptId)
+                            .collect(Collectors.toList());
+                    if (ObjectUtils.isEmpty(childDeptIds)) {
+                        lw.and((wrapper) -> {
+                            wrapper.eq(PlanQuarter::getIsExcess, 0);
+                            wrapper.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
+                        });
+                    } else {
+                        lw.and((wrapper) -> {
+                            wrapper.eq(PlanQuarter::getIsExcess, 0);
+                            wrapper.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
+                        })
+                                .or((wrapper) -> {
+                                    wrapper.eq(PlanQuarter::getIsExcess, 1);
+                                    wrapper.in(PlanQuarter::getPurchaseDeptId, childDeptIds);
+                                });
+                    }
+                }
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<PlanQuarter>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();

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

@@ -122,7 +122,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     private SysFileRefService sysFileRefService;
 
     @Override
-    public List<PlanYearsResponseVo> selectPlanYearsListEXP(PlanYearsStandardVo vo) {
+    public List<PlanYearsResponseVo> selectPlanYearsListEXP(PlanYearsStandardVo vo, LoginUser loginUser) {
         List<PlanYears> list = new ArrayList<>();
         List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
         try {
@@ -149,6 +149,38 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
                 }
                 lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
+                // 添加数据权限
+                List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+                if (roleKeys.contains(Constants.DEMAND_UNIT)) {
+                    // 需求单位
+                    /*（purchase_dept_id = 当前用户deptID） */
+                    lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+                } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
+                        || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
+                    // 采购管理部门  或  采购办
+                    SysDept sysDept = new SysDept();
+                    sysDept.setParentId(loginUser.getDeptId());
+                    sysDept.setStatus("0");
+                    List<Long> childDeptIds = deptService.selectDeptList(sysDept)
+                            .stream()
+                            .map(SysDept::getDeptId)
+                            .collect(Collectors.toList());
+                    if (ObjectUtils.isEmpty(childDeptIds)) {
+                        lw.and((wrapper) -> {
+                            wrapper.eq(PlanYears::getIsExcess, 0);
+                            wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+                        });
+                    } else {
+                        lw.and((wrapper) -> {
+                            wrapper.eq(PlanYears::getIsExcess, 0);
+                            wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+                        })
+                                .or((wrapper) -> {
+                                    wrapper.eq(PlanYears::getIsExcess, 1);
+                                    wrapper.in(PlanYears::getPurchaseDeptId, childDeptIds);
+                                });
+                    }
+                }
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -162,7 +194,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     }
 
     @Override
-    public List<PlanYearsResponseVo> selectPlanYearsExamineListEXP(PlanYearsStandardVo vo) {
+    public List<PlanYearsResponseVo> selectPlanYearsExamineListEXP(PlanYearsStandardVo vo, LoginUser loginUser) {
         List<PlanYears> list = new ArrayList<>();
         List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
         try {
@@ -191,6 +223,38 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
                 }
                 lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
+                // 添加数据权限
+                List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+                if (roleKeys.contains(Constants.DEMAND_UNIT)) {
+                    // 需求单位
+                    /*（purchase_dept_id = 当前用户deptID） */
+                    lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+                } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
+                        || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
+                    // 采购管理部门  或  采购办
+                    SysDept sysDept = new SysDept();
+                    sysDept.setParentId(loginUser.getDeptId());
+                    sysDept.setStatus("0");
+                    List<Long> childDeptIds = deptService.selectDeptList(sysDept)
+                            .stream()
+                            .map(SysDept::getDeptId)
+                            .collect(Collectors.toList());
+                    if (ObjectUtils.isEmpty(childDeptIds)) {
+                        lw.and((wrapper) -> {
+                            wrapper.eq(PlanYears::getIsExcess, 0);
+                            wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+                        });
+                    } else {
+                        lw.and((wrapper) -> {
+                            wrapper.eq(PlanYears::getIsExcess, 0);
+                            wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+                        })
+                                .or((wrapper) -> {
+                                    wrapper.eq(PlanYears::getIsExcess, 1);
+                                    wrapper.in(PlanYears::getPurchaseDeptId, childDeptIds);
+                                });
+                    }
+                }
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -850,6 +914,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         if (!ObjectUtils.isEmpty(demandRes) && demandRes.size() > 0) {
             for (PmDemandResVo demandResVo : demandRes) {
                 HomeToDoQueryResVo home = new HomeToDoQueryResVo();
+                home.setEvaluation(BigDecimal.valueOf(demandResVo.getEvaluation()));
                 BeanUtils.copyProperties(demandResVo, home);
                 homeRes.add(home);
             }
@@ -876,6 +941,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         if (!ObjectUtils.isEmpty(demandRes) && demandRes.size() > 0) {
             for (PmDemandResVo demandResVo : demandRes) {
                 HomeToDoQueryResVo home = new HomeToDoQueryResVo();
+                home.setEvaluation(BigDecimal.valueOf(demandResVo.getEvaluation()));
                 BeanUtils.copyProperties(demandResVo, home);
                 homeRes.add(home);
             }

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ozs.pm.service.impl;
 
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.util.*;
@@ -1537,9 +1538,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         List<PlanQuarterResponseVo> planRes = planYearsService.willSendLetter();
         //转为首页table展示数据
         if (!ObjectUtils.isEmpty(demandRes) && demandRes.size() > 0) {
-            for (PmDemandResVo demandResVoVo : demandRes) {
+            for (PmDemandResVo demandResVo : demandRes) {
                 HomeToDoQueryResVo home = new HomeToDoQueryResVo();
-                BeanUtils.copyProperties(demandResVoVo, home);
+                home.setEvaluation(BigDecimal.valueOf(demandResVo.getEvaluation()));
+                BeanUtils.copyProperties(demandResVo, home);
                 homeRes.add(home);
             }
         }