From d619f136643de2a5876bb85b6247a0e8d46c6607 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Tue, 15 Jul 2025 13:05:40 +0800 Subject: [PATCH] 33334 --- .../form/CaseplatformCaseQueryForm.java | 3 ++ .../service/CaseplatformCaseService.java | 40 ++++++++++++++++--- .../CaseplatformCaseMapper.xml | 8 ++-- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseplatformCaseQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseplatformCaseQueryForm.java index f9e0a1c..3b809e4 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseplatformCaseQueryForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseplatformCaseQueryForm.java @@ -41,6 +41,9 @@ public class CaseplatformCaseQueryForm extends PageParam{ @ApiModelProperty(value = "审核时间") private List examineTime; + @ApiModelProperty(hidden = true) + private List examineTimeFormatted; + @ApiModelProperty(value = "省份") private Long provId; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java index 52adf6e..6e562c6 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java @@ -60,6 +60,7 @@ import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import static net.lab1024.sa.common.common.code.UserErrorCode.NO_AUTH; @@ -136,10 +137,20 @@ public class CaseplatformCaseService { // 时间处理 if (queryForm.getExamineTime() != null && queryForm.getExamineTime().size() == 2) { - LocalDateTime start = queryForm.getExamineTime().get(0).withHour(0).withMinute(0).withSecond(0).withNano(0); - LocalDateTime end = queryForm.getExamineTime().get(1).withHour(23).withMinute(59).withSecond(59).withNano(999_999_999); + LocalDateTime start = queryForm.getExamineTime().get(0) + .withHour(0).withMinute(0).withSecond(0).withNano(0); + LocalDateTime end = queryForm.getExamineTime().get(1) + .withHour(23).withMinute(59).withSecond(59).withNano(0); + queryForm.getExamineTime().set(0, start); queryForm.getExamineTime().set(1, end); + + // 格式化后的字符串列表 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + List formattedList = new ArrayList<>(); + formattedList.add(start.format(formatter)); + formattedList.add(end.format(formatter)); + queryForm.setExamineTimeFormatted(formattedList); } List list = caseplatformCaseDao.queryPage(page, queryForm, provList); @@ -157,6 +168,24 @@ public class CaseplatformCaseService { return null; } } + + if (queryForm.getExamineTime() != null && queryForm.getExamineTime().size() == 2) { + LocalDateTime start = queryForm.getExamineTime().get(0) + .withHour(0).withMinute(0).withSecond(0).withNano(0); + LocalDateTime end = queryForm.getExamineTime().get(1) + .withHour(23).withMinute(59).withSecond(59).withNano(0); + + queryForm.getExamineTime().set(0, start); + queryForm.getExamineTime().set(1, end); + + // 格式化后的字符串列表 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + List formattedList = new ArrayList<>(); + formattedList.add(start.format(formatter)); + formattedList.add(end.format(formatter)); + queryForm.setExamineTimeFormatted(formattedList); + } + List list = caseplatformCaseDao.queryPage(null, queryForm, provList); return list; } @@ -423,10 +452,9 @@ public class CaseplatformCaseService { return ResponseDTO.userErrorParam("该用户未签署协议"); } - CaseplatformCaseEntity caseplatformCaseData = new CaseplatformCaseEntity(); - caseplatformCaseData.setStatus(status); - caseplatformCaseData.setExamineTime(LocalDateTime.now()); - caseplatformCaseDao.examine(case_id, status); + caseplatformCase.setStatus(status); + caseplatformCase.setExamineTime(LocalDateTime.now()); + caseplatformCaseDao.updateById(caseplatformCase); return ResponseDTO.ok(); } diff --git a/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml b/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml index e871f46..0af15f3 100644 --- a/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml @@ -56,8 +56,8 @@ AND t_caseplatform_expert.hospital_uuid =#{queryForm.hospitalUuid} - - AND t_caseplatform_case.examine_time BETWEEN #{queryForm.examineTime[0]} AND #{queryForm.examineTime[1]} + + AND t_caseplatform_case.examine_time BETWEEN #{queryForm.examineTimeFormatted[0]} AND #{queryForm.examineTimeFormatted[1]} order by t_caseplatform_case.create_time desc @@ -178,8 +178,8 @@ AND t_caseplatform_expert.hospital_uuid =#{queryForm.hospitalUuid} - - AND t_caseplatform_case.examine_time BETWEEN #{queryForm.examineTime[0]} AND #{queryForm.examineTime[1]} + + AND t_caseplatform_case.examine_time BETWEEN #{queryForm.examineTimeFormatted[0]} AND #{queryForm.examineTimeFormatted[1]}