From a5cdbf569067822e3232d2177b8a9aac1ed95b69 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期三, 29 五月 2024 17:32:00 +0800 Subject: [PATCH] 1. 修改自评逻辑中,问题整改的判断方式为已整改并且整改审核通过; 2. 新增评估详情获取接口; --- src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/ComplaintAndPunishmentRep.kt | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/ComplaintAndPunishmentRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/ComplaintAndPunishmentRep.kt index 3c60c11..f6f0caa 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/ComplaintAndPunishmentRep.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/ComplaintAndPunishmentRep.kt @@ -6,10 +6,12 @@ import cn.flightfeather.supervision.lightshare.vo.ComplaintVo import cn.flightfeather.supervision.lightshare.vo.PunishmentVo import org.springframework.stereotype.Repository +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter import java.util.* /** - * 淇¤鎶曡瘔鍜岃鏀垮缃氭暟鎹簱鐩稿叧鎿嶄綔 + * 淇¤鎶曡瘔鍜岃鏀垮缃氭暟鎹簱鐩稿叧鎿嶄綔 */ @Repository class ComplaintAndPunishmentRep( @@ -30,6 +32,12 @@ return findComplaint(tzUserIdList, s, e) } + fun findComplaint(tzUserIdList: List<String?>, sTime: LocalDateTime?, eTime: LocalDateTime?): List<ComplaintVo?> { + val s = sTime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + val e = eTime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + return findComplaint(tzUserIdList, s, e) + } + fun findComplaint(tzUserIdList: List<String?>, sTime: String?, eTime: String?): List<ComplaintVo?> { return complaintMapper.findComplaint(tzUserIdList, sTime, eTime) } @@ -44,6 +52,12 @@ return findPunishment(tzUserIdList, s, e) } + fun findPunishment(tzUserIdList: List<String?>, sTime: LocalDateTime?, eTime: LocalDateTime?): List<PunishmentVo?> { + val s = sTime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + val e = eTime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + return findPunishment(tzUserIdList, s, e) + } + fun findPunishment(tzUserIdList: List<String?>, sTime: String?, eTime: String?): List<PunishmentVo?> { return punishmentMapper.findPunishment(tzUserIdList, sTime, eTime) } -- Gitblit v1.9.3