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

优化

This commit is contained in:
mashuai 2025-08-25 12:37:18 +08:00
parent b2971abc78
commit 8fef6cc97f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -540,6 +540,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
list.addAll(leaseApplyOutList); list.addAll(leaseApplyOutList);
} }
for (LeaseApplyInfo applyInfo : list) { for (LeaseApplyInfo applyInfo : list) {
if (applyInfo.getTaskStatus() != null && applyInfo.getTaskStatus() == 1) {
continue;
}
if (applyInfo.getPreCountNum().compareTo(applyInfo.getAlNum()) == 0) { if (applyInfo.getPreCountNum().compareTo(applyInfo.getAlNum()) == 0) {
applyInfo.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_FINISHED.getStatus()); applyInfo.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_FINISHED.getStatus());
applyInfo.setTaskStatusName(LeaseTaskStatusEnum.LEASE_TASK_FINISHED.getStatusName()); applyInfo.setTaskStatusName(LeaseTaskStatusEnum.LEASE_TASK_FINISHED.getStatusName());
@ -1245,7 +1248,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
@Override @Override
public AjaxResult leaseOut(LeaseOutRequestVo leaseOutRequestVo) { public AjaxResult leaseOut(LeaseOutRequestVo leaseOutRequestVo) {
// 判断库存是否充足 // 判断库存是否充足
if (!CollectionUtils.isEmpty(leaseOutRequestVo.getLeaseOutDetailsList())) { /*if (!CollectionUtils.isEmpty(leaseOutRequestVo.getLeaseOutDetailsList())) {
LeaseOutDetails leaseOutDetails = leaseOutRequestVo.getLeaseOutDetailsList().get(0); LeaseOutDetails leaseOutDetails = leaseOutRequestVo.getLeaseOutDetailsList().get(0);
if (leaseOutDetails != null) { if (leaseOutDetails != null) {
if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId())) { if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId())) {
@ -1261,7 +1264,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
} }
} }
} }
} }*/
for (LeaseOutDetails bean : leaseOutRequestVo.getLeaseOutDetailsList()) { for (LeaseOutDetails bean : leaseOutRequestVo.getLeaseOutDetailsList()) {
if (Objects.isNull(bean)) { if (Objects.isNull(bean)) {
continue; continue;

2
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
View File

@ -696,7 +696,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM FROM
lease_apply_details lease_apply_details
WHERE WHERE
parent_id = #{parentId} and type_id = #{typeId} parent_id = #{parentId} and COALESCE(new_type, type_id) = #{typeId}
</select> </select>
</mapper> </mapper>