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

功能新增及优化

This commit is contained in:
mashuai 2025-01-24 18:03:26 +08:00
parent ae8560feb7
commit c45378cde5
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
View File

@ -253,6 +253,8 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
return (item.getTypeName() != null && item.getTypeName().contains(keyWord)) || return (item.getTypeName() != null && item.getTypeName().contains(keyWord)) ||
(item.getCode() != null && item.getCode().contains(keyWord)) || (item.getCode() != null && item.getCode().contains(keyWord)) ||
(item.getBackPerson() != null && item.getBackPerson().contains(keyWord)) || (item.getBackPerson() != null && item.getBackPerson().contains(keyWord)) ||
(item.getUnitName() != null && item.getUnitName().contains(keyWord)) ||
(item.getProName() != null && item.getProName().contains(keyWord)) ||
(item.getPhone() != null && item.getPhone().contains(keyWord)); (item.getPhone() != null && item.getPhone().contains(keyWord));
} }
@ -1201,8 +1203,14 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
bmFileInfo.setTaskType(3); bmFileInfo.setTaskType(3);
result += bmFileInfoMapper.deleteBmFileInfoByBizInfo(bmFileInfo); result += bmFileInfoMapper.deleteBmFileInfoByBizInfo(bmFileInfo);
if (result > 0) { if (result > 0) {
// 更新back_apply_details的数据 // 先根据id查询back_apply_details的数据
result += backApplyInfoMapper.update(backApplyDetails); if (info.getPreNum().compareTo(backApplyDetails.getPreNum()) == 0) {
// 删除back_apply_details的数据
result += backApplyInfoMapper.deleteBackApplyDetailsById(backApplyDetails);
} else {
// 更新back_apply_details的数据
result += backApplyInfoMapper.update(backApplyDetails);
}
// 删除back_check_details的数据 // 删除back_check_details的数据
BackApplyInfo backApplyInfo = new BackApplyInfo(); BackApplyInfo backApplyInfo = new BackApplyInfo();
backApplyInfo.setParentId(backApplyDetails.getParentId()); backApplyInfo.setParentId(backApplyDetails.getParentId());

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
View File

@ -210,6 +210,7 @@ public class ComplexQueryServiceImpl implements ComplexQueryService {
.multiply(new BigDecimal(100)) .multiply(new BigDecimal(100))
.setScale(2, BigDecimal.ROUND_HALF_UP) + "%"; .setScale(2, BigDecimal.ROUND_HALF_UP) + "%";
} }
retainedEquipmentInfo.setTotalPrice(equipmentPrice);
retainedEquipmentInfo.setFiveReplacementRate(fiveReplacementRate); retainedEquipmentInfo.setFiveReplacementRate(fiveReplacementRate);
retainedEquipmentInfo.setTenReplacementRate(tenReplacementRate); retainedEquipmentInfo.setTenReplacementRate(tenReplacementRate);
retainedEquipmentInfo.setTenPlusReplacementRate(tenPlusReplacementRate); retainedEquipmentInfo.setTenPlusReplacementRate(tenPlusReplacementRate);