护理报告增加查询时间

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java

@@ -1,20 +1,18 @@
 package com.flossom.miniProgram.controller;
 
+import java.util.Date;
 import java.util.List;
 
 import com.flossom.common.core.domain.R;
 import com.flossom.common.core.domain.entity.WxNursingLog;
 import com.flossom.common.core.domain.req.WxNursingLogReq;
 import com.flossom.common.core.web.controller.BaseController;
-import com.flossom.common.core.web.domain.AjaxResult;
 import com.flossom.common.core.web.page.TableDataInfo;
 import com.flossom.miniProgram.service.IWxNursingLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 
 /**
  * 用户护理日志Controller
@@ -31,11 +29,15 @@ public class WxNursingLogController extends BaseController {
 
     /**
      * 查询用户护理记录
+     * @param instrumentId 当在护理报告中，查询某个仪器的列表使用
+     * @param queryDate 当在护理报告中，查询某个历史之前的仪器的列表使用
+     *
      */
     @GetMapping("/record")
-    public TableDataInfo record(@RequestParam(value = "instrumentId", required = false) Long instrumentId) {
+    public TableDataInfo record(@RequestParam(value = "instrumentId", required = false) Long instrumentId,
+                                @RequestParam(value = "queryDate", required = false) Date queryDate) {
         startPage();
-        List<WxNursingLog> list = wxNursingLogService.selectWxNursingLogList(instrumentId);
+        List<WxNursingLog> list = wxNursingLogService.selectWxNursingLogList(instrumentId, queryDate);
         return getDataTable(list);
     }
 

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxNursingLogService.java

@@ -4,6 +4,7 @@ import com.flossom.common.core.domain.entity.WxNursingLog;
 import com.flossom.common.core.domain.req.WxNursingLogReq;
 import com.flossom.common.core.domain.ret.WxNursingStatisticsRet;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -18,7 +19,7 @@ public interface IWxNursingLogService {
     /**
      * 查询用户护理日志列表
      */
-    public List<WxNursingLog> selectWxNursingLogList(Long instrumentId);
+    public List<WxNursingLog> selectWxNursingLogList(Long instrumentId, Date queryDate);
 
     /**
      * 新增用户护理日志

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java

@@ -2,6 +2,7 @@ package com.flossom.miniProgram.service.impl;
 
 import java.time.*;
 import java.time.temporal.TemporalAdjusters;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -75,12 +76,15 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService {
      * 查询用户护理日志列表
      */
     @Override
-    public List<WxNursingLog> selectWxNursingLogList(Long instrumentId) {
+    public List<WxNursingLog> selectWxNursingLogList(Long instrumentId, Date queryDate) {
         // 排序：最新的护理记录在最上方；图片由后台模式管理-模式封面图片进行配置；
         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(wxNursingLog);
         if (wxNursingLogList != null && wxNursingLogList.size() > 0) {