From 114ea2d5df682d95e976899bd203447572308f61 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Fri, 9 Dec 2016 10:56:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4=E5=8F=B6?=
 =?UTF-8?q?=E9=85=B8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/FolicAcidController.java        | 11 +++++++++++
 .../lyms/platform/operate/web/facade/FolicAcidFacade.java  | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java
index b69f83d..2993d19 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java
@@ -57,6 +57,17 @@ public class FolicAcidController extends BaseController{
         return folicAcidFacade.queryFolicAcid(folicAcidQueryRequest);
     }
 
+    //删除叶酸发放记录
+    @RequestMapping(value = "/deleteFolicAcid", method = RequestMethod.DELETE)
+    @ResponseBody
+//    @TokenRequired
+    public BaseResponse deleteFolicAcid(@RequestParam("id") String id,
+                                           HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return folicAcidFacade.deleteFolicAcid(id,792);
+    }
+
+
     //叶酸数据导出
     @RequestMapping(value = "/folicAcidExport", method = RequestMethod.GET)
     @ResponseBody
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
index b401417..2856ff6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
@@ -19,14 +19,12 @@ import com.lyms.platform.permission.model.OrganizationQuery;
 import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.permission.service.UsersService;
-import com.lyms.platform.pojo.BasicConfig;
 import com.lyms.platform.pojo.FolicAcid;
 import com.lyms.platform.pojo.ResidentsArchiveModel;
 import com.lyms.platform.query.FolicAcidQuery;
 import com.lyms.platform.query.ResidentsArchiveQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.struts.config.BaseConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -288,6 +286,18 @@ public class FolicAcidFacade {
         return baseListResponse;
     }
 
+    public BaseResponse deleteFolicAcid(String id,Integer userId){
+        BaseResponse br = new BaseResponse();
+        if (StringUtils.isNotEmpty(id)){
+            FolicAcid folicAcid = folicAcidService.getFolicAcid(id);
+            folicAcid.setYn(YnEnums.NO.getId());
+            folicAcid.setModified(new Date());
+            folicAcidService.updateFolicAcid(folicAcid,id);
+            return br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+        }
+        return br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id is null");
+    }
+
     //叶酸发放导出
     public void folicAcidExport(FolicAcidQueryRequest queryRequest,Integer userId,HttpServletResponse response){
         OutputStream out = null;
-- 
1.8.3.1