diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java index 8b0b39aa..c67b8580 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java @@ -25,5 +25,6 @@ public interface BirActivityCenterGoodsMapper extends BaseMapper selectNoExistCenterGoods(); } diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java index 8a45d528..4ade3421 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java @@ -101,9 +101,23 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl noExist = this.baseMapper.selectNoExistCenterGoods(); + if(noExist.size()>0){ + List removeIds = noExist.stream().map(a-> { + BirRemoveId birRemoveId = new BirRemoveId(); + birRemoveId.setDeleteTime(LocalDateTime.now()); + birRemoveId.setId(a.getId()); + return birRemoveId; + }).collect(Collectors.toList()); + + removeIds.forEach(a->{ + birRemoveIdMapper.insert(a); + }); + } + this.removeBatchByIds(noExist); + activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null); // activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,15840L); if(activityCenterGoodsAllList.size()<1){ diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java index d31cc855..141cdf58 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java @@ -100,10 +100,10 @@ public class BirReportAccountBookServiceImpl implements BirReportAccountBookServ CopierUtil.copy(tbsBudgetPlan,budgetPlanVo); - BigDecimal plannedAmount = tbsBudgetLogMapper.countPlannedBudgetAmount(); + BigDecimal plannedAmount = tbsBudgetLogMapper.countPlannedBudgetAmount(year); budgetPlanVo.setPlannedAmount(plannedAmount); - BigDecimal usedAmount = tbsBudgetLogMapper.countUsedBudgetAmount(); + BigDecimal usedAmount = tbsBudgetLogMapper.countUsedBudgetAmount(year); budgetPlanVo.setUsedAmout(usedAmount); BigDecimal realSaleAmount = erpDispatchDataMapper.querySumCostAmt(Integer.parseInt(year+"01"),Integer.parseInt(year+"12"),null); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 8affa68d..367f9721 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -951,22 +951,22 @@ public class BmsSupplierController { List userCodes = new ArrayList<>(); userCodes.addAll( saveList.stream().filter(a->StringUtils.hasText(a.getMainHeadCode())) - .map(a->Arrays.asList(a.getMainHeadCode().split(","))) + .map(a->Arrays.asList(a.getMainHeadCode().split(";"))) .flatMap(List::stream).collect(Collectors.toList()) ); userCodes.addAll( saveList.stream().filter(a->StringUtils.hasText(a.getMinorHeadCodes())) - .map(a->Arrays.asList(a.getMinorHeadCodes().split(","))) + .map(a->Arrays.asList(a.getMinorHeadCodes().split(";"))) .flatMap(List::stream).collect(Collectors.toList()) ); userCodes.addAll( updateList.stream().filter(a->StringUtils.hasText(a.getMainHeadCode())) - .map(a->Arrays.asList(a.getMainHeadCode().split(","))) + .map(a->Arrays.asList(a.getMainHeadCode().split(";"))) .flatMap(List::stream).collect(Collectors.toList()) ); userCodes.addAll( updateList.stream().filter(a->StringUtils.hasText(a.getMinorHeadCodes())) - .map(a->Arrays.asList(a.getMinorHeadCodes().split(","))) + .map(a->Arrays.asList(a.getMinorHeadCodes().split(";"))) .flatMap(List::stream).collect(Collectors.toList()) ); userCodes = userCodes.stream().distinct().collect(Collectors.toList()); @@ -986,10 +986,10 @@ public class BmsSupplierController { } List userCodeTemp = new ArrayList<>(); if(StringUtils.hasText(a.getMainHeadCode())){ - userCodeTemp.addAll(Arrays.asList(a.getMainHeadCode().split(","))); + userCodeTemp.addAll(Arrays.asList(a.getMainHeadCode().split(";"))); } if(StringUtils.hasText(a.getMinorHeadCodes())){ - userCodeTemp.addAll(Arrays.asList(a.getMinorHeadCodes().split(","))); + userCodeTemp.addAll(Arrays.asList(a.getMinorHeadCodes().split(";"))); } List noExistUserCode = userCodeTemp.stream().filter(b->!exsitUserCodes.contains(b)).collect(Collectors.toList()); if(noExistUserCode.size()>0){ @@ -1105,7 +1105,7 @@ public class BmsSupplierController { } if(StringUtils.hasText(a.getMinorHeadCodes())){ - List otherUserCodes = Arrays.asList(a.getMinorHeadCodes().split(",")); + List otherUserCodes = Arrays.asList(a.getMinorHeadCodes().split(";")); List otherUserNames = new ArrayList<>(); List otherUserIds = new ArrayList<>(); otherUserCodes.forEach(b->{ @@ -1168,7 +1168,7 @@ public class BmsSupplierController { } if(StringUtils.hasText(a.getMinorHeadCodes())){ - List otherUserCodes = Arrays.asList(a.getMinorHeadCodes().split(",")); + List otherUserCodes = Arrays.asList(a.getMinorHeadCodes().split(";")); List otherUserNames = new ArrayList<>(); List otherUserIds = new ArrayList<>(); otherUserCodes.forEach(b->{ diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java index e8ad1ceb..3b30d098 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java @@ -18,11 +18,16 @@ public interface TbsBudgetLogMapper extends BaseMapper { @Select("SELECT SUM(amount) FROM `tbs_budget_log` WHERE budget_id = #{budgetId} AND schedule_item_id = #{itemId} AND del_flag = '0'") BigDecimal countBudgetItemAmount(@Param("budgetId")Long budgetId,@Param("itemId")Long itemId ); - @Select("SELECT ROUND(SUM(amount),2) FROM `tbs_budget_log` WHERE opt_type in (0,2,3) and del_flag = '0'") - BigDecimal countPlannedBudgetAmount(); - - @Select("SELECT ROUND(abs(SUM(amount)),2) FROM `tbs_budget_log` WHERE opt_type in (1,4,5,6,11,12,13,14,15) and del_flag = '0'") - BigDecimal countUsedBudgetAmount(); + @Select("SELECT ROUND(SUM(l.amount),2) FROM `tbs_budget_log` l left join tbs_schedule_item_budget i " + + " on l.schedule_item_budget_id = i.id " + + " WHERE l.opt_type in (0,2,3) and l.del_flag = '0' " + + " and i.del_flag = '0' and year(i.start_date) = #{year} and year(i.end_date) = #{year}") + BigDecimal countPlannedBudgetAmount(@Param("year")String year); + + @Select("SELECT ROUND(abs(SUM(l.amount)),2) FROM `tbs_budget_log` l left join tbs_schedule_item_budget i " + + " on l.schedule_item_budget_id = i.id WHERE l.opt_type in (1,4,5,6,11,12,13,14,15) " + + " and l.del_flag = '0' and i.del_flag = '0' and year(i.start_date) = #{year} and year(i.end_date) = #{year}") + BigDecimal countUsedBudgetAmount(@Param("year")String year); /** * 更新删除预算log记录，用于异动 diff --git a/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml b/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml index 39c8ee57..df7a203c 100644 --- a/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml +++ b/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml @@ -105,8 +105,10 @@ where 1=1 and tbs_activity.del_flag = 0 + and tbs_activity.cancel_flag = 0 and tbs_activity_center_goods.del_flag = 0 and tbs_cost_apply.del_flag = 0 + and tbs_cost_apply.cancel_flag = 0 and tbs_cost_apply.charge_state in (2,3) and ( bir_activity_center_goods.activity_id is null @@ -131,6 +133,25 @@ - +