Merge remote-tracking branch 'origin/master'

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

@@ -6,10 +6,12 @@ import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.enums.DataIsDelete;
 import com.ozs.common.utils.PageUtils;
+import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.web.service.TokenService;
@@ -37,9 +39,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 年度计划信息控制层
@@ -266,7 +266,6 @@ public class PlanYearsController extends BaseController {
         return success(planYearsService.count());
     }
 
-
     @ApiOperation("模板下载")
     @GetMapping("/downloaExcel")
     public void downloadZip(HttpServletResponse response) {
@@ -275,10 +274,30 @@ public class PlanYearsController extends BaseController {
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, "年度计划导入模板.xlsx");
             FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());
-
         } catch (Exception e) {
             log.error("下载文件失败", e);
         }
     }
 
+    @ApiOperation(value = "获取采购服务站")
+    @GetMapping("/getProcurementService")
+    // @PreAuthorize("@ss.hasPermi('plan:planYears:getProcurementService')")
+    @Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
+    public AjaxResult getProcurementService() {
+        //获取当前登录人的部门ID
+        LoginUser loginUser = getLoginUser();
+        if (StringUtils.isNull(loginUser) || StringUtils.isNull(loginUser.getDeptId())) {
+            return success("当前登陆过期，请重新登录！");
+        }
+        Long deptId = loginUser.getDeptId();
+        // 获取当前登陆人的部门名称
+        SysDept sysDept = iSysDeptService.selectById(deptId);
+        if (StringUtils.isNull(sysDept) || StringUtils.isNull(sysDept.getDeptName())) {
+            return success("当前登陆人没有部门信息，请核对数据！");
+        }
+        Map<String, String> map = new HashMap<>();
+        map.put("netVoidName", "网空采购站");
+        map.put("deptName", sysDept.getDeptName());
+        return success(map);
+    }
 }

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

@@ -579,6 +579,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 lw.eq(PmAuditDeptRef::getRefId, o.getPlanPracticalId());
                 lw.eq(PmAuditDeptRef::getRefType, "1");
                 List<PmAuditDeptRef> list = pmAuditDeptRefService.list(lw);
+
                 if (!ObjectUtils.isEmpty(list)) {
                     List<PmAuditDeptRef> collect = list.stream()
                             .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
@@ -586,7 +587,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     String deptLevel = collect.get(0).getDeptLevel();
                     boolean f = true;
                     f = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
-                    for (PmAuditDeptRef pmAuditDeptRef : collect) {
+                    for (PmAuditDeptRef pmAuditDeptRef : list) {
                         if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
                                 && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
                             f = false;

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

@@ -1225,18 +1225,24 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         List<PlanYears> planYears = planYearsMapper.query(vo);
         if (!ObjectUtils.isEmpty(planYears)) {
             planYears.stream().map(o -> {
+                // 当前年度计划的所有关联审核数据
                 LambdaQueryWrapper<PmAuditDeptRef> lw = new LambdaQueryWrapper();
                 lw.eq(PmAuditDeptRef::getRefId, o.getPlanYearId());
                 lw.eq(PmAuditDeptRef::getRefType, "0");
                 List<PmAuditDeptRef> list = pmAuditDeptRefService.list(lw);
+
+
                 if (!ObjectUtils.isEmpty(list)) {
+                    // 当地 年度计划 当前部门 的 审核数据
                     List<PmAuditDeptRef> collect = list.stream()
                             .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
                             .collect(Collectors.toList());
                     String deptLevel = collect.get(0).getDeptLevel();
+
                     boolean f = true;
                     f = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
-                    for (PmAuditDeptRef pmAuditDeptRef : collect) {
+
+                    for (PmAuditDeptRef pmAuditDeptRef : list) {
                         if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
                                 && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
                             f = false;

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

@@ -500,7 +500,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     String deptLevel = collect.get(0).getDeptLevel();
                     boolean f = true;
                     f = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
-                    for (PmAuditDeptRef pmAuditDeptRef : collect) {
+                    for (PmAuditDeptRef pmAuditDeptRef : list) {
                         if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
                                 && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
                             f = false;
@@ -517,7 +517,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 return o;
             }).collect(Collectors.toList());
         }
-        return null;
+        return provisionalPlanList;
     }
 
     private AjaxResult review(ProvisionalPlanVo vo) {