bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

二级库导出问题修改

This commit is contained in:
wcy 2024-09-28 13:23:04 +08:00
parent 2b9ea77516
commit 30a1540d74
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -120,6 +120,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
*/ */
@Override @Override
public List<PurchaseCheckInfo> selectPurchaseCheckInfoList(PurchaseCheckInfo purchaseCheckInfo) { public List<PurchaseCheckInfo> selectPurchaseCheckInfoList(PurchaseCheckInfo purchaseCheckInfo) {
try {
List<PurchaseCheckInfo> purchaseCheckInfos = purchaseCheckInfoMapper.selectPurchaseCheckInfoList(purchaseCheckInfo); List<PurchaseCheckInfo> purchaseCheckInfos = purchaseCheckInfoMapper.selectPurchaseCheckInfoList(purchaseCheckInfo);
Map<Long, PurchaseCheckInfo> taskIdInfoMap = new HashMap<>(); // 缓存查询结果，避免重复查询 Map<Long, PurchaseCheckInfo> taskIdInfoMap = new HashMap<>(); // 缓存查询结果，避免重复查询
for (PurchaseCheckInfo checkInfo : purchaseCheckInfos) { for (PurchaseCheckInfo checkInfo : purchaseCheckInfos) {
@ -142,6 +143,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
} }
} }
return purchaseCheckInfos; return purchaseCheckInfos;
} catch (Exception e) {
throw new RuntimeException("显示出错，请联系管理员处理！");
}
} }
/** /**

3
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
View File

@ -54,7 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime} AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
or pci.arrival_time BETWEEN #{startTime} AND #{endTime}) or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
</if> </if>
GROUP BY pcd.task_id GROUP BY pci.id, pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time,
pci.update_by, pci.update_time, pci.remark, pci.company_id, dict.id, dict.name, tk.code, su.nick_name, tk.task_status
order by pci.create_time desc order by pci.create_time desc
</select> </select>