From 2b71b89aa04255b79cdde26e3ec387b88ea2cf90 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 16 Oct 2025 18:47:21 +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 --- .../impl/LeaseOutDetailsServiceImpl.java | 2 +- .../controller/DirectRotationController.java | 22 ++++++++++++++----- .../ma/mapper/DirectRotationMapper.java | 7 ++++++ .../ma/service/DirectRotationService.java | 7 ++++++ .../ma/service/impl/DirectRotationImpl.java | 10 +++++++++ .../settlement/domain/SltAgreementInfo.java | 8 ++++++- .../mapper/material/clz/BmTeamMapper.xml | 1 + .../material/ma/DirectRotationMapper.xml | 22 +++++++++++++++++++ .../mapper/material/ma/MachineMapper.xml | 2 +- .../UseMaintenanceWarningMapper.xml | 9 +++++++- 10 files changed, 80 insertions(+), 10 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java index 580e0874..224b3f8e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java @@ -313,7 +313,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { } bmAgreementInfo.setUnitId(tbTeam.getId()); } else { - bmAgreementInfo.setUnitId(bmTeam.getId()); + bmAgreementInfo.setUnitId(record.getLeaseUnitId().longValue()); // 修改班组信息 bmTeamMapper.update(tbTeam); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java index 6ab1e68f..ce5d2202 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java @@ -16,7 +16,9 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; @@ -45,16 +47,15 @@ public class DirectRotationController extends BaseController { Integer projectId = service.getprojectId(sltAgreementInfo); // 根据项目获取材料站在用机具 List useringDataClz = service.getUseringDataByClz(projectId); - for (SltAgreementInfo useringDatum : useringData) { + Iterator iterator = useringData.iterator(); + while (iterator.hasNext()) { + SltAgreementInfo useringDatum = iterator.next(); boolean shouldAdd = true; for (SltAgreementInfo agreementInfo : useringDataClz) { -// if (agreementInfo.getTypeName().equals("地锚") && agreementInfo.getTypeModelName().equals("10t")) { -// System.out.println("haha"); -// } if (useringDatum.getTypeId().equals(agreementInfo.getTypeId())) { if (useringDatum.getMaId() == null && agreementInfo.getMaId() == null) { - if (useringDatum.getUseNum() > agreementInfo.getUseNum()) { - useringDatum.setUseNum(useringDatum.getUseNum() - agreementInfo.getUseNum()); + if (useringDatum.getUseNum().compareTo(agreementInfo.getUseNum()) > 0) { + useringDatum.setUseNum(useringDatum.getUseNum().subtract(agreementInfo.getUseNum())); } else { shouldAdd = false; break; @@ -65,6 +66,15 @@ public class DirectRotationController extends BaseController { } } } + // 根据协议以及类型id查询待审核数量 + SltAgreementInfo info = service.getInfo(useringDatum); + if (info != null) { + useringDatum.setWaitTransNum(info.getWaitTransNum()); + useringDatum.setTransNum(useringDatum.getUseNum().subtract(useringDatum.getWaitTransNum())); + } else { + useringDatum.setWaitTransNum(BigDecimal.ZERO); + useringDatum.setTransNum(useringDatum.getUseNum()); + } if (shouldAdd) { datas.add(useringDatum); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java index 4d6ca481..b706f614 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java @@ -101,4 +101,11 @@ public interface DirectRotationMapper { List getSignatureList(SltAgreementInfo sltAgreementInfo); ClzDirectApplyInfo getSignById(SltAgreementInfo sltAgreementInfo); + + /** + * 根据协议以及类型id查询待审核数量 + * @param useringDatum + * @return + */ + SltAgreementInfo getInfo(SltAgreementInfo useringDatum); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java index 444c15eb..7234d655 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java @@ -99,4 +99,11 @@ public interface DirectRotationService { * @return */ AjaxResult getSignatureList(SltAgreementInfo sltAgreementInfo); + + /** + * 根据协议以及类型id查询待审核数量 + * @param useringDatum + * @return + */ + SltAgreementInfo getInfo(SltAgreementInfo useringDatum); } 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 4c05c32c..b7846023 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 @@ -540,6 +540,16 @@ public class DirectRotationImpl implements DirectRotationService { } } + /** + * 根据协议以及类型id查询待审核数量 + * @param useringDatum + * @return + */ + @Override + public SltAgreementInfo getInfo(SltAgreementInfo useringDatum) { + return mapper.getInfo(useringDatum); + } + // 将签名分类的逻辑提取到一个单独的方法 private void classifySignature(ClzDirectApplyInfo clzDirectApplyInfo, LeaseOutSign leaseOutSign, List list1, List list2, List list3) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java index e9b06e7a..d192dce2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java @@ -208,7 +208,7 @@ public class SltAgreementInfo extends BaseEntity { private String maCode; - private Double useNum; + private BigDecimal useNum; private String keyWord; @@ -261,5 +261,11 @@ public class SltAgreementInfo extends BaseEntity { */ private Boolean enableQuerySltData = false; + @ApiModelProperty(value = "待转数量") + private BigDecimal waitTransNum; + + @ApiModelProperty(value = "可转数量") + private BigDecimal transNum; + } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml index 94c06e4f..dbfc18cc 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml @@ -103,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and unit_name = #{teamName} + Limit 1 + + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index fc92ad50..12c4a3e4 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.result BETWEEN #{prefix} and #{suffix} - order by a.createTime desc + order by a.maId desc