From 0e6c8c2d6c8054e464651348e6c7c108f1dafb96 Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Sun, 1 May 2016 13:13:03 +0800
Subject: [PATCH] =?UTF-8?q?add=20data=20import=20:=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E7=94=A8=E6=88=B7(?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java | 1 +
 .../java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java  | 3 +--
 .../java/com/lyms/platform/data/controller/TaskController.java   | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java
index 5515dde..73e5a5a 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java
@@ -26,4 +26,5 @@ public interface IBasicConfigDao {
     public BasicConfig getOneBasicConfigById(String id);
 
     public void batchSave(Collection<BasicConfig> list);
+
 }
\ No newline at end of file
diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java
index 3610e30..451c0e2 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java
@@ -29,10 +29,9 @@ public class BasicConfigDaoImpl extends BaseMongoDAOImpl<BasicConfig> implements
     }
 
     public void batchSave(Collection<BasicConfig> list) {
-        batchSave(list);
+        super.batchSave(list);
     }
 
-
     public BasicConfig getBasicConfig(String id) {
         return findById(id);
     }
diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java b/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java
index c1dd003..41e8806 100644
--- a/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java
+++ b/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java
@@ -14,6 +14,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -80,13 +81,17 @@ public class TaskController extends BaseController {
                 }
                 List<BasicConfig> configList = basicConfigService.queryBasicConfig(new BasicConfigQuery());
                 BasicConfig u = new BasicConfig();
+                u.setEnable(1);
+                u.setYn(1);
                 for (BasicConfig config:configList) {
+                    u.setId(config.getId());
                     String code = codeMap.get(config.getName());
                     if (StringUtils.isNotBlank(code)) {
-                        u.setId(config.getId());
                         u.setCode(code);
-                        basicConfigService.updateBasicConfig(u);
+                    } else {
+                        u.setCode(null);
                     }
+                    basicConfigService.updateBasicConfig(u);
                 }
             } catch (IOException e) {
                 e.printStackTrace();
-- 
1.8.3.1