Merge remote-tracking branch 'origin/dev_compare_data'

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java

@@ -252,6 +252,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                 }
 
                 String thirdResultData = thirdResult.getData();
+                if(StringUtils.isBlank(thirdResultData)){
+                    continue;
+                }
                 JSONObject thirdResultObject = JSON.parseObject(thirdResultData);
 
                 LambdaQueryWrapper<DataSyncRecordDeathEntity> queryWrapper = new LambdaQueryWrapper<>();

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java

@@ -109,6 +109,9 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
 
     public String getCj(String cj){
         String result = "";
+        if (StringUtils.isBlank(cj)){
+            return result;
+        }
         switch (cj){
             case NumConstant.ONE_STR:
                 result = "一级";

epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml

@@ -132,6 +132,12 @@
                     when d.deal_status = 2 then '处理失败'
                 else '处理失败' end) as dealStatusName,
                d.now_add as address,
+               (
+                   case when d.GENDER='1' then '男'
+                   when d.GENDER='2' then '女'
+                   else '未知'
+                   end
+                )as genderCn,
                d.*
         FROM data_sync_record_disability d
         WHERE DEL_FLAG = 0

epmet-user/epmet-user-server/src/test/java/com/epmet/dao/IcNatDaoTest.java

@@ -0,0 +1,30 @@
+package com.epmet.dao;
+
+import com.epmet.entity.IcNatEntity;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class IcNatDaoTest {
+    @Autowired
+    private IcNatDao icNatDao;
+
+    @Test
+    public void updateBatchNat() {
+        List<IcNatEntity> entities = new ArrayList<>();
+        for (int i = 0; i < 2; i++) {
+            IcNatEntity en = new IcNatEntity();
+            en.setNatResult("222222"+i);
+            en.setUserId(""+i);
+            en.setIdCard("card"+i);
+            entities.add(en);
+        }
+        icNatDao.updateBatchNat(entities);
+    }
+}