更改专家库bug

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

@@ -84,8 +84,8 @@ public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExp
     public AjaxResult selectReviewProject(BaseExpertVo baseExpertVo) {
         // 通过专家ID查询 与专家库关联的采购执行管理ID
         List<Integer> demandIdList = pmDemandExpertRefService.selectByExpertId(baseExpertVo.getId());
-        if (demandIdList.size() == 0) {
-            return AjaxResult.error("当前专家还有有被抽取！");
+        if (ObjectUtils.isEmpty(demandIdList)) {
+            return AjaxResult.success(null);
         }
         List<PmDemand> pmDemandList = pmDemandService.selectByDemandIdList(demandIdList);
         List<PmDemandResVo> pmDemandResponseVoList = changTo(pmDemandList);

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

@@ -435,14 +435,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     planYearsMapper.insertPlanYears(ofYear);
                     successNum++;
                     successMsg.append("*" + successNum + "、项目 " + ofYear.getProjectName() + " 导入成功!");
-                    //} else if (isUpdateSupport) {
-                    //    PlanYears years = plan.get(0);
-                    //    BeanValidators.validateWithException(validator, ofYear);
-                    //    years.setCreateTime(new Date());
-                    //    years.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-                    //    planYearsMapper.updateById(years);
-                    //    successNum++;
-                    //    successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 更新成功");
                 } else {
                     failureNum++;
                     failureMsg.append(failureNum + "*项目 " + ofYear.getProjectName() + " 已存在！/n");
@@ -465,28 +457,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     @Override
     public AjaxResult commit(PlanYearsStandardVo yearsStandardVo) {
-        //PlanYears byId = PlanYearsMapper.getById(yearsStandardVo.getPlanYearId());
-        //BigDecimal evaluation = byId.getEvaluation();
-        //BigDecimal threshold = new BigDecimal(0);
-        ////获取各个项目类型设定的概算金额阈值
-        //List<SysDictData> data = dictTypeService.selectDictDataByType("sys_over_limit_threshold");
-        //HashMap<String, String> thresholdMap = new LinkedHashMap<>();
-        ////各个类型的概算金额阈值
-        //for (SysDictData dictData : data) {
-        //    //    类型----阈值
-        //    thresholdMap.put(dictData.getDictLabel(), dictData.getDictValue());
-        //}
-        ////项目类型
-        //for (ProjectTypes value : ProjectTypes.values()) {
-        //    if (byId.getProjectType().equals(value.getCode())) {
-        //        threshold = BigDecimal.valueOf(Long.parseLong(thresholdMap.get(value.getInfo())));
-        //    }
-        //    break;
-        //}
-        //
-        //if (evaluation.compareTo(threshold) == 1) {
-        //    //是超额项目
-        //}
 
         int commit = planYearsMapper.commit(yearsStandardVo.getPlanYearId());
         if (commit != 1) {
@@ -623,6 +593,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 QueryWrapper<PlanYears> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
+                queryWrapper.eq("delFlay", DataIsDelete.DataNOTDelete.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.eq("delFlay", DataIsDelete.DataNOTDelete.getCode());
                 planYears = planYearsMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -645,6 +622,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         .in("project_status", 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());
+                planYears = planYearsMapper.selectList(queryWrapper);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -664,6 +647,11 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 queryWrapper.eq("purchase_dept_id", 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<>();
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -685,6 +673,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         .in("project_status", 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());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -705,6 +699,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 queryWrapper.in("project_status", 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());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -725,6 +725,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 queryWrapper.in("project_status", 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());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -752,6 +758,18 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         );
                 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.TASK_WAIT_RELEASE.getCode(),
+                        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());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -779,6 +797,18 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 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();
         }
@@ -794,13 +824,17 @@ 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());
-                List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("purchase_dept_id", sysDept.getDeptId())
                         .lt("project_status", 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());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -821,6 +855,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         .gt("project_status", 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());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -13,16 +13,18 @@
 
     <select id="selectExtractionExpert" parameterType="com.ozs.base.domain.vo.BaseExpertVo"
             resultType="com.ozs.pm.doman.PmDemand">
-        select * from pm_demand where project_status = 13
-        <if test="projectName != null and projectName != ''">
-            and project_name like '%' + #{projectName} + '%'
-        </if>
-        <if test="startTime != null  "><!-- 开始时间检索 -->
-            and date_format(plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
-        </if>
-        <if test="endTime != null  "><!-- 结束时间检索 -->
-            and date_format(plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
-        </if>
+        select * from pm_demand
+        <where>
+            <if test="projectName != null and projectName != ''">
+                and project_name like '%' + #{projectName} + '%'
+            </if>
+            <if test="startTime != null  "><!-- 开始时间检索 -->
+                and date_format(plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            </if>
+            <if test="endTime != null  "><!-- 结束时间检索 -->
+                and date_format(plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            </if>
+        </where>
     </select>
 
     <select id="purchaseProjectStatistical" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"