Browse Source

BIR和台帐修BUG

v1.0
15989082884@163.com 2 years ago
parent
commit
35ae8f8b94
  1. 1
      src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java
  2. 16
      src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
  3. 4
      src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java
  4. 15
      src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java
  5. 23
      src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml

1
src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java

@ -25,5 +25,6 @@ public interface BirActivityCenterGoodsMapper extends BaseMapper<BirActivityCent
@Param("endDate")LocalDate endDate,
@Param("costApplyId")Long costApplyId);
List<BirActivityCenterGoods> selectNoExistCenterGoods();
}

16
src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java

@ -101,9 +101,23 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
birRemoveIdMapper.insert(a);
});
}
this.remove(birBaseActivityLqw);
List<BirActivityCenterGoods> noExist = this.baseMapper.selectNoExistCenterGoods();
if(noExist.size()>0){
List<BirRemoveId> 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){

4
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);

15
src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java

@ -18,11 +18,16 @@ public interface TbsBudgetLogMapper extends BaseMapper<TbsBudgetLog> {
@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记录用于异动

23
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 @@
</if>
</select>
<select id="selectNoExistCenterGoods" resultType="com.qs.serve.modules.tbs.entity.BirActivityCenterGoods">
select
bir_activity_center_goods.*
from bir_activity_center_goods
left join tbs_activity_center_goods
on tbs_activity_center_goods.id = bir_activity_center_goods.activity_center_goods_id
left join `tbs_cost_apply`
on `bir_activity_center_goods`.cost_apply_id = `tbs_cost_apply`.id
where
(
tbs_cost_apply.id is null
and tbs_activity_center_goods.id is null
)
or (
tbs_activity_center_goods.del_flag = 1
and tbs_cost_apply.del_flag = 1
and tbs_cost_apply.cancel_flag = 1
and tbs_cost_apply.charge_state not in (2,3)
)
</select>
</mapper>

Loading…
Cancel
Save