From b65e22c861924ba6e2e07ba56cba658a6eaa3cd7 Mon Sep 17 00:00:00 2001
From: hyy-alt <1041001226@qq.com>
Date: Wed, 2 Jun 2021 16:28:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/wisdomcar/api/OtherRecordsController.java    | 6 +++---
 .../java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java | 2 +-
 .../java/com/ccsens/wisdomcar/bean/vo/OtherRecordsVo.java   | 2 +-
 .../com/ccsens/wisdomcar/service/IOtherRecordsService.java  | 2 +-
 .../com/ccsens/wisdomcar/service/OtherRecordsService.java   | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/OtherRecordsController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/OtherRecordsController.java
index b9f2444c..af939bfa 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/OtherRecordsController.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/OtherRecordsController.java
@@ -42,10 +42,10 @@ public class OtherRecordsController {
 
 
     @ApiOperation(value = "查询上传图片和记录", notes = "")
-    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<OtherRecordsVo.Query>> query(@ApiParam @Validated @RequestBody QueryDto<OtherRecordsDto.Query> params){
+    @RequestMapping(value = "/queryList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<OtherRecordsVo.TypeAndComment>> queryList(@ApiParam @Validated @RequestBody QueryDto<OtherRecordsDto.QueryId> params){
         log.info("查询上传图片和记录：{}", params);
-        List<OtherRecordsVo.Query> list = iOtherRecordsService.query(params.getParam());
+        List<OtherRecordsVo.TypeAndComment> list = iOtherRecordsService.query(params.getParam());
         log.info("查询上传图片和记录成功");
         return JsonResponse.newInstance().ok(list);
     }
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java
index 23639fab..6adcc498 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java
@@ -26,7 +26,7 @@ public class OtherRecordsDto {
     }
     @Data
     @ApiModel("查询上传图片和记录")
-    public static class Query {
+    public static class QueryId {
         @ApiModelProperty("分解任务id")
         private Long id;
     }
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/OtherRecordsVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/OtherRecordsVo.java
index 548da789..c00930ac 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/OtherRecordsVo.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/OtherRecordsVo.java
@@ -17,7 +17,7 @@ public class OtherRecordsVo {
 
     @Data
     @ApiModel("查询上传图片和记录")
-    public static class Query {
+    public static class TypeAndComment {
         @ApiModelProperty("类型(0-图片,1-文本)")
         private byte type;
         @ApiModelProperty("内容")
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IOtherRecordsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IOtherRecordsService.java
index 1677797f..31d53da0 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IOtherRecordsService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IOtherRecordsService.java
@@ -20,5 +20,5 @@ public interface IOtherRecordsService {
      * @param
      * @throws
      */
-    List<OtherRecordsVo.Query> query(OtherRecordsDto.Query param);
+    List<OtherRecordsVo.TypeAndComment> queryList(OtherRecordsDto.QueryId param);
 }
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java
index a3662c3f..b28f77c8 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java
@@ -88,15 +88,15 @@ public class OtherRecordsService implements IOtherRecordsService {
     }
 
     @Override
-    public List<OtherRecordsVo.Query> query(OtherRecordsDto.Query param) {
-        List<OtherRecordsVo.Query> patientInformationRecordList = new ArrayList<>();
+    public List<OtherRecordsVo.TypeAndComment> queryList(OtherRecordsDto.QueryId param) {
+        List<OtherRecordsVo.TypeAndComment> patientInformationRecordList = new ArrayList<>();
         //通过任务id 找到创建的最新的
         //拿到患者平车id
         PatientInformationRecordExample patientInformationRecordExample = new PatientInformationRecordExample();
         patientInformationRecordExample.createCriteria().andTaskSubIdEqualTo(param.getId());
         List<PatientInformationRecord> patientInformationRecords = patientInformationRecordMapper.selectByExample(patientInformationRecordExample);
         for (PatientInformationRecord patientInformationRecord : patientInformationRecords) {
-            OtherRecordsVo.Query query = new OtherRecordsVo.Query();
+            OtherRecordsVo.TypeAndComment query = new OtherRecordsVo.TypeAndComment();
             query.setComment(patientInformationRecord.getContent());
             query.setType(patientInformationRecord.getInformationType());
             patientInformationRecordList.add(query);