Browse Source

添加下载导入模板功能

lwx_dev
erdanergou 3 years ago
parent
commit
722e779181
  1. 3
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  2. 4
      src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

3
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java

@ -204,7 +204,8 @@ public class MaterialController {
) { ) {
inventoryP.setSplitInfoList(splitUnitService.findSplitInfoByMid(inventoryP.getMid())); inventoryP.setSplitInfoList(splitUnitService.findSplitInfoByMid(inventoryP.getMid()));
} }
}else{ }
else{
list = materialService.findInventory(map); list = materialService.findInventory(map);
total = materialService.findInventoryCount(map); total = materialService.findInventoryCount(map);
} }

4
src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@ -696,10 +696,12 @@
<include refid="ApplicationInRecordInfo"/> <include refid="ApplicationInRecordInfo"/>
from applicationInRecordInfo from applicationInRecordInfo
where 1 = 1 where 1 = 1
and airapproverPass in (1,4)
and did in and did in
<foreach collection="list" index="index" item="depositoryId" open="(" separator="," close=")"> <foreach collection="list" index="index" item="depositoryId" open="(" separator="," close=")">
#{depositoryId} #{depositoryId}
</foreach> </foreach>
</select> </select>
@ -710,6 +712,7 @@
<include refid="ApplicationInRecordInfo"/> <include refid="ApplicationInRecordInfo"/>
from applicationInRecordInfo from applicationInRecordInfo
where 1 = 1 where 1 = 1
and airapproverPass in (1,4)
and applicant_time between #{start} and #{end} and applicant_time between #{start} and #{end}
<if test="list != null"> <if test="list != null">
and did in and did in
@ -718,6 +721,7 @@
</foreach> </foreach>
</if> </if>
</select> </select>
<!-- 查询所有出库记录--> <!-- 查询所有出库记录-->
<select id="findApplicationOutRecordPAll" resultMap="applicationOutRecord"> <select id="findApplicationOutRecordPAll" resultMap="applicationOutRecord">

Loading…
Cancel
Save