From 297b5e79ec875ea05c43e8be27817f0c25fd69f2 Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Sat, 30 Mar 2019 11:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E4=B8=B4=E6=97=B6=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/TemporaryWeightModel.java     | 16 ++++++++--------
 .../web/controller/TemporaryWeightController.java        |  3 ++-
 .../web/service/impl/TemporaryWeightServiceImpl.java     |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java
index af104ad..cda4803 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java
@@ -47,24 +47,24 @@ public class TemporaryWeightModel extends BaseModel {
     private String cardID;
 
     // 其他高危
-    private String otherHighRisk;
+    private String highriskDesc;
     //高危补充说明
-    private String otherRisk;
+    private List otherRisk;
 
 
-    public String getOtherHighRisk() {
-        return otherHighRisk;
+    public String getHighriskDesc() {
+        return highriskDesc;
     }
 
-    public void setOtherHighRisk(String otherHighRisk) {
-        this.otherHighRisk = otherHighRisk;
+    public void setHighriskDesc(String highriskDesc) {
+        this.highriskDesc = highriskDesc;
     }
 
-    public String getOtherRisk() {
+    public List getOtherRisk() {
         return otherRisk;
     }
 
-    public void setOtherRisk(String otherRisk) {
+    public void setOtherRisk(List otherRisk) {
         this.otherRisk = otherRisk;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java
index c1a3501..e337417 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 
 @Controller
 @RequestMapping("/temporary/weight")
@@ -25,7 +26,7 @@ public class TemporaryWeightController extends BaseController {
     @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST)
     @TokenRequired
     @ResponseBody
-    public BaseResponse addTemporaryWeight(TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) {
+    public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) {
         return temporaryWeightService.addTemporaryWeight(temporaryWeightModel);
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
index 00c0ce8..a31c7a1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
@@ -63,7 +63,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo
             if (temporaryWeightModel != null) {
                 if (StringUtils.isNotEmpty(temporaryWeightModel.getPhone())) {
                     weightModel.setModified(new Date());
-                    temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(temporaryWeightModel.getPhone())), weightModel);
+                    temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(temporaryWeightModel.getId())), weightModel);
                     return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
                 }
             } else {
-- 
1.8.3.1