Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-admin/src/main/java/com/ozs/web/controller/statisticalAnalysis/StatisticalAnalysisController.java

@@ -142,7 +142,7 @@ public class StatisticalAnalysisController extends BaseController {
 
     @ApiOperation(value = "重大规划采购任务专项计划管理情况")
     @PostMapping("/countMajorProject")
-    @PreAuthorize("@ss.hasPermi('statistical:countMajorProject')")
+    //@PreAuthorize("@ss.hasPermi('statistical:countMajorProject')")
     @Log(title = ModularConstans.statisticalAnalysis, businessType = BusinessType.QUERY)
     public AjaxResult countMajorProject(@RequestBody PmDemandReqVo pmDemandReqVo) {
         if (StringUtils.isNull(pmDemandReqVo.getPurchaseDeptId())) {

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysDept.java

@@ -6,6 +6,9 @@ import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.core.domain.BaseEntity;
@@ -78,6 +81,10 @@ public class SysDept extends BaseEntity
      * 账号
      */
     private String accountNumber;
+    /**
+     * 采购服务站名称
+     */
+    private String  purchaseServices;
 
     public String getProjectContact() {
         return projectContact;
@@ -253,6 +260,14 @@ public class SysDept extends BaseEntity
         this.children = children;
     }
 
+    public String getPurchaseServices() {
+        return purchaseServices;
+    }
+
+    public void setPurchaseServices(String purchaseServices) {
+        this.purchaseServices = purchaseServices;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -276,6 +291,7 @@ public class SysDept extends BaseEntity
             .append("bankAccountName", getBankAccountName())
             .append("bankOfDeposit", getBankOfDeposit())
             .append("accountNumber", getAccountNumber())
+            .append("purchaseServices",getPurchaseServices())    
             .toString();
     }
 }

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

@@ -262,6 +262,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     @Transactional
     @Override
     public AjaxResult update(PlanQuarterStandardVo quarterStandardVo) {
+        Date now = new Date();
         if (planQuarterMapper.countProjectNameOther(quarterStandardVo.getProjectName(), String.valueOf(quarterStandardVo.getPlanPracticalId())) > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
@@ -276,21 +277,22 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             e.printStackTrace();
         }
         //quarters.setIsExcess(deptService.isExcessOrNo(quarters.getProjectType(), quarters.getEvaluation(), Long.valueOf(quarters.getPurchaseDeptId())));
-        quarters.setUpdateTime(new Date());
+        quarters.setUpdateTime(now);
         planQuarterMapper.updateInfoById(quarters);
         List<SysFileRef> sysFileRefs = quarterStandardVo.getSysFileRefs();
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("red_id", quarters.getPlanPracticalId());
-        map.put("type", SysFileRefEnum.PLAN_TEMPORARY.getType());
-        sysFileRefMapper.deleteByMap(map);
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            // 删关联
+            LambdaQueryWrapper<SysFileRef> lw = new LambdaQueryWrapper<>();
+            lw.eq(SysFileRef::getRedId, quarters.getPlanPracticalId());
+            lw.eq(SysFileRef::getType, SysFileRefEnum.PLAN_TEMPORARY.getType());
+            sysFileRefMapper.delete(lw);
             for (SysFileRef ref : sysFileRefs) {
                 ref.setRedId(quarters.getPlanPracticalId());
                 ref.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
                 ref.setCreated(quarterStandardVo.getUpdated());
-                ref.setCreateTime(new Date());
+                ref.setCreateTime(now);
                 ref.setUpdated(quarterStandardVo.getUpdated());
-                ref.setUpdateTime(new Date());
+                ref.setUpdateTime(now);
                 sysFileRefMapper.insert(ref);
             }
         }
@@ -445,15 +447,18 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     }
 
     public AjaxResult realReviewTo(PlanQuarterStandardVo vo) {
+        Date now = new Date();
         //季度计划审核通过后同步到年度计划和项目管理
         PlanQuarter quarters = new PlanQuarter();
         PmDemand demand = new PmDemand();
         PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
         PlanYears ofYears = new PlanYears();
+
         BeanUtils.copyProperties(byId, ofYears);
         ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
         planYearsMapper.insertPlanYears(ofYears);
         quarters.setPlanYearId(ofYears.getPlanYearId());
+
         BeanUtils.copyProperties(byId, demand);
         demand.setEvaluation(byId.getEvaluation().doubleValue());
         demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
@@ -461,10 +466,11 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
         //同步到项目管理状态为需求待填制
         demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
-        demand.setCreateTime(new Date());
+        demand.setCreateTime(now);
         pmDemandMapper.insert(demand);
         demandService.updateDemandWarnStatus(demand.getDemandId());
-        //计划附件也进行同步---查询季度计划附件后复制一份改为项目需求附件
+
+        //计划附件也进行同步---查询季度计划附件后同步到项目需求附件和年度计划附件
         LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
         sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_TEMPORARY.getType());
         sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanPracticalId());
@@ -474,6 +480,20 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 ref.setRedId(demand.getDemandId());
                 ref.setType(SysFileRefEnum.PM_DEMAND.getType());
                 ref.setId(null);
+                ref.setCreated(vo.getUpdated());
+                ref.setCreateTime(now);
+                ref.setUpdated(vo.getUpdated());
+                ref.setUpdateTime(now);
+                sysFileRefMapper.insert(ref);
+            }
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(ofYears.getPlanYearId());
+                ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
+                ref.setId(null);
+                ref.setCreated(vo.getUpdated());
+                ref.setCreateTime(now);
+                ref.setUpdated(vo.getUpdated());
+                ref.setUpdateTime(now);
                 sysFileRefMapper.insert(ref);
             }
         }
@@ -484,23 +504,23 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 ref.setRedId(vo.getPlanPracticalId());
                 ref.setType(SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
                 ref.setCreated(vo.getUpdated());
-                ref.setCreateTime(new Date());
+                ref.setCreateTime(now);
                 ref.setUpdated(vo.getUpdated());
-                ref.setUpdateTime(new Date());
+                ref.setUpdateTime(now);
                 sysFileRefMapper.insert(ref);
                 //同步到年度计划审核文件
                 SysFileRef ref1 = new SysFileRef(null, ofYears.getPlanYearId(), ref.getFileId(), SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
                 ref1.setCreated(vo.getUpdated());
-                ref1.setCreateTime(new Date());
+                ref1.setCreateTime(now);
                 ref1.setUpdated(vo.getUpdated());
-                ref1.setUpdateTime(new Date());
+                ref1.setUpdateTime(now);
                 sysFileRefMapper.insert(ref1);
                 //同步到采购需求审核文件
                 SysFileRef ref2 = new SysFileRef(null, demand.getDemandId(), ref.getFileId(), SysFileRefEnum.PM_DEMAND.getType());
                 ref2.setCreated(vo.getUpdated());
-                ref2.setCreateTime(new Date());
+                ref2.setCreateTime(now);
                 ref2.setUpdated(vo.getUpdated());
-                ref2.setUpdateTime(new Date());
+                ref2.setUpdateTime(now);
                 sysFileRefMapper.insert(ref2);
             }
         }

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

@@ -1,6 +1,7 @@
 package com.ozs.plan.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,6 +34,7 @@ import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.mapper.ProvisionalPlanMapper;
 import com.ozs.plan.service.PlanYearsService;
 import com.ozs.pm.doman.*;
+import com.ozs.pm.doman.vo.requestVo.PmDemandReqVo;
 import com.ozs.pm.doman.vo.responseVo.*;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.*;
@@ -309,11 +311,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         ofYears.setUpdateTime(new Date());
         planYearsMapper.updateInfoById(ofYears);
         List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("red_id", ofYears.getPlanYearId());
-        map.put("type", "1");
-        sysFileRefMapper.deleteByMap(map);
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            // 删关联
+            LambdaQueryWrapper<SysFileRef> lw = new LambdaQueryWrapper<>();
+            lw.eq(SysFileRef::getRedId, ofYears.getPlanYearId());
+            lw.eq(SysFileRef::getType, SysFileRefEnum.PLAN_YEAR.getType());
+            sysFileRefMapper.delete(lw);
             for (SysFileRef ref : sysFileRefs) {
                 ref.setRedId(ofYears.getPlanYearId());
                 ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
@@ -505,6 +508,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     @Transactional
     public AjaxResult realReviewTo(PlanYearsStandardVo vo) {
+        Date now = new Date();
         //年度计划审核通过后同步到季度计划和项目管理
         PlanQuarter quarters = new PlanQuarter();
         PmDemand demand = new PmDemand();
@@ -515,7 +519,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         quarters.setPlanType(0);
         quarters.setPlanYearId(byId.getPlanYearId());
         quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        quarters.setCreateTime(new Date());
+        quarters.setCreateTime(now);
         planQuarterMapper.insertPlanQuarter(quarters);
         //同步到项目管理状态为需求待填制
         demand.setPlanId(quarters.getPlanPracticalId());
@@ -523,7 +527,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
         demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
         demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
-        demand.setCreateTime(new Date());
+        demand.setCreateTime(now);
         pmDemandMapper.insert(demand);
         log.info("预警状态更新：demandID：{}", demand.getDemandId());
         demandService.updateDemandWarnStatus(demand.getDemandId());
@@ -552,23 +556,23 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 ref.setRedId(vo.getPlanYearId());
                 ref.setType(SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
                 ref.setCreated(vo.getUpdated());
-                ref.setCreateTime(new Date());
+                ref.setCreateTime(now);
                 ref.setUpdated(vo.getUpdated());
-                ref.setUpdateTime(new Date());
+                ref.setUpdateTime(now);
                 sysFileRefMapper.insert(ref);
                 //同步到临时、季度计划审核文件
                 SysFileRef ref1 = new SysFileRef(null, quarters.getPlanPracticalId(), ref.getFileId(), SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
                 ref1.setCreated(vo.getUpdated());
-                ref1.setCreateTime(new Date());
+                ref1.setCreateTime(now);
                 ref1.setUpdated(vo.getUpdated());
-                ref1.setUpdateTime(new Date());
+                ref1.setUpdateTime(now);
                 sysFileRefMapper.insert(ref1);
                 //同步到采购需求审核文件
                 SysFileRef ref2 = new SysFileRef(null, demand.getDemandId(), ref.getFileId(), SysFileRefEnum.PM_DEMAND.getType());
                 ref2.setCreated(vo.getUpdated());
-                ref2.setCreateTime(new Date());
+                ref2.setCreateTime(now);
                 ref2.setUpdated(vo.getUpdated());
-                ref2.setUpdateTime(new Date());
+                ref2.setUpdateTime(now);
                 sysFileRefMapper.insert(ref2);
             }
         }
@@ -665,15 +669,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             if (sysRoleList.size() > 0) {
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-                QueryWrapper<PlanYears> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("purchaseDeptId", sysDept.getDeptId())
-                        .in("project_status", ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
+                LambdaQueryWrapper<PlanYears> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(PlanYears::getPurchaseDeptId, sysDept.getDeptId())
+                        .in(PlanYears::getProjectStatus, ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
                 planYears = planYearsMapper.selectList(queryWrapper);
             }
             List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
             if (sysRoleList2.size() > 0) {
-                QueryWrapper<PlanYears> queryWrapper = new QueryWrapper<>();
-                queryWrapper.in("project_status", ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
+                LambdaQueryWrapper<PlanYears> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.in(PlanYears::getProjectStatus, ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
                 planYears = planYearsMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -691,13 +695,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             if (sysRoleList.size() > 0) {
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
             List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
             if (sysRoleList2.size() > 0) {
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -715,16 +719,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             if (sysRoleList.size() > 0) {
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-                List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("purchaseDeptId", sysDept.getDeptId())
-                        .in("project_status", PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
+                        .in(PmDemand::getProjectStatus, PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
             List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
             if (sysRoleList2.size() > 0) {
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.in("project_status", PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -742,15 +745,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             if (sysRoleList.size() > 0) {
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
-                queryWrapper.in("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode(), PmProjectStatus.UNDER_CONSTRUCTION.getCode());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId());
+                queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode(), PmProjectStatus.UNDER_CONSTRUCTION.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
             List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
             if (sysRoleList2.size() > 0) {
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.in("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode(), PmProjectStatus.UNDER_CONSTRUCTION.getCode());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode(), PmProjectStatus.UNDER_CONSTRUCTION.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -768,15 +771,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             if (sysRoleList.size() > 0) {
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
-                queryWrapper.in("project_status", PmProjectStatus.UNDER_CONSTRUCTION.getCode(), PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId());
+                queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.UNDER_CONSTRUCTION.getCode(), PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
             List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
             if (sysRoleList2.size() > 0) {
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.in("project_status", PmProjectStatus.UNDER_CONSTRUCTION.getCode(), PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.UNDER_CONSTRUCTION.getCode(), PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -794,9 +797,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             if (sysRoleList.size() > 0) {
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId())
-                        .in("project_status", PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
+                        .in(PmDemand::getProjectStatus, PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
                                 PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
                                 PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
                                 PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
@@ -808,8 +811,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             }
             List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
             if (sysRoleList2.size() > 0) {
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.in("project_status", PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
                         PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
                         PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
                         PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
@@ -826,41 +829,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     @Override
     public AjaxResult procurementOfficeProcurementExecutionTotal() {
-        List<PmDemand> pmDemands = new ArrayList<>();
-        try {
-            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
-            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("procurement_office")).collect(Collectors.toList());
-            if (sysRoleList.size() > 0) {
-                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
-                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId())
-                        .in("project_status",
-                                PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
-                                PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
-                                PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
-                                PmProjectStatus.WAIT_OPEN_BID.getCode(),
-                                PmProjectStatus.WAIT_BID_ANNOUNCEMENT.getCode(),
-                                PmProjectStatus.BIDDING_PUBLICITY.getCode(),
-                                PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
-                pmDemands = pmDemandMapper.selectList(queryWrapper);
-            }
-            List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
-            if (sysRoleList2.size() > 0) {
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.in("project_status", PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
-                        PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
-                        PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
-                        PmProjectStatus.WAIT_OPEN_BID.getCode(),
-                        PmProjectStatus.WAIT_BID_ANNOUNCEMENT.getCode(),
-                        PmProjectStatus.BIDDING_PUBLICITY.getCode(),
-                        PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
-                pmDemands = pmDemandMapper.selectList(queryWrapper);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return AjaxResult.success(pmDemands.size());
+        SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+        SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+        PmDemandReqVo pmDemandReqVo = new PmDemandReqVo();
+        pmDemandReqVo.setPageNum(1L);
+        pmDemandReqVo.setPageSize(10L);
+        pmDemandReqVo.setUserId(sysUser.getUserId());
+        pmDemandReqVo.setPurchaseDeptId(Math.toIntExact(sysDept.getDeptId()));
+        IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 3);
+        return AjaxResult.success(page.getTotal());
     }
 
     @Override
@@ -872,15 +849,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             if (sysRoleList.size() > 0) {
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId())
-                        .lt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
+                        .lt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
             List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
             if (sysRoleList2.size() > 0) {
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.lt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -898,15 +875,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             if (sysRoleList.size() > 0) {
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId())
-                        .gt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
+                        .gt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
             List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
             if (sysRoleList2.size() > 0) {
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.gt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.gt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {

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

@@ -278,7 +278,7 @@ public interface IPmDemandService extends IService<PmDemand> {
     AjaxResult exceedMarketAnalysis(PmDemandReqVo pmDemandReqVo);
 
     /**
-     * 今年已完成数量
+     * 重大规划采购任务专项计划管理情况
      *
      * @return
      */

purchase-system/src/main/resources/mapper/pm/PmDemandMapper.xml

@@ -205,12 +205,12 @@
     </select>
 
     <select id="countMajorProjectLastYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
-        SELECT YEAR (NOW()) - 1 columnName, COUNT (demand_id) num, SUM (evaluation) evaluationTotal
+        SELECT YEAR(NOW()) - 1 columnName, COUNT(demand_id) num, SUM(evaluation) evaluationTotal
         FROM `pm_demand`
         WHERE find_in_set('1'
             , project_attr)
           and DATE_FORMAT(create_time
-            , '%Y') = YEAR (NOW()) - 1
+                  , '%Y') = YEAR(NOW()) - 1
     </select>
 
     <select id="countProjectMajorByYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">

purchase-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -111,6 +111,7 @@
         <if test="phone != null and phone != ''">phone,</if>
         <if test="email != null and email != ''">email,</if>
         <if test="address != null and address != ''">address,</if>
+        <if test="purchaseServices != null and purchaseServices != ''">purchase_services,</if>
         <if test="remarks != null and remarks != ''">remarks,</if>
         <if test="projectContact != null and projectContact != ''">project_contact,</if>
         <if test="bankAccountName != null and bankAccountName != ''">bank_account_name,</if>
@@ -128,6 +129,7 @@
         <if test="leader != null and leader != ''">#{leader},</if>
         <if test="phone != null and phone != ''">#{phone},</if>
         <if test="email != null and email != ''">#{email},</if>
+        <if test="purchaseServices != null and purchaseServices != ''">#{purchaseServices},</if>
         <if test="address != null and address != ''">#{address},</if>
         <if test="remarks != null and remarks != ''">#{remarks},</if>
         <if test="projectContact != null and projectContact != ''">#{projectContact},</if>
@@ -148,6 +150,7 @@
             <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
             <if test="address != null and address != ''">address = #{address},</if>
             <if test="remarks != null and remarks != ''">remarks = #{remarks},</if>
+            <if test="purchaseServices != null and purchaseServices != ''">purchase_services = #{purchaseServices},</if>
             <if test="projectContact != null and projectContact != ''">project_contact = #{projectContact},</if>
             <if test="bankAccountName != null and bankAccountName != ''">bank_account_name = #{bankAccountName},</if>
             <if test="bankOfDeposit != null and bankOfDeposit != ''">bank_of_deposit = #{bankOfDeposit},</if>