From eadc1f646e81e8ffbe940b13163aee9d107d6663 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 13 三月 2024 09:03:32 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
index b8b31e8..ac2c755 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
@@ -129,7 +129,6 @@
if (null != student) {
Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId());
participantVo.setResidueClassHour(integer);
- participantVo.setIsStudent(1);
} else {
participantVo.setResidueClassHour(0);
@@ -148,7 +147,6 @@
continue;
}
linkedHashMap.put(participant.getIdcard(), participantVo);
-// listVo.add(participantVo);
}
@@ -232,10 +230,16 @@
* @throws Exception
*/
@Override
- public ResultUtil delParticipant(Integer id) throws Exception {
- Participant participant = this.getById(id);
- participant.setState(3);
- this.updateById(participant);
+ public ResultUtil delParticipant(Integer id, Integer isStudent) throws Exception {
+ if(isStudent == 1){
+ TStudent tStudent = studentClient.queryById(id);
+ tStudent.setState(3);
+ studentClient.updateAppUser(tStudent);
+ }else{
+ Participant participant = this.getById(id);
+ participant.setState(3);
+ this.updateById(participant);
+ }
return ResultUtil.success();
}
--
Gitblit v1.7.1