费用率BI

src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java

@@ -44,9 +44,9 @@ public class BirRoiRateController {
     public R<?> getPage(){
         //移除当年所有
         int year = 2023;
-        LambdaQueryWrapper<BirBaseActivity> rmLqw = new LambdaQueryWrapper<>();
+//        LambdaQueryWrapper<BirBaseActivity> rmLqw = new LambdaQueryWrapper<>();
-        rmLqw.likeRight(BirBaseActivity::getKeyNum,year);
+//        rmLqw.likeRight(BirBaseActivity::getKeyNum,year);
-        activityService.remove(rmLqw);
+//        activityService.remove(rmLqw);
         //重新生成记录
         for (int i = 0; i < 12; i++) {
             activityService.buildReport(year,i+1);

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

@@ -112,7 +112,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
             supplierCodeList.add(bmsSupplier.getCode());
             costDTO.setSupplierId(supplierId);
         }else if (loadType.equals(1)){
-            //1->申请人的客户(不含当前客户)
+            //1->申请人的客户
             String userId = AuthContextUtils.getSysUserId();
             costDTO.setNotSupplierId(supplierId);
             costDTO.setUserId(userId);
@@ -125,7 +125,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
                     .distinct().collect(Collectors.toList());
             supplierCodeList.addAll(supplierCodes);
         }else if(loadType.equals(2)){
-            //2->客户的行政区域(不含当前客户)
+            //2->客户的行政区域
             if(checkNotNullVale(bmsSupplier.getRegion2Fourthly())){
                 lqw.eq(BmsSupplier::getRegion2Fourthly,bmsSupplier.getRegion2Fourthly());
             }else if (checkNotNullVale(bmsSupplier.getRegion2Third())){
@@ -136,7 +136,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
                 lqw.eq(BmsSupplier::getRegion2First,bmsSupplier.getRegion2First());
             }
         }else if(loadType.equals(3)){
-            //3->客户的销售区域(不含当前客户)
+            //3->客户的销售区域
             if(checkNotNullVale(bmsSupplier.getRegionFourthly())){
                 lqw.eq(BmsSupplier::getRegionFourthly,bmsSupplier.getRegionFourthly());
             }else if (checkNotNullVale(bmsSupplier.getRegionThird())){
@@ -174,7 +174,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
                 for (ErpDispatchSumVo dispatchSumVo : dispatchSumVos) {
                     if(dispatchSumVo.getYearMonth().equals(costItemVo.getYearMonth())){
                         // 预估金额(后追加功能，发货金额=原发货金额+预估金额)
-                        costItemVo.setDispatchAmt(dispatchSumVo.getDispatchSumCost().add(costItemVo.getPreAmt()));
+                        costItemVo.setDispatchAmt(dispatchSumVo.getDispatchSumCost());
                         break;
                     }
                 }

src/main/java/com/qs/serve/task/BitTask.java

@@ -23,13 +23,10 @@ public class BitTask {
 
     private BirBaseActivityService activityService;
 
-    @Scheduled(cron="0 0 1 * * ?")
+//    @Scheduled(cron="0 0 1 * * ?")
     public void buildTempTable(){
         //移除当年所有
         int year = 2023;
-        LambdaQueryWrapper<BirBaseActivity> rmLqw = new LambdaQueryWrapper<>();
-        rmLqw.likeRight(BirBaseActivity::getKeyNum,year);
-        activityService.remove(rmLqw);
         //重新生成记录
         for (int i = 0; i < 12; i++) {
             activityService.buildReport(year,i+1);

src/main/java/com/qs/serve/task/controller/TaskActivityController.java

@@ -117,13 +117,7 @@ public class TaskActivityController {
 
 
     private void syncYearMonthActivity(Integer month, Integer year) {
-        LambdaQueryWrapper<BirBaseActivity> rmLqw = new LambdaQueryWrapper<>();
+
-        if (month <10){
-            rmLqw.eq(BirBaseActivity::getKeyNum, year +"0"+ month);
-        }else {
-            rmLqw.eq(BirBaseActivity::getKeyNum, year +""+ month);
-        }
-        birBaseActivityService.remove(rmLqw);
         birBaseActivityService.buildReport(year, month);
     }