From 062fb1ed6efcaac5d75bbe184524c4929dff7fcd Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 18 十月 2023 15:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 177094a..56f4884 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -24,6 +24,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -93,6 +94,19 @@
}
}
}
+ return result;
+ }else if (query.getStoreId()!=null){
+ for (PaymentCompetition paymentCompetition : paymentCompetitions) {
+ Integer competitionId = paymentCompetition.getCompetitionId();
+ Competition byId = cttService.getById(competitionId);
+ if (byId!=null){
+ String storeId = byId.getStoreId();
+ if (storeId.contains(query.getStoreId().toString())){
+ result.add(paymentCompetition);
+ }
+ }
+ }
+ return result;
}
return paymentCompetitions;
}
@@ -652,6 +666,59 @@
}
+ @ResponseBody
+ @PostMapping("/base/competition/actYys")
+ public HashMap<String, Object> actYys(@RequestBody CompetionVO vo){
+ HashMap<String, Object> map = new HashMap<>();
+ if(vo.getIds().size()==0){
+ vo.getIds().add(-1);
+ }
+ ArrayList<Object> integers = new ArrayList<>();
+ int year = DateUtil.year(new Date());
+ for (int i = 0; i < 10; i++) {
+ integers.add(year-i);
+ }
+ List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
+ // 年
+ ArrayList<Integer> years = new ArrayList<>();
+ ArrayList<Integer> yearsUser = new ArrayList<>();
+ Integer operatorId = vo.getOperatorId();
+ List<Integer> operatorId1 = cttService.list(new QueryWrapper<Competition>().eq("operatorId", operatorId))
+ .stream().map(Competition::getId).collect(Collectors.toList());
+ for (Object o : collect) {
+ String s = o.toString();
+ int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).eq(Competition::getOperatorId,vo.getOperatorId()));
+ int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, vo.getIds()).like(UserCompetition::getInsertTime,s));
+ years.add(count);
+ yearsUser.add(count1);
+ }
+ map.put("yearData",years);
+ map.put("yearsUser",yearsUser);
+ // 月
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ ArrayList<Integer> months = new ArrayList<>();
+ ArrayList<Integer> monthsUser = new ArrayList<>();
+ for (int i = 1; i <= 12; i++) {
+ double sum=0.0;
+ String m=i+"";
+ if(i<10){
+ m="0"+i;
+ }
+ String s = year + "-" + m;
+ int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).ne(Competition::getOperatorId,operatorId));
+ int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, vo.getIds()).like(UserCompetition::getInsertTime,s));
+ months.add(count);
+ monthsUser.add(count1);
+ }
+ map.put("monthData",months);
+ map.put("monthsUser",monthsUser);
+
+ return map;
+
+
+
+ }
}
--
Gitblit v1.7.1