From 62e82e3753463744e988646bf4760757e380f2e1 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Fri, 22 Mar 2024 14:56:25 +0800 Subject: [PATCH] =?UTF-8?q?FR200=20=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8A=A4=E7=90=86=E8=AE=B0=E5=BD=95(=E9=9D=A2=E8=86=9C?= =?UTF-8?q?=E4=BF=83=E6=B8=97=E3=80=81=E7=B2=BE=E5=8D=8E=E4=BF=83=E6=B8=97?= =?UTF-8?q?=E3=80=81LED=E5=85=89=E7=85=A7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxNursingLogController.java | 10 +++++ .../service/IWxNursingLogService.java | 2 + .../service/impl/WxNursingLogServiceImpl.java | 41 ++++++++++--------- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java index 95832ea..dae1258 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java @@ -92,5 +92,15 @@ public class WxNursingLogController extends BaseController { return getDataTable(list); } + /** + * FR200 查询用户护理记录(面膜促渗、精华促渗、LED光照) + */ + @GetMapping("/record/fr200/other") + public TableDataInfo fr200RecordOther(@RequestParam("nursingLogId") Long nursingLogId) { + startPage(); + List list = wxNursingLogService.fr200RecordOther(nursingLogId); + return getDataTable(list); + } + } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxNursingLogService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxNursingLogService.java index 747111b..e09a97b 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxNursingLogService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxNursingLogService.java @@ -33,4 +33,6 @@ public interface IWxNursingLogService { WxNursingStatisticsRet fr200Statistics(Long nursingId); List fr200MoistureTestRecord(Long instrumentId, Date queryDate); + + List fr200RecordOther(Long nursingLogId); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java index 2d5bd34..aa41d49 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java @@ -91,7 +91,8 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { } if (queryDate != null) { // 不包含当天 - wxNursingLog.getParams().put("endTime", queryDate); + LocalDateTime endDate = LocalDateTime.ofInstant(queryDate.toInstant(), ZoneId.systemDefault()).with(LocalTime.MAX).minusDays(1); + wxNursingLog.getParams().put("endTime", endDate); } wxNursingLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); List wxNursingLogList = wxNursingLogMapper.selectWxNursingLogList(wxNursingLog); @@ -192,7 +193,7 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { } if (queryDate != null) { // 包含当天 - LocalDateTime endDate = LocalDateTime.ofInstant(queryDate.toInstant(), ZoneId.systemDefault()).plusDays(1); + LocalDateTime endDate = LocalDateTime.ofInstant(queryDate.toInstant(), ZoneId.systemDefault()).with(LocalTime.MAX); wxNursingLog.getParams().put("endTime", endDate); } wxNursingLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); @@ -229,22 +230,25 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { @Override public List fr200RecordOther(Long nursingLogId) { - /*WxNursingLog nursingLog = wxNursingLogMapper.selectWxNursingLogById(nursingLogId); - Long userId = nursingLog.getUserId(); - Long modeId = nursingLog.getModeId();*/ - - - - /*// 排序：最新的护理记录在最上方；图片由后台模式管理-模式封面图片进行配置； - WxNursingLog wxNursingLog = new WxNursingLog(); - if (instrumentId != null) { - wxNursingLog.setInstrumentId(instrumentId); - } - if (queryDate != null) { - wxNursingLog.getParams().put("endTime", queryDate); + // 查询护理记录 + WxNursingLog wxNursingLog = wxNursingLogMapper.selectWxNursingLogById(nursingLogId); + if (wxNursingLog == null) { + throw new ServiceException("参数有误"); } - wxNursingLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());*/ - /*List wxNursingLogList = wxNursingLogMapper.selectWxNursingLogList(null); + // 查询模式信息 + WxMode mode = wxModeMapper.selectWxModeById(wxNursingLog.getModeId()); + // 获取模式分类 + Long modeClass = mode.getModeClass(); + // 获取用户ID + Long userId = wxNursingLog.getUserId(); + // 构建查询条件 + WxNursingLog queryNursingLog = new WxNursingLog(); + LocalDateTime selectTime = LocalDateTime.ofInstant(wxNursingLog.getCreateTime().toInstant(), ZoneId.systemDefault()); + // 不包含当天 + queryNursingLog.getParams().put("endTime", selectTime.with(LocalTime.MAX).minusDays(1)); + queryNursingLog.setUserId(userId); + List wxNursingLogList = wxNursingLogMapper.fr200Statistics(queryNursingLog, modeClass); + if (wxNursingLogList != null && wxNursingLogList.size() > 0) { for (WxNursingLog nursingLog : wxNursingLogList) { WxMode wxMode = wxModeMapper.selectWxModeById(nursingLog.getModeId()); @@ -272,8 +276,7 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { } } } - return wxNursingLogList;*/ - return null; + return wxNursingLogList; } /**