From 67cfd47b58742ca4bfd293932d15cd1283668ded Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 1 Dec 2022 14:24:47 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5-=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/RentTenantFormDTO.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java index 039b433416..f3964d04ae 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java @@ -42,4 +42,14 @@ public class RentTenantFormDTO implements Serializable { */ private IcResiUserDTO user; + // 合同相关 + /** + * 合同开始日期 + */ + private String startDate; + + /** + * 合同结束日期 + */ + private String endDate; } From fd93a49fe8f2ee46c00352a13c4ccd425bf08932 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 5 Dec 2022 10:33:36 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=8C=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=96=AB?= =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=EF=BC=8C=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dao/IcResiRentContractInfoDao.java | 7 ++- .../main/java/com/epmet/dao/IcVaccineDao.java | 2 + .../service/impl/IcResiUserServiceImpl.java | 54 +++++++++++++++++++ .../mapper/IcResiRentContractInfoDao.xml | 8 ++- .../main/resources/mapper/IcVaccineDao.xml | 4 ++ 5 files changed, 72 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiRentContractInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiRentContractInfoDao.java index 0c04b9a1fb..0d4b03fe38 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiRentContractInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiRentContractInfoDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcResiRentContractInfoEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 居民租房信息 @@ -12,5 +13,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcResiRentContractInfoDao extends BaseDao { - -} \ No newline at end of file + + IcResiRentContractInfoEntity selectDetailByUserId(@Param("userId") String userId); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java index 54da37af06..3a0956822c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java @@ -87,4 +87,6 @@ public interface IcVaccineDao extends BaseDao { */ List getExistVaccine(@Param("list")List list); + void deleteByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index fb249f1184..a6ac2e4ed4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -80,6 +80,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.compress.utils.Lists; @@ -173,6 +174,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getWrapper(Map params) { @@ -2183,6 +2193,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl icResiUserAttachmentService.save(item)); } + // 同步疫苗接种记录信息 + IcResiUserDTO user = formDTO.getUser(); + List vaccineLog = user.getVaccineLog(); + if(vaccineLog.size() > 0){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + // 根据身份证号，客户ID删除旧记录 + icVaccineDao.deleteByIdCard(user.getIdCard(),user.getCustomerId()); + // 插入新数据 + List icVaccineEntityList = new ArrayList<>(); + for(VaccineLogDetailDTO vaccineLogDetailDTO : vaccineLog){ + IcVaccineEntity icVaccineEntity = new IcVaccineEntity(); + icVaccineEntity.setCustomerId(user.getCustomerId()); + icVaccineEntity.setName(user.getName()); + icVaccineEntity.setMobile(user.getMobile()); + icVaccineEntity.setIdCard(user.getIdCard()); + icVaccineEntity.setIsResiUser("1"); + icVaccineEntity.setUserType("import"); + icVaccineEntity.setUserId(resiUserId); + icVaccineEntity.setInoculateTime(sdf.parse(vaccineLogDetailDTO.getVacTime())); + icVaccineEntity.setInoculateAddress(vaccineLogDetailDTO.getVacSite()); + icVaccineEntityList.add(icVaccineEntity); + } + icVaccineService.insertBatch(icVaccineEntityList); + + } + + // 同步合同信息 + IcResiRentContractInfoEntity rentEntityOne = icResiRentContractInfoDao.selectDetailByUserId(resiUserId); + if(rentEntityOne == null){ + IcResiRentContractInfoEntity rentEntity = new IcResiRentContractInfoEntity(); + rentEntity.setIcResiUser(resiUserId); + rentEntity.setCustomerId(formDTO.getCustomerId()); + rentEntity.setContractStartDate(formDTO.getStartDate()); + rentEntity.setContractEndDate(formDTO.getEndDate()); + icResiRentContractInfoDao.insert(rentEntity); + }else{ + rentEntityOne.setCustomerId(formDTO.getCustomerId()); + rentEntityOne.setContractStartDate(formDTO.getStartDate()); + rentEntityOne.setContractEndDate(formDTO.getEndDate()); + icResiRentContractInfoDao.updateById(rentEntityOne); + } + + return resiUserId; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiRentContractInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiRentContractInfoDao.xml index 25a47a8573..a97b6554a9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiRentContractInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiRentContractInfoDao.xml @@ -16,6 +16,12 @@ + + + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml index d5aeb1384d..96bae4508a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml @@ -244,4 +244,8 @@ + + update ic_vaccine set DEL_FLAG = '1' where CUSTOMER_ID = #{customerId} and ID_CARD = #{idCard} + + From fdf42063f5efb46fc557433d4054739d4bc6cadb Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 5 Dec 2022 17:35:14 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=8C=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=96=AB?= =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=EF=BC=8C=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index a6ac2e4ed4..b02f182c1f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2236,7 +2236,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl vaccineLog = user.getVaccineLog(); - if(vaccineLog.size() > 0){ + log.info("+++++++++++++++++++++++++++同步疫苗接种记录信息vaccineLog"+vaccineLog); + if(vaccineLog == null || vaccineLog.size() > 0){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 根据身份证号，客户ID删除旧记录 icVaccineDao.deleteByIdCard(user.getIdCard(),user.getCustomerId()); @@ -2261,6 +2262,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Mon, 5 Dec 2022 17:58:03 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=8C=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=96=AB?= =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=EF=BC=8C=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index b02f182c1f..bfb2407847 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2237,7 +2237,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl vaccineLog = user.getVaccineLog(); log.info("+++++++++++++++++++++++++++同步疫苗接种记录信息vaccineLog"+vaccineLog); - if(vaccineLog == null || vaccineLog.size() > 0){ + if(vaccineLog != null && vaccineLog.size() > 0){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 根据身份证号，客户ID删除旧记录 icVaccineDao.deleteByIdCard(user.getIdCard(),user.getCustomerId()); From 5fb7640b08fa34a140eb933ac5295fb40f4d8337 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 6 Dec 2022 09:34:23 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=8C=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=96=AB?= =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=EF=BC=8C=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index bfb2407847..cf5428982a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2197,6 +2197,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Tue, 6 Dec 2022 10:52:55 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=8C=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=96=AB?= =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=EF=BC=8C=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8F=90=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index cf5428982a..aa0f1bef96 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2239,7 +2239,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl vaccineLog = user.getVaccineLog(); log.info("+++++++++++++++++++++++++++同步疫苗接种记录信息vaccineLog"+vaccineLog); if(vaccineLog != null && vaccineLog.size() > 0){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); // 根据身份证号，客户ID删除旧记录 icVaccineDao.deleteByIdCard(user.getIdCard(),user.getCustomerId()); // 插入新数据 @@ -2253,7 +2253,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Tue, 6 Dec 2022 13:45:55 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=8C=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=96=AB?= =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=EF=BC=8C=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8F=90=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerAgencyDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index f46e9f038d..482eac4596 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -1050,7 +1050,7 @@ and LEVEL = 'community' AND CUSTOMER_ID = #{customerId} - AND PIDS like concat('%',#{staffAgencyId},'%') + AND (PIDS like concat('%',#{staffAgencyId},'%') or ID = #{staffAgencyId}) From 114bb8992589f77837ec344563a68db0ef61fa32 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 6 Dec 2022 17:58:07 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=8E=BB=E9=99=A4log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index aa0f1bef96..c4b17b5304 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2197,7 +2197,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl vaccineLog = user.getVaccineLog(); - log.info("+++++++++++++++++++++++++++同步疫苗接种记录信息vaccineLog"+vaccineLog); if(vaccineLog != null && vaccineLog.size() > 0){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); // 根据身份证号，客户ID删除旧记录 @@ -2263,7 +2261,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 7 Dec 2022 10:18:24 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=96=AB=E8=8B=97?= =?UTF-8?q?=E6=8E=A5=E7=A7=8D=E8=AE=B0=E5=BD=95=E5=85=B3=E7=B3=BB=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcVaccineDao.java | 2 ++ .../com/epmet/dao/IcVaccineRelationDao.java | 8 ++++++ .../service/impl/IcResiUserServiceImpl.java | 27 ++++++++++++++++--- .../main/resources/mapper/IcVaccineDao.xml | 4 +++ .../resources/mapper/IcVaccineRelationDao.xml | 8 ++++++ 5 files changed, 45 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java index 3a0956822c..a479866fea 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java @@ -89,4 +89,6 @@ public interface IcVaccineDao extends BaseDao { void deleteByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + List setDeleteByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java index 6d087a1055..f35d872d7c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java @@ -5,6 +5,8 @@ import com.epmet.entity.IcVaccineRelationEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 疫苗接种记录关系表 * @@ -17,5 +19,11 @@ public interface IcVaccineRelationDao extends BaseDao { void updateRelationInfoByVaccineId(IcVaccineRelationEntity icVaccineRelationEntity); + /** + * 根据ID删除数据 + * @param delList + */ + void deleteByIdList(@Param("delList")List delList); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index c4b17b5304..ab9c9fb04b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -181,7 +181,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl delList = icVaccineDao.setDeleteByIdCard(user.getIdCard(),user.getCustomerId()); + icVaccineRelationDao.deleteByIdList(delList); // 插入新数据 - List icVaccineEntityList = new ArrayList<>(); for(VaccineLogDetailDTO vaccineLogDetailDTO : vaccineLog){ IcVaccineEntity icVaccineEntity = new IcVaccineEntity(); icVaccineEntity.setCustomerId(user.getCustomerId()); @@ -2253,9 +2255,26 @@ public class IcResiUserServiceImpl extends BaseServiceImpl + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml index acaf54c95f..205b04677a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml @@ -17,5 +17,13 @@ set CUSTOMER_ID = #{customerId},USER_TYPE = #{userType} where IC_VACCINE_ID = #{icVaccineId} + + update ic_vaccine_relation set DEL_FLAG = '1' where ID in + + #{id} + + + + From 66a6e8542fab770cc899cfd061c4aac6b17be2ae Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 7 Dec 2022 13:48:48 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=96=AB=E8=8B=97?= =?UTF-8?q?=E6=8E=A5=E7=A7=8D=E8=AE=B0=E5=BD=95=E5=85=B3=E7=B3=BB=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91-----?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=B0=E8=B4=A6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index ab9c9fb04b..66275d9ee0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2243,8 +2243,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl delList = icVaccineDao.setDeleteByIdCard(user.getIdCard(),user.getCustomerId()); icVaccineRelationDao.deleteByIdList(delList); - // 插入新数据 for(VaccineLogDetailDTO vaccineLogDetailDTO : vaccineLog){ + // 插入疫苗接种记录数据 IcVaccineEntity icVaccineEntity = new IcVaccineEntity(); icVaccineEntity.setCustomerId(user.getCustomerId()); icVaccineEntity.setName(user.getName()); @@ -2262,7 +2262,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 7 Dec 2022 17:11:38 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=96=AB=E8=8B=97?= =?UTF-8?q?=E6=8E=A5=E7=A7=8D=E8=AE=B0=E5=BD=95=E5=85=B3=E7=B3=BB=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=911704?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 66275d9ee0..49336ffb95 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2242,7 +2242,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl delList = icVaccineDao.setDeleteByIdCard(user.getIdCard(),user.getCustomerId()); - icVaccineRelationDao.deleteByIdList(delList); + if(delList != null && delList.size() > 0){ + icVaccineRelationDao.deleteByIdList(delList); + } for(VaccineLogDetailDTO vaccineLogDetailDTO : vaccineLog){ // 插入疫苗接种记录数据 IcVaccineEntity icVaccineEntity = new IcVaccineEntity();