bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2025-07-14 13:45:16 +08:00
parent cd8d35212f 1aa8313f64
commit 459cf50095
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
View File

@ -110,31 +110,38 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
@Override @Override
public List<RepairInputDetails> selectRepairInputDetailsList(RepairInputDetails repairInputDetails) { public List<RepairInputDetails> selectRepairInputDetailsList(RepairInputDetails repairInputDetails) {
List<RepairInputDetails> list = repairInputDetailsMapper.selectRepairInputDetailsList(repairInputDetails); List<RepairInputDetails> list = repairInputDetailsMapper.selectRepairInputDetailsList(repairInputDetails);
if (CollectionUtils.isNotEmpty(list)) { // if (CollectionUtils.isNotEmpty(list)) {
for (RepairInputDetails inputDetails : list) { // for (RepairInputDetails inputDetails : list) {
List<RepairInputInfo> inputInfos = repairInputDetailsMapper.selectRepairInputDetailsById(inputDetails); // List<RepairInputInfo> inputInfos = repairInputDetailsMapper.selectRepairInputDetailsById(inputDetails);
if (CollectionUtils.isNotEmpty(inputInfos)) { // if (CollectionUtils.isNotEmpty(inputInfos)) {
BigDecimal totalRepairNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP); // BigDecimal totalRepairNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP);
BigDecimal totalInputNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP); // BigDecimal totalInputNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP);
BigDecimal totalPendingInputNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP); // BigDecimal totalPendingInputNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP);
for (RepairInputInfo inputInfo : inputInfos) { // for (RepairInputInfo inputInfo : inputInfos) {
totalRepairNum = totalRepairNum.add(inputInfo.getRepairNum()); // totalRepairNum = totalRepairNum.add(inputInfo.getRepairNum());
totalInputNum = totalInputNum.add(inputInfo.getInputNum()); // totalInputNum = totalInputNum.add(inputInfo.getInputNum());
totalPendingInputNum = totalPendingInputNum.add(inputInfo.getPendingInputNum()); // totalPendingInputNum = totalPendingInputNum.add(inputInfo.getPendingInputNum());
} // }
inputDetails.setRepairNum(totalRepairNum); // inputDetails.setRepairNum(totalRepairNum);
inputDetails.setInputNum(totalInputNum); // inputDetails.setInputNum(totalInputNum);
inputDetails.setPendingInputNum(totalPendingInputNum); // inputDetails.setPendingInputNum(totalPendingInputNum);
} // }
} // }
// String keyWord = repairInputDetails.getKeyWord();
// // 如果关键字不为空，进行过滤
// if (!StringUtils.isBlank(keyWord)) {
// list = list.stream()
// .filter(item -> containsKeyword(item, keyWord))
// .collect(Collectors.toList());
// }
// }
String keyWord = repairInputDetails.getKeyWord(); String keyWord = repairInputDetails.getKeyWord();
// 如果关键字不为空，进行过滤 // 如果关键字不为空，进行过滤
if (!StringUtils.isBlank(keyWord)) { if (!StringUtils.isBlank(keyWord)) {
list = list.stream() list = list.stream()
.filter(item -> containsKeyword(item, keyWord)) .filter(item -> containsKeyword(item, keyWord))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
}
return list; return list;
} }

4
bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
View File

@ -210,10 +210,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = '0' LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = '0'
WHERE WHERE
EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId} sai.STATUS = '0'
AND sai2.STATUS = '0' and IFNULL(sai.lease_type,0) = 0 and sai2.num > 0)
GROUP BY GROUP BY
mt.type_id mt.type_id
HAVING num> 0
</select> </select>
<select id="getUseTypeTreeL3" resultType="com.bonus.common.biz.domain.TypeTreeNode"> <select id="getUseTypeTreeL3" resultType="com.bonus.common.biz.domain.TypeTreeNode">

5
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
View File

@ -51,9 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt on rd.type_id = mt.type_id LEFT JOIN ma_type mt on rd.type_id = mt.type_id
LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
LEFT JOIN tm_task tt on rd.task_id = tt.task_id LEFT JOIN tm_task tt on rd.task_id = tt.task_id
LEFT JOIN repair_apply_details rad ON rad.id = rd.repair_id LEFT JOIN tm_task tt1 on rd.repair_id = tt1.task_id
LEFT JOIN tm_task tt1 on rad.task_id = tt1.task_id LEFT JOIN tm_task_agreement tta ON rd.repair_id = tta.task_id
LEFT JOIN tm_task_agreement tta ON rd.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id
LEFT JOIN bm_unit bui ON bai2.unit_id = bui.unit_id LEFT JOIN bm_unit bui ON bai2.unit_id = bui.unit_id
LEFT JOIN bm_project bpi ON bai2.project_id = bpi.pro_id and bpi.del_flag = '0' LEFT JOIN bm_project bpi ON bai2.project_id = bpi.pro_id and bpi.del_flag = '0'