From 852b71003371c229c7355c23d17691af376cd651 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 16 Oct 2025 12:20:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LeaseApplyInfoServiceImpl.java | 7 ++----- .../ma/service/impl/DirectRotationImpl.java | 13 ++----------- .../mapper/material/common/SelectMapper.xml | 3 +++ 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 3dd0fd82..ccd7ca14 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -1017,12 +1017,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { try { if (leaseApplyDetails.getNewTypeId()!= null){ // 根据parentId查询发布数量 - LeaseApplyDetails applyDetails = leaseApplyInfoMapper.getPublishNum(leaseApplyDetails); + //LeaseApplyDetails applyDetails = leaseApplyInfoMapper.getPublishNum(leaseApplyDetails); // 根据传入的值判断少了多少发布数量 - if (applyDetails != null) { - BigDecimal num = leaseApplyDetails.getPublishNum().subtract(leaseApplyDetails.getPreNum()); - leaseApplyDetails.setPublishNum(applyDetails.getPublishNum().subtract(num)); - } + leaseApplyDetails.setPublishNum(leaseApplyDetails.getPreNum()); int res = leaseApplyInfoMapper.updateLeaseNum(leaseApplyDetails); if (res <= 0){ return AjaxResult.error("修改领用表失败"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java index 1bf13010..4c05c32c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java @@ -146,10 +146,10 @@ public class DirectRotationImpl implements DirectRotationService { return AjaxResult.error("申请失败，不能转入同单位同工程"); } // 根据退料协议ID查询该协议是否还有未审核单据待处理，若有，则无法申请，剔除工地直转 - int result = workSiteDirectManageService.checkLeaseApply(directApplyInfos); + /*int result = workSiteDirectManageService.checkLeaseApply(directApplyInfos); if (result > 0) { return AjaxResult.error("申请失败，该转出单位和转出工程下有未审核单据待处理，请处理完毕后再重新提交"); - } + }*/ code = workSiteDirectManageService.genderLeaseCode(); directApplyInfos.setCode(code); directApplyInfos.setCreateTime(new Date()); @@ -236,15 +236,6 @@ public class DirectRotationImpl implements DirectRotationService { if (directApplyInfos.getBackAgreementId()==directApplyInfos.getLeaseAgreementId()){ return AjaxResult.error("申请失败，不能转入同单位同工程"); } - // 根据退料协议ID查询该协议是否还有未审核单据待处理，若有，则无法申请 - /*List list = workSiteDirectManageService.getDirectList(directApplyInfos); - if (CollectionUtils.isNotEmpty(list)) { - // 剔除list中ID为当前ID的 - list.removeIf(item -> item.getId().equals(directApplyInfos.getId())); - if (CollectionUtils.isNotEmpty(list)) { - return AjaxResult.error("申请失败，该转出单位和转出工程下有未审核单据待处理，请处理完毕后再重新提交"); - } - }*/ directApplyInfos.setUpdateTime(new Date()); List urls = new ArrayList<>(); if (directApplyInfoDetails.getDirectApplyInfo().getDirUrls() != null) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml index c5cbf381..9b29b178 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bu.del_flag = '0' AND sd.del_flag = '0' AND sd.`status` = '0' + AND bu.type_id != 1731 AND bp.pro_id = #{projectId} @@ -59,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE bu.del_flag = '0' AND sda.STATUS = '0' + AND bu.type_id != 1731 AND bp.pro_id = #{projectId} @@ -90,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE bu.del_flag = '0' AND sda.STATUS = '0' + AND bu.type_id != 1731 AND bp.pro_id = #{projectId}