Merge branch 'master' into prod

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

@@ -232,6 +232,16 @@ public class PlanYearsController extends BaseController {
         return planYearsService.update(yearsStandardVo);
     }
 
+    @ApiOperation(value = "修改年度计划的机关业务指导处")
+    @PostMapping("/updateZDC")
+    @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
+    public AjaxResult updateZDC(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        //yearsStandardVo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
+        yearsStandardVo.setUpdated(String.valueOf(loginUser.getUserId()));
+        return planYearsService.updateZDC(yearsStandardVo);
+    }
+
     @ApiOperation(value = "提交年度计划")
     @PostMapping("/commit")
     //@PreAuthorize("@ss.hasPermi('plan:planYears:commit')")

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

@@ -79,6 +79,14 @@ public interface PlanYearsService extends IService<PlanYears> {
      */
     public AjaxResult update(PlanYearsStandardVo yearsStandardVo);
 
+    /**
+     * 修改年度计划的机关业务指导处
+     *
+     * @param yearsStandardVo 修改年度计划请求对象
+     * @return 结果
+     */
+    public AjaxResult updateZDC(PlanYearsStandardVo yearsStandardVo);
+
     /**
      * 导入年度计划数据
      *

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

@@ -400,7 +400,10 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         }
         //申请修改之后再次提交，先清除上一次提交后的审核记录
         PmAuditDeptRef ref = new PmAuditDeptRef();
-        ref.setRefId(byId.getPlanPracticalId()).setRefType("1").setProjectType(byId.getProjectType()).setEvaluation(byId.getEvaluation());
+        ref.setRefId(byId.getPlanPracticalId());
+        ref.setRefType("1");
+        ref.setProjectType(byId.getProjectType());
+        ref.setEvaluation(byId.getEvaluation());
         refIsExist(ref, pmAuditDeptRefMapper);
         insertAuditDeptRef(userService, pmAuditDeptRefService, ref);
         int commit = planQuarterMapper.commit(quarterStandardVo.getPlanPracticalId());

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

@@ -223,7 +223,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         planYearsMapper.deletePlanYearsById(planYearId);
         //清除年度计划的审核记录
         PmAuditDeptRef ref = new PmAuditDeptRef();
-        ref.setRefId(planYearId).setRefType("0");
+        ref.setRefId(planYearId);
+        ref.setRefType("0");
         PlanQuarterServiceImpl.refIsExist(ref, pmAuditDeptRefMapper);
         //删除季度计划
         LambdaQueryWrapper<PlanQuarter> quarterWrapper = new LambdaQueryWrapper<>();
@@ -234,7 +235,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             //清除季度计划的审核记录
             for (PlanQuarter quarter : quarterList) {
                 PmAuditDeptRef refT = new PmAuditDeptRef();
-                refT.setRefId(quarter.getPlanPracticalId()).setRefType("1");
+                refT.setRefId(quarter.getPlanPracticalId());
+                refT.setRefType("1");
                 PlanQuarterServiceImpl.refIsExist(refT, pmAuditDeptRefMapper);
                 //删除项目数据
                 LambdaQueryWrapper<PmDemand> demandWrapper = new LambdaQueryWrapper<>();
@@ -244,7 +246,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 //清除项目数据的审核记录
                 for (PmDemand demand : demandList) {
                     PmAuditDeptRef refTh = new PmAuditDeptRef();
-                    refTh.setRefId(demand.getDemandId()).setRefType("2");
+                    refTh.setRefId(demand.getDemandId());
+                    refTh.setRefType("2");
                     PlanQuarterServiceImpl.refIsExist(refTh, pmAuditDeptRefMapper);
                 }
             }
@@ -310,6 +313,20 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.success();
     }
 
+    @Transactional
+    @Override
+    public AjaxResult updateZDC(PlanYearsStandardVo yearsStandardVo) {
+        PlanYears ofYears = new PlanYears();
+        try {
+            BeanUtils.copyProperties(yearsStandardVo, ofYears);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        ofYears.setUpdateTime(new Date());
+        planYearsMapper.updateById(ofYears);
+        return AjaxResult.success();
+    }
+
     //是否在提报时间内
     public Boolean isBetweenValue(PlanYears planYear) {
         //获取年度计划提报时间的阈值
@@ -467,7 +484,10 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         }
         //申请修改之后再次提交，先清除上一次提交后的审核记录
         PmAuditDeptRef ref = new PmAuditDeptRef();
-        ref.setRefId(byId.getPlanYearId()).setRefType("0");
+        ref.setRefId(byId.getPlanYearId());
+        ref.setRefType("0");
+        ref.setProjectType(byId.getProjectType());
+        ref.setEvaluation(byId.getEvaluation());
         PlanQuarterServiceImpl.refIsExist(ref, pmAuditDeptRefMapper);
         PlanQuarterServiceImpl.insertAuditDeptRef(userService, pmAuditDeptRefService, ref);
 

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

@@ -285,7 +285,10 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         ProvisionalPlan byId = provisionalPlanMapper.seletById(provisionalPlanVo.getPlanPracticalId());
         //申请修改之后再次提交，先清除上一次提交后的审核记录
         PmAuditDeptRef ref = new PmAuditDeptRef();
-        ref.setRefId(byId.getPlanPracticalId()).setRefType("1").setProjectType(byId.getProjectType()).setEvaluation(byId.getEvaluation());
+        ref.setRefId(byId.getPlanPracticalId());
+        ref.setRefType("1");
+        ref.setProjectType(byId.getProjectType());
+        ref.setEvaluation(byId.getEvaluation());
         PlanQuarterServiceImpl.refIsExist(ref, pmAuditDeptRefMapper);
         PlanQuarterServiceImpl.insertAuditDeptRef(userService, pmAuditDeptRefService, ref);
         return provisionalPlanMapper.commitProvisionalPlan(provisionalPlanVo.getPlanPracticalId());

purchase-system/src/main/java/com/ozs/pm/doman/PmAuditDeptRef.java

@@ -108,4 +108,120 @@ public class PmAuditDeptRef implements Serializable {
         this.updated = updated;
         this.updateTime = updateTime;
     }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getRefId() {
+        return refId;
+    }
+
+    public void setRefId(Long refId) {
+        this.refId = refId;
+    }
+
+    public String getRefType() {
+        return refType;
+    }
+
+    public void setRefType(String refType) {
+        this.refType = refType;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getDeptLevel() {
+        return deptLevel;
+    }
+
+    public void setDeptLevel(String deptLevel) {
+        this.deptLevel = deptLevel;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getStatusStr() {
+        return statusStr;
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
+
+    public String getCreated() {
+        return created;
+    }
+
+    public void setCreated(String created) {
+        this.created = created;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdated() {
+        return updated;
+    }
+
+    public void setUpdated(String updated) {
+        this.updated = updated;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public BigDecimal getEvaluation() {
+        return evaluation;
+    }
+
+    public void setEvaluation(BigDecimal evaluation) {
+        this.evaluation = evaluation;
+    }
+
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
 }

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

@@ -128,11 +128,12 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 
@@ -597,23 +598,21 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         if (!pmDemandReqVo.getIsAdmin()) {
             if (Arrays.asList(1, 2).contains(reqType)) {
                 if (!ObjectUtils.isEmpty(list)) {
-                    lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+                    lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toSet()));
                 }
                 //采购执行管理中，本单位超额项目交给上级处理，本单位不处理。
             } else if (3 == reqType) {
                 if (!ObjectUtils.isEmpty(list)) {
-                    //查出审核此项目的单位
-                    List<Long> longList = list.stream().map(PmAuditDeptRef::getDeptId).collect(Collectors.toList());
                     // 如果有上级单位存在，将本单位剔除
                     SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                     //本单位所有参与审核的项目id
-                    List<Long> refList = list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList());
-                    //替身，取交集用
-                    List<Long> refListL = refList;
+                    Set<Long> refList = new HashSet<>();
+                    for (PmAuditDeptRef deptRef : list) {
+                        refList.add(deptRef.getRefId());
+                    }
 
                     //上级参与审核的项目
                     List<Long> refListf = new ArrayList<>();
-                    LambdaQueryWrapper<PmDemand> lwf = new LambdaQueryWrapper<PmDemand>();
                     List<PmAuditDeptRef> listf = new ArrayList<>();
                     if (sysDept.getParentId() != 0) {
                         LambdaQueryWrapper<PmAuditDeptRef> lf = new LambdaQueryWrapper<>();
@@ -623,16 +622,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                         //上级参与审核的项目id
                         refListf = listf.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList());
                     }
-                    //取集合交集，交集中的是上级处理，本单位不处理
+                    //取集合差集，只处理差集中的数据
                     if (!ObjectUtils.isEmpty(refListf)) {
-                        refListL.retainAll(refListf);
-                        Iterator<Long> it = refList.iterator();
-                        while (it.hasNext()) {
-                            //只留下本单位要处理的项目
-                            if (refListL.contains(it.next())) {
-                                it.remove();
-                            }
-                        }
+                        refList.removeAll(refListf);
                     }
                     //为空就返回空
                     if (ObjectUtils.isEmpty(refList) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
@@ -689,7 +681,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<PmDemandResVo> pmDemandResVos = demandChangeTo(pageRes.getRecords());
 
             for (PmDemandResVo vo : pmDemandResVos) {
-                if (Arrays.asList(1, 2, 3).contains(reqType)) {
+                if (Arrays.asList(1, 2).contains(reqType)) {
                     // 根据项目id 和 部门id 和 参数类型 获取 部门级别
                     List<PmAuditDeptRef> collect = list.stream()
                             .filter(o -> o.getRefId().equals(vo.getDemandId()))
@@ -4072,12 +4064,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         list = pmAuditDeptRefService.list(l);
         //本单位所有参与审核的项目id
         List<Long> refList = list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList());
-        //替身，取交集用
-        List<Long> refListL = refList;
 
         //上级参与审核的项目
         List<Long> refListf = new ArrayList<>();
-        LambdaQueryWrapper<PmDemand> lwf = new LambdaQueryWrapper<PmDemand>();
         List<PmAuditDeptRef> listf = new ArrayList<>();
         if (sysDept.getParentId() != 0) {
             LambdaQueryWrapper<PmAuditDeptRef> lf = new LambdaQueryWrapper<>();
@@ -4087,18 +4076,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             //上级参与审核的项目id
             refListf = listf.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList());
         }
-        //取集合交集，交集中的是上级处理，本单位不处理
+        //取集合差集，只处理差集中的数据
         if (!ObjectUtils.isEmpty(refListf)) {
-            refListL.retainAll(refListf);
-            Iterator<Long> it = refList.iterator();
-            while (it.hasNext()) {
-                //只留下本单位要处理的项目
-                if (refListL.contains(it.next())) {
-                    it.remove();
-                }
-            }
+            refList.removeAll(refListf);
         }
-
         lw.in(PmDemand::getProjectStatus, projectStatus);
         lw.last(" order by project_status, plan_demand_sub_time");
         return this.baseMapper.selectList(lw);
@@ -4149,12 +4130,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         list = pmAuditDeptRefService.list(l);
         //本单位所有参与审核的项目id
         List<Long> refList = list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList());
-        //替身，取交集用
-        List<Long> refListL = refList;
 
         //上级参与审核的项目
         List<Long> refListf = new ArrayList<>();
-        LambdaQueryWrapper<PmDemand> lwf = new LambdaQueryWrapper<PmDemand>();
         List<PmAuditDeptRef> listf = new ArrayList<>();
         if (sysDept.getParentId() != 0) {
             LambdaQueryWrapper<PmAuditDeptRef> lf = new LambdaQueryWrapper<>();
@@ -4164,16 +4142,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             //上级参与审核的项目id
             refListf = listf.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList());
         }
-        //取集合交集，交集中的是上级处理，本单位不处理
+        //取集合差集，只处理差集中的数据
         if (!ObjectUtils.isEmpty(refListf)) {
-            refListL.retainAll(refListf);
-            Iterator<Long> it = refList.iterator();
-            while (it.hasNext()) {
-                //只留下本单位要处理的项目
-                if (refListL.contains(it.next())) {
-                    it.remove();
-                }
-            }
+            refList.removeAll(refListf);
         }
         //为空就返回空
         if (ObjectUtils.isEmpty(refList) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
@@ -4243,12 +4214,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         list = pmAuditDeptRefService.list(l);
         //本单位所有参与审核的项目id
         List<Long> refList = list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList());
-        //替身，取交集用
-        List<Long> refListL = refList;
 
         //上级参与审核的项目
         List<Long> refListf = new ArrayList<>();
-        LambdaQueryWrapper<PmDemand> lwf = new LambdaQueryWrapper<PmDemand>();
         List<PmAuditDeptRef> listf = new ArrayList<>();
         if (sysDept.getParentId() != 0) {
             LambdaQueryWrapper<PmAuditDeptRef> lf = new LambdaQueryWrapper<>();
@@ -4258,16 +4226,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             //上级参与审核的项目id
             refListf = listf.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList());
         }
-        //取集合交集，交集中的是上级处理，本单位不处理
+        //取集合差集，只处理差集中的数据
         if (!ObjectUtils.isEmpty(refListf)) {
-            refListL.retainAll(refListf);
-            Iterator<Long> it = refList.iterator();
-            while (it.hasNext()) {
-                //只留下本单位要处理的项目
-                if (refListL.contains(it.next())) {
-                    it.remove();
-                }
-            }
+            refList.removeAll(refListf);
         }
         //为空就返回空
         if (ObjectUtils.isEmpty(refList) && !SysUser.isAdmin(SecurityUtils.getUserId())) {

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

@@ -57,9 +57,17 @@ public class SysDeptOrganServiceImpl implements SysDeptOrganService {
             wrapperT.eq(SysDeptOrgan::getDeptId, sysDept.getParentId());
             organsT = deptOrganMapper.selectList(wrapperT);
             SysDept sysDeptTwo = sysDeptMapper.selectDeptById(sysDept.getParentId());
-            hashMap.put(sysDeptTwo.getDeptName(), organsT);
+            if (ObjectUtils.isEmpty(organsT)) {
+                hashMap.put(sysDeptTwo.getDeptName() + "(暂无数据)", organsT);
+            } else {
+                hashMap.put(sysDeptTwo.getDeptName(), organsT);
+            }
+        }
+        if (ObjectUtils.isEmpty(sysDept)) {
+            hashMap.put(sysDept.getDeptName() + "(暂无数据)", organs);
+        } else {
+            hashMap.put(sysDept.getDeptName(), organs);
         }
-        hashMap.put(sysDept.getDeptName(), organs);
         return AjaxResult.success(hashMap);
     }