diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index d441fc1..33f71bc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java @@ -118,7 +118,7 @@ public interface LeaseOutDetailsMapper { int updateOutTimeDetails(TmTask bean); - TmTask getSlt(TmTask bean); + List getSlt(TmTask bean); int updateOutTimeSlt(TmTask bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 411ed84..a00526f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -253,9 +253,11 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { } List sltList = new ArrayList<>(); for(TmTask tmTask : detailList){ - TmTask sltDetail = leaseOutDetailsMapper.getSlt(tmTask); - if(sltDetail != null){ - sltList.add(sltDetail); + List sltDetailList = leaseOutDetailsMapper.getSlt(tmTask); + if(!sltDetailList.isEmpty()){ + for(TmTask tmTaskThree : sltDetailList){ + sltList.add(tmTaskThree); + } } } if(!sltList.isEmpty()){ diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml index a759370..7cddaea 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml @@ -120,14 +120,14 @@ mt.type_id as deviceTypeId, mt2.type_name AS typeName, mt.type_name AS deviceType, - lad.sets_num as setsNum, + #{outNum} as setsNum, CASE mt.manage_type WHEN 0 THEN IFNULL(subquery0.num, 0) ELSE IFNULL(mt.num, 0) END as num, - case when lad.update_num IS NOT NULL then lad.update_num else lad.pre_num * lad.sets_num end as applyNum, + case when lad.update_num IS NOT NULL then (lad.update_num / lad.sets_num) * #{outNum} else (lad.pre_num / lad.sets_num) * #{outNum} end as applyNum, mt.is_storage AS isStorage from lease_apply_details lad left join ma_type mt on lad.type_id = mt.type_id diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 37a25eb..ed2e9aa 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -780,12 +780,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"