This commit is contained in:
@jyuhsin
2025-03-14 19:40:08 +08:00
parent a3d02c0f99
commit 48df9221b8
5 changed files with 172 additions and 15 deletions
@@ -137,8 +137,9 @@ public class TrainSignUpUserAdjustController {
@Param(value = "unionId", required = false) String unionId,
@Param(value = "unitId", required = false) String unitId,
@Param(value = "searchName", required = false) String searchName,
@Param(value = "sex", required = false) String sex,
@Param(value = "searchKeyword", required = false) String searchKeyword) {
return trainSignUpActivityStatisticsService.registerUserList(courseId, unionId, unitId, searchName, searchKeyword);
return trainSignUpActivityStatisticsService.registerUserList(courseId, unionId, unitId, searchName, searchKeyword, sex);
}
@At
@@ -39,7 +39,7 @@ public interface TrainSignUpActivityStatisticsService extends ViService<TrainSig
* @param courseId
* @return
*/
List<NutMap> registerUserList(String courseId, String unionId, String unitId, String searchName, String searchKeyword);
List<NutMap> registerUserList(String courseId, String unionId, String unitId, String searchName, String searchKeyword, String sex);
/**
* 获取每个课程的签到情况
@@ -8,6 +8,7 @@ import io.v.nutz.base.utils.Vi;
import io.v.nutz.zhgh.trainSignUp.models.TrainSignUpUser;
import io.v.nutz.zhgh.trainSignUp.service.TrainSignUpActivityStatisticsService;
import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
@@ -84,7 +85,7 @@ public class TrainSignUpActivityStatisticsServiceImpl extends ViServiceImpl<Trai
}
@Override
public List<NutMap> registerUserList(String courseId, String unionId, String unitId, String searchName, String searchKeyword) {
public List<NutMap> registerUserList(String courseId, String unionId, String unitId, String searchName, String searchKeyword, String sex) {
Sql sql = Sqls.create("""
SELECT
tsuu.id,
@@ -103,10 +104,11 @@ public class TrainSignUpActivityStatisticsServiceImpl extends ViServiceImpl<Trai
$condition
ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
""");
CndPlus cnd = new CndPlus();
cnd.andEx("tsuu.courseId", "=", courseId);
cnd.andEx("u.unionid", "=", unionId);
cnd.andEx("u.unitid", "=", unitId);
Cnd cnd = Cnd.NEW();
cnd.andEX("tsuu.courseId", "=", courseId);
cnd.andEX("u.unionid", "=", unionId);
cnd.andEX("u.unitid", "=", unitId);
cnd.andEX("u.sex", "=", sex);
if (Vi.isNotBlank(searchName, searchKeyword)) {
cnd.where().andLike(searchName, searchKeyword);
}