rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data

dev
wangxianzhang 3 years ago
parent
aed2a4ce70 401cb5a642
commit
8a3c4aa667
4 changed files with 48 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java
  2. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java
  3. 11
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
  4. 16
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java

2
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java
View File

@ -94,7 +94,7 @@ public class IcNatCompareRecordDTO implements Serializable {
* 最近一次核酸时间:接口填入
*/
@ColumnWidth(30)
@ExcelProperty("最近一次核酸时间")
@ExcelProperty("最近一次检测时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date latestNatTime;

1
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java
View File

@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 核酸比对记录
*

11
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
View File

@ -171,6 +171,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
ObjectUtil.objectToTrim(data);
IcNatCompareRecordEntity compareRecordEntity = ConvertUtils.sourceToTarget(data, IcNatCompareRecordEntity.class);
compareRecordEntity.setCustomerId(customerId);
compareRecordEntity.setLatestCyTime(null);
compareRecordEntity.setLatestNatTime(null);
compareRecordEntity.setNatAddress(StrConstant.EPMETY_STR);
compareRecordEntity.setNatResult(StrConstant.EPMETY_STR);
@ -228,22 +229,24 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
compareRecordEntity.setNatResult(NumConstant.ZERO_STR);
}
compareRecordEntity.setContactAddress(StringUtils.isNotBlank(address) ? address : StrConstant.EPMETY_STR);
compareRecordEntity.setInternalRemark(String.format("匹配成功,采样时间一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
compareRecordEntity.setInternalRemark(String.format("%s查询匹配成功,采样时间一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
DateUtils.format(importTime,DateUtils.DATE_TIME_PATTERN),
DateUtils.format(compareRecordEntity.getLatestCyTime(),DateUtils.DATE_TIME_PATTERN),
DateUtils.format(sample_time,DateUtils.DATE_TIME_PATTERN)));
} else {
// 采样时间不一致，说明未出结果
compareRecordEntity.setInternalRemark(String.format("未出结果,采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
compareRecordEntity.setInternalRemark(String.format("%s查询未出结果,采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
DateUtils.format(importTime,DateUtils.DATE_TIME_PATTERN),
DateUtils.format(compareRecordEntity.getLatestCyTime(),DateUtils.DATE_TIME_PATTERN),
DateUtils.format(sample_time,DateUtils.DATE_TIME_PATTERN)));
}
} else {
compareRecordEntity.setInternalRemark("最近一次检测结果为空");
compareRecordEntity.setInternalRemark(String.format("%s查询最近一次检测结果为空", DateUtils.format(importTime,DateUtils.DATE_TIME_PATTERN)));
}
}
} else {
// 没有核酸采样记录
compareRecordEntity.setInternalRemark("最近一次采样结果为空");
compareRecordEntity.setInternalRemark(String.format("%s查询最近一次采样结果为空", DateUtils.format(importTime, DateUtils.DATE_TIME_PATTERN)));
}
}
datas.add(compareRecordEntity);

16
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.epmet.service.impl;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
@ -270,7 +271,20 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
// 是否客户下居民(0:否 1:是)
origin.setIsResiUser(StringUtils.isNotBlank(origin.getIcResiUserId()) ? NumConstant.ONE_STR : NumConstant.ZERO_STR);
origin.setLatestImportTime(importTime);
baseDao.updateById(origin);
LambdaUpdateWrapper<IcNatCompareRecordEntity> updateWrapper=new LambdaUpdateWrapper<>();
updateWrapper.eq(IcNatCompareRecordEntity::getId,origin.getId());
updateWrapper.set(IcNatCompareRecordEntity::getName, origin.getName())
.set(IcNatCompareRecordEntity::getMobile, origin.getMobile())
.set(IcNatCompareRecordEntity::getIsResiUser, origin.getIsResiUser())
.set(IcNatCompareRecordEntity::getIcResiUserId, origin.getIcResiUserId())
.set(IcNatCompareRecordEntity::getLatestCyTime, origin.getLatestCyTime())
.set(IcNatCompareRecordEntity::getLatestNatTime, origin.getLatestNatTime())
.set(IcNatCompareRecordEntity::getNatResult, origin.getNatResult())
.set(IcNatCompareRecordEntity::getNatAddress, origin.getNatAddress())
.set(IcNatCompareRecordEntity::getContactAddress, origin.getContactAddress())
.set(IcNatCompareRecordEntity::getLatestImportTime, origin.getLatestImportTime())
.set(IcNatCompareRecordEntity::getInternalRemark, origin.getInternalRemark());
baseDao.update(null,updateWrapper);
IcNatCompareRecRelationEntity existRelationEntity=icNatCompareRecRelationDao.selectExist(data.getCustomerId(),origin.getId(),staffInfo.getAgencyId(),importDate);
if(null!=existRelationEntity){
// 是否本社区（agency_id）下居民(0:否 1:是)

Write Preview
Loading…
Cancel
Save