Jelajahi Sumber

临时计划审核添加附件上传

hexiao 2 tahun lalu
induk
melakukan
15b1782bf6

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
+import com.ozs.base.domain.BasePolicy;
 import com.ozs.common.constant.Constants;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
@@ -256,10 +257,11 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         }
         // 转换字段中文
         ProvisionalPlan provisionalPlanC = changeToProvisionalPlan(provisionalPlan);
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("red_id", provisionalPlanC.getPlanPracticalId());
-        map.put("type", SysFileRefEnum.PLAN_TEMPORARY.getType());
-        List<SysFileRef> fileRefs = sysFileRefMapper.selectByMap(map);
+        LambdaQueryWrapper<SysFileRef> lw = new LambdaQueryWrapper<>();
+        lw.eq(SysFileRef::getRedId, provisionalPlanC.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<>();
         ProvisionalPlanVo provisionalPlanVo = new ProvisionalPlanVo();
         BeanUtils.copyProperties(provisionalPlanC, provisionalPlanVo);

+ 1 - 1
purchase-system/src/main/resources/mapper/plan/ProvisionalPlanMapper.xml

@@ -191,7 +191,7 @@
                 refuse_reason = #{refuseReason},
             </if>
             <if test="projectStatus != null and projectStatus != ''">
-                project_status = #{projectStatus}
+                project_status = #{projectStatus},
             </if>
         </trim>
         where plan_practical_id = #{planPracticalId}