FR200 查询用户护理记录(面膜促渗、精华促渗、LED光照)

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<WxNursingLog> list = wxNursingLogService.fr200RecordOther(nursingLogId);
+        return getDataTable(list);
+    }
+
 
 }

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<WxNursingLog> fr200MoistureTestRecord(Long instrumentId, Date queryDate);
+
+    List<WxNursingLog> fr200RecordOther(Long nursingLogId);
 }

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<WxNursingLog> 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<WxNursingLog> fr200RecordOther(Long nursingLogId) {
-        /*WxNursingLog nursingLog = wxNursingLogMapper.selectWxNursingLogById(nursingLogId);
+        // 查询护理记录
-        Long userId = nursingLog.getUserId();
+        WxNursingLog wxNursingLog = wxNursingLogMapper.selectWxNursingLogById(nursingLogId);
-        Long modeId = nursingLog.getModeId();*/
+        if (wxNursingLog == null) {
-
+            throw new ServiceException("参数有误");
-
-
-        /*// 排序：最新的护理记录在最上方；图片由后台模式管理-模式封面图片进行配置；
-        WxNursingLog wxNursingLog = new WxNursingLog();
-        if (instrumentId != null) {
-            wxNursingLog.setInstrumentId(instrumentId);
-        }
-        if (queryDate != null) {
-            wxNursingLog.getParams().put("endTime", queryDate);
         }
-        wxNursingLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());*/
+        // 查询模式信息
-        /*List<WxNursingLog> 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<WxNursingLog> 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 wxNursingLogList;
-        return null;
     }
 
     /**