查看详情时加上审核文件

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

@@ -51,6 +51,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -287,10 +288,10 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         }
         SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(byId.getPurchaseDeptId())).get("sysDept");
         byId.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("red_id", byId.getPlanPracticalId());
-        map.put("type", SysFileRefEnum.PLAN_TEMPORARY.getType());
-        List<SysFileRef> fileRefs = sysFileRefMapper.selectByMap(map);
+        LambdaQueryWrapper<SysFileRef> lw = new LambdaQueryWrapper<>();
+        lw.eq(SysFileRef::getRedId, quarterStandardVo.getPlanPracticalId());
+        lw.in(SysFileRef::getType, Arrays.asList(SysFileRefEnum.PLAN_TEMPORARY.getType(), SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType()));
+        List<SysFileRef> fileRefs = sysFileRefMapper.selectList(lw);
         List<SysFileInfo> fileInfos = new ArrayList<>();
         BeanUtils.copyProperties(byId, responseVo);
         if (!ObjectUtils.isEmpty(fileRefs)) {

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

@@ -52,6 +52,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -321,10 +322,10 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         }
         SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(byId.getPurchaseDeptId())).get("sysDept");
         byId.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("red_id", byId.getPlanYearId());
-        map.put("type", SysFileRefEnum.PLAN_YEAR.getType());
-        List<SysFileRef> fileRefs = sysFileRefMapper.selectByMap(map);
+        LambdaQueryWrapper<SysFileRef> lw = new LambdaQueryWrapper<>();
+        lw.eq(SysFileRef::getRedId, yearsStandardVo.getPlanYearId());
+        lw.in(SysFileRef::getType, Arrays.asList(SysFileRefEnum.PLAN_YEAR.getType(), SysFileRefEnum.PLAN_YEAR_EXAMINE.getType()));
+        List<SysFileRef> fileRefs = sysFileRefMapper.selectList(lw);
         List<SysFileInfo> fileInfos = new ArrayList<>();
         BeanUtils.copyProperties(byId, responseVo);
         if (!ObjectUtils.isEmpty(fileRefs)) {
@@ -467,7 +468,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Transactional
     public AjaxResult reviewTo(PlanYearsStandardVo vo) {
         //年度计划审核通过后同步到季度计划和项目管理
-        PlanYears ofYears = new PlanYears();
         PlanQuarter quarters = new PlanQuarter();
         PmDemand demand = new PmDemand();
         PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());