优化

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) {
+                leaseApplyDetails.setPublishNum(leaseApplyDetails.getPreNum());
-                    BigDecimal num = leaseApplyDetails.getPublishNum().subtract(leaseApplyDetails.getPreNum());
-                    leaseApplyDetails.setPublishNum(applyDetails.getPublishNum().subtract(num));
-                }
                 int res = leaseApplyInfoMapper.updateLeaseNum(leaseApplyDetails);
                 if (res <= 0){
                     return AjaxResult.error("修改领用表失败");

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<DirectApplyInfo> 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<String> urls = new ArrayList<>();
                 if (directApplyInfoDetails.getDirectApplyInfo().getDirUrls() != null) {

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
         <if test="projectId != null">
             AND bp.pro_id = #{projectId}
         </if>
@@ -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
         <if test="projectId != null">
             AND bp.pro_id = #{projectId}
         </if>
@@ -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
         <if test="projectId != null">
             AND bp.pro_id = #{projectId}
         </if>