diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index be090deb..365b0b4a 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/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 rmLqw = new LambdaQueryWrapper<>(); - rmLqw.likeRight(BirBaseActivity::getKeyNum,year); - activityService.remove(rmLqw); +// LambdaQueryWrapper rmLqw = new LambdaQueryWrapper<>(); +// rmLqw.likeRight(BirBaseActivity::getKeyNum,year); +// activityService.remove(rmLqw); //重新生成记录 for (int i = 0; i < 12; i++) { activityService.buildReport(year,i+1); diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java index c02f5794..fe483668 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java @@ -112,7 +112,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl申请人的客户(不含当前客户) + //1->申请人的客户 String userId = AuthContextUtils.getSysUserId(); costDTO.setNotSupplierId(supplierId); costDTO.setUserId(userId); @@ -125,7 +125,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl客户的行政区域(不含当前客户) + //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客户的销售区域(不含当前客户) + //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 rmLqw = new LambdaQueryWrapper<>(); - rmLqw.likeRight(BirBaseActivity::getKeyNum,year); - activityService.remove(rmLqw); //重新生成记录 for (int i = 0; i < 12; i++) { activityService.buildReport(year,i+1); diff --git a/src/main/java/com/qs/serve/task/controller/TaskActivityController.java b/src/main/java/com/qs/serve/task/controller/TaskActivityController.java index 6522a781..e4560633 100644 --- a/src/main/java/com/qs/serve/task/controller/TaskActivityController.java +++ b/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 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); }