Browse Source

租房合同,居民信息,疫苗接种情况,合同信息同步

master
wanggongfeng 3 years ago
parent
commit
fd93a49fe8
  1. 7
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiRentContractInfoDao.java
  2. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java
  3. 54
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
  4. 8
      epmet-user/epmet-user-server/src/main/resources/mapper/IcResiRentContractInfoDao.xml
  5. 4
      epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml

7
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.commons.mybatis.dao.BaseDao;
import com.epmet.entity.IcResiRentContractInfoEntity; import com.epmet.entity.IcResiRentContractInfoEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/** /**
* 居民租房信息 * 居民租房信息
@ -12,5 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface IcResiRentContractInfoDao extends BaseDao<IcResiRentContractInfoEntity> { public interface IcResiRentContractInfoDao extends BaseDao<IcResiRentContractInfoEntity> {
} IcResiRentContractInfoEntity selectDetailByUserId(@Param("userId") String userId);
}

2
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java

@ -87,4 +87,6 @@ public interface IcVaccineDao extends BaseDao<IcVaccineEntity> {
*/ */
List<YTVaccineListDTO> getExistVaccine(@Param("list")List<YTVaccineListDTO> list); List<YTVaccineListDTO> getExistVaccine(@Param("list")List<YTVaccineListDTO> list);
void deleteByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId);
} }

54
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.github.pagehelper.PageInfo;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
@ -173,6 +174,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
@Autowired @Autowired
private DataReportOpenFeignClient dataReportOpenFeignClient; private DataReportOpenFeignClient dataReportOpenFeignClient;
@Autowired
private IcResiRentContractInfoDao icResiRentContractInfoDao;
@Autowired
private IcVaccineDao icVaccineDao;
@Autowired
private IcVaccineService icVaccineService;
private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) { private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) {
@ -2183,6 +2193,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
return ConvertUtils.sourceToTarget(entityList, RentTenantDataResultDTO.class); return ConvertUtils.sourceToTarget(entityList, RentTenantDataResultDTO.class);
} }
@SneakyThrows
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public String updateImage(TokenDto tokenDto, RentTenantFormDTO formDTO) { public String updateImage(TokenDto tokenDto, RentTenantFormDTO formDTO) {
@ -2222,6 +2233,49 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
images.forEach(item -> icResiUserAttachmentService.save(item)); images.forEach(item -> icResiUserAttachmentService.save(item));
} }
// 同步疫苗接种记录信息
IcResiUserDTO user = formDTO.getUser();
List<VaccineLogDetailDTO> 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<IcVaccineEntity> 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; return resiUserId;
} }

8
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiRentContractInfoDao.xml

@ -16,6 +16,12 @@
<result property="updatedBy" column="UPDATED_BY"/> <result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/> <result property="updatedTime" column="UPDATED_TIME"/>
</resultMap> </resultMap>
<select id="selectDetailByUserId" resultType="com.epmet.entity.IcResiRentContractInfoEntity">
select * from ic_resi_rent_contract_info where DEL_FLAG = 0 and IC_RESI_USER = #{userId} limit 1
</mapper>
</select>
</mapper>

4
epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml

@ -244,4 +244,8 @@
<!-- </foreach>--> <!-- </foreach>-->
<!-- )--> <!-- )-->
</select> </select>
<delete id="deleteByIdCard">
update ic_vaccine set DEL_FLAG = '1' where CUSTOMER_ID = #{customerId} and ID_CARD = #{idCard}
</delete>
</mapper> </mapper>

Loading…
Cancel
Save