From 5d7f5352771e42e5c98b167d2da7c45e2f85816f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 21 Oct 2022 15:00:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=AE=8B=E7=96=BE=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataSyncRecordDisabilityServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java index 3b564f19e7..e3d397c44d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java @@ -109,6 +109,9 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl Date: Fri, 21 Oct 2022 15:45:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index c2e6565703..b7590a5987 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -252,6 +252,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); From 972e583dfd924ff596b2b2fab49bcb8346067f8d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Oct 2022 15:49:57 +0800 Subject: [PATCH 3/4] genderCn --- .../main/resources/mapper/DataSyncRecordDisabilityDao.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml index 889ca27c1c..bca57f359e 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml +++ b/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 From 6d10a7583e019bfee5fbf2ce4341947d5e695d8e Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 21 Oct 2022 16:56:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=A0=E7=9C=8B=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/com/epmet/dao/IcNatDaoTest.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/test/java/com/epmet/dao/IcNatDaoTest.java diff --git a/epmet-user/epmet-user-server/src/test/java/com/epmet/dao/IcNatDaoTest.java b/epmet-user/epmet-user-server/src/test/java/com/epmet/dao/IcNatDaoTest.java new file mode 100644 index 0000000000..d650f19cb3 --- /dev/null +++ b/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 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); + } +}