buzhanyi %!s(int64=2) %!d(string=hai) anos
pai
achega
b67f49cd7f

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

@@ -159,6 +159,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 //采购需求附件
                 List<SysFileInfo> demandFileInfos = getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_DEMAND.getType());
                 if (!ObjectUtils.isEmpty(demandFileInfos)) {
+                    demandFileInfos.addAll(getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_DEMAND_EXAMINE.getType()));
                     vo.setDemandFileInfos(demandFileInfos);
                 }
 

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

@@ -5,7 +5,7 @@
 <mapper namespace="com.ozs.pm.mapper.PmDemandMapper">
 
     <select id="selectByDemandIdList" parameterType="java.util.List" resultType="com.ozs.pm.doman.PmDemand">
-        select * from pm_demand where project_status = 15 and demand_id in
+        select * from pm_demand where project_status &gt;= 12 and demand_id in
         <foreach item="item" collection="demandIdList" separator="," open="(" close=")" index="">
             #{item}
         </foreach>