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] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=90=88=E5=90=8C=EF=BC=8C?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=96=AB=E8=8B=97?= =?UTF-8?q?=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=EF=BC=8C=E5=90=88=E5=90=8C?= =?UTF-8?q?=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} + +