From e350ed7ffc3a57387186c602d99443d6f936d549 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 七月 2023 08:31:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index dc7cee2..515f5bc 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -26,6 +26,7 @@
import com.dsh.account.mapper.TStudentMapper;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassDetailsInsVo;
import com.dsh.account.model.vo.classDetails.classInsVo.StuDetailsReq;
+import com.dsh.account.model.vo.classDetails.classInsVo.StuListVo;
import com.dsh.account.model.vo.exploreDetail.ExploreDatasVo;
import com.dsh.account.model.vo.exploreDetail.LonLatRequest;
import com.dsh.account.model.vo.exploreDetails.QuestionDetailsVo;
@@ -35,6 +36,7 @@
import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest;
import com.dsh.account.service.TStudentService;
import com.dsh.account.util.DateTimeHelper;
+import com.dsh.account.util.DateUtil;
import com.dsh.account.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -163,7 +165,7 @@
purchaseRecordVoList.addAll(purchaseRecordVos);
List<TAppUser> tAppUsers = tauMapper.selectList(new QueryWrapper<TAppUser>()
.eq("referralUserId",appUserId )
- .between("insertTime",timeRequest.getStartTime() ,timeRequest.getEndTime()));
+ .between("insertTime",startTime ,endTime));
List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList());
List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(startTime, endTime, userIds);
purchaseRecordVoList.addAll(purchaseRecordVos1);
@@ -225,6 +227,36 @@
return datasVo;
}
+ @Override
+ public List<StuListVo> switchStudentActions(Integer appUserId, Integer stuId) {
+ List<StuListVo> stuListVos = new ArrayList<>();
+ List<TStudent> tStudents = this.baseMapper.selectList(new QueryWrapper<TStudent>()
+ .eq("appUserId", appUserId)
+ .eq("state",1));
+ if (tStudents.size() > 0) {
+ tStudents.forEach(sts -> {
+ if (Objects.equals(sts.getId(), stuId)) {
+ sts.setIsDefault(1);
+ } else {
+ sts.setIsDefault(2);
+ }
+ this.baseMapper.updateById(sts);
+
+ StuListVo vo = new StuListVo();
+ vo.setStuId(sts.getId());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ vo.setBirthday(simpleDateFormat.format(sts.getBirthday()));
+ vo.setStuName(sts.getName());
+ vo.setStuAge(DateUtil.age(sts.getBirthday()));
+ vo.setStuHeight(sts.getHeight());
+ vo.setStuWeight(sts.getWeight());
+ vo.setIsNot(sts.getIsDefault());
+ stuListVos.add(vo);
+ });
+ }
+ return stuListVos;
+ }
+
public static List<PurchaseRecordVo> dealDataOfTime(List<PurchaseRecordVo> purchaseRecords) {
Collections.sort(purchaseRecords, new Comparator<PurchaseRecordVo>() {
--
Gitblit v1.7.1