From 7a40bc26c891be8779d23f66f27ed9746c19c04f Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Fri, 6 May 2016 17:52:36 +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

---
 .../service/impl/DataImportTaskServiceImpl.java    | 32 +++++++++++++++++++++-
 .../lymsh/mommybaby/earlydata/dao/PlatMapper.java  |  2 +-
 .../src/main/resources/earlyOrm/Plat.xml           | 14 ++--------
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java
index ea010f6..279fb6d 100644
--- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java
+++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java
@@ -17,6 +17,7 @@ import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.PuerperaModel;
 import com.lymsh.mommybaby.earlydata.dao.PlatMapper;
 import com.lymsh.mommybaby.earlydata.model.PlatDataContent;
+import com.lymsh.mommybaby.earlydata.model.PlatDataType;
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,6 +83,31 @@ public class DataImportTaskServiceImpl implements DataImportTaskService {
     @Override
     public void updateBasicConfig() {
         try {
+            List<PlatDataType> typeList = platMapper.selectPlatDataType();
+            for (PlatDataType type:typeList) {
+                try {
+                    if (StringUtils.isBlank(type.getDtId())) {
+                        continue;
+                    }
+                    BasicConfig config = new BasicConfig();
+                    config.setId(type.getDtId());
+                    config.setCode(type.getDtName());
+                    config.setName(type.getDtName());
+                    config.setParentId("0");
+                    config.setTypeId("0");
+                    config.setYn(YnEnums.YES.getId());
+                    BasicConfig db = basicConfigService.getOneBasicConfigById(type.getDtId());
+                    if (db == null) {
+                        basicConfigService.addBasicConfig(config);
+                    } else {
+                        basicConfigService.updateBasicConfig(config);
+                    }
+                } catch (Exception ee) {
+                    ee.printStackTrace();
+                    LogUtil.taskError(ee.getMessage(), ee);
+                }
+            }
+
             List<PlatDataContent> list = platMapper.selectPlatDataContent();
             for (PlatDataContent data : list) {
                 try {
@@ -92,7 +118,11 @@ public class DataImportTaskServiceImpl implements DataImportTaskService {
                     config.setId(data.getDcId());
                     config.setCode(data.getDcNo());
                     config.setName(data.getDcName());
-                    config.setParentId(data.getDcParentid());
+                    if ("0".equals(data.getDcParentid())) {
+                        config.setParentId(data.getDcDatatypeid());
+                    } else {
+                        config.setParentId(data.getDcParentid());
+                    }
                     config.setTypeId(data.getDcDatatypeid());
                     config.setYn(YnEnums.YES.getId());
                     BasicConfig db = basicConfigService.getOneBasicConfigById(data.getDcId());
diff --git a/platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/dao/PlatMapper.java b/platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/dao/PlatMapper.java
index 21fb9d5..87cbff3 100644
--- a/platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/dao/PlatMapper.java
+++ b/platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/dao/PlatMapper.java
@@ -12,7 +12,7 @@ import java.util.Map;
  */
 public interface PlatMapper {
 
-    public List<PlatDataType> selectPlatDataType(OracleCommonQuery query);
+    public List<PlatDataType> selectPlatDataType();
 
     public List<PlatDataContent> selectPlatDataContent();
 
diff --git a/platform-mommyData/src/main/resources/earlyOrm/Plat.xml b/platform-mommyData/src/main/resources/earlyOrm/Plat.xml
index dac78e9..2d87b10 100644
--- a/platform-mommyData/src/main/resources/earlyOrm/Plat.xml
+++ b/platform-mommyData/src/main/resources/earlyOrm/Plat.xml
@@ -11,20 +11,10 @@
          DT_ID,DT_NAME
     </sql>
 
-    <select id="selectPlatDataType" resultMap="PlatDataTypeResultMap" parameterType="com.lymsh.mommybaby.earlydata.model.OracleCommonQuery">
+    <select id="selectPlatDataType" resultMap="PlatDataTypeResultMap">
         select
         <include refid="PlatDataTypeColumns"/>
-        from (select<include refid="PlatDataTypeColumns"/>,rownum r
-        from (
-        select
-        <include refid="PlatDataTypeColumns"/>
-        from PLAT_DATATYPE t
-         where DT_OPERTIME >= #{startTime}
-        ) h where
-        <![CDATA[ rownum <= #{endRow} ]]>
-        )
-        where
-        <![CDATA[ r >= #{startRow} ]]>
+        from PLAT_DATATYPE
     </select>
 
 
-- 
1.8.3.1