费用率

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

@@ -185,6 +185,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         BigDecimal costAmt = BigDecimal.ZERO;
         BigDecimal dispatchAmt = BigDecimal.ZERO;
 
+        currMonth = currMonth.plusMonths(-1);
         int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue();
         int startMonthNum = currMonth.getYear()*100 + 1;
 
@@ -218,6 +219,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
             return qtdPercent;
         }
 
+        currMonth = currMonth.plusMonths(-1);
         int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue();
         int startMonthNum = currMonth.getYear()*100 + firstMonthInteger;
 
@@ -252,6 +254,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
             return ;
         }
 
+        currMonth = currMonth.plusMonths(-1);
         int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue();
         int startMonthNum = currMonth.getYear()*100 + 1;
 
@@ -284,6 +287,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
             return ;
         }
 
+        currMonth = currMonth.plusMonths(-1);
         int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue();
         int startMonthNum = currMonth.getYear()*100 + firstMonthInteger;
 

src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostPercentMapper.java

@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Update;
  */
 public interface TbsCostPercentMapper extends BaseMapper<TbsCostPercent> {
 
-    @Update("update tbs_cost_percent set del_flag = 1 where id = #{costId}}")
+    @Update("update tbs_cost_percent set del_flag = 1 where cost_apply_id = #{costId}")
     void delByCostApplyId(@Param("costId")Long costApplyId);
 
 }

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -236,14 +236,23 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         tbsCostPercentMapper.delByCostApplyId(tbsCostApply.getId());
         TbsCostPercent costPercent = new TbsCostPercent();
         costPercent.setCostApplyId(tbsCostApply.getId());
-        costPercent.setYtdCustomerPercent(BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()));
-        costPercent.setYtdUserPercent(BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()));
-        costPercent.setYtdRegion2Percent(BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()));
-        costPercent.setYtdRegionPercent(BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()));
-        costPercent.setQtdCustomerPercent(BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()));
-        costPercent.setQtdUserPercent(BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()));
-        costPercent.setQtdRegion2Percent(BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()));
-        costPercent.setQtdRegionPercent(BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()));
+        costPercent.setYtdCustomerPercent(ytdQtdToOAVo.getYtdCustomerPercent()==null?
+                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()));
+        costPercent.setYtdUserPercent(ytdQtdToOAVo.getYtdUserPercent()==null?
+                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdUserPercent()));
+        costPercent.setYtdRegion2Percent(ytdQtdToOAVo.getYtdRegion2Percent()==null?
+                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegion2Percent()));
+        costPercent.setYtdRegionPercent(ytdQtdToOAVo.getYtdRegionPercent()==null?
+                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegionPercent()));
+        costPercent.setQtdCustomerPercent(ytdQtdToOAVo.getQtdCustomerPercent()==null?
+                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdCustomerPercent()));
+        costPercent.setQtdUserPercent(ytdQtdToOAVo.getQtdUserPercent()==null?
+                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdUserPercent()));
+        costPercent.setQtdRegion2Percent(ytdQtdToOAVo.getQtdRegion2Percent()==null?
+                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegion2Percent()));
+        costPercent.setQtdRegionPercent(ytdQtdToOAVo.getQtdRegionPercent()==null?
+                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegionPercent()));
+
         tbsCostPercentMapper.insert(costPercent);
 
 
@@ -281,7 +290,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                     activityCenter.getCenterId()));
         }
         //TODO 目标费率
-        List<TbsBudgetCostItem> tbsBudgetCostItems = budgetCostItemService.listByCostApplyId(Long.parseLong(id));
+        List<TbsBudgetCostItem> tbsBudgetCostItems = result.getBudgetMatchList();
         List<Long> scheduleItemBudgetIds = tbsBudgetCostItems.stream().map(a->a.getScheduleItemBudgetId()).distinct().collect(Collectors.toList());
         List<TbsScheduleItemBudget> tbsScheduleItemBudgets = tbsScheduleItemBudgetMapper.selectBatchIds(scheduleItemBudgetIds);
         for(TbsScheduleItemBudget tbsScheduleItemBudget : tbsScheduleItemBudgets){