Browse Source

疫苗接种点,核酸检测点 优化

feature/teamB_zz_wgh
wanggongfeng 3 years ago
parent
commit
c09a0df54b
  1. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationImportExcel.java
  2. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java

2
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationImportExcel.java

@ -34,7 +34,7 @@ public class IcPointVaccinesInoculationImportExcel {
@Excel(name = "接种下午结束时间")
private String afEndTime;
@Excel(name = "暂无疫苗", replace = {"否_1","是_2"})
@Excel(name = "暂无疫苗", replace = {"是_1","否_2"})
private String noAvailableVaccines;
@Excel(name = "咨询电话")

2
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java

@ -193,7 +193,7 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl<IcPoi
continue;
}else{
// 暂无疫苗为否,才校验日期
if("1".equals(list.get(i).getNoAvailableVaccines()) || "否".equals(list.get(i).getNoAvailableVaccines())){
if("2".equals(list.get(i).getNoAvailableVaccines()) || "否".equals(list.get(i).getNoAvailableVaccines())){
if (StringUtils.isBlank(list.get(i).getInoculationDate()) && !list.get(i).getAddStatus()){
errorInfo.add(getErrorInfo(list.get(i), "接种日期不能为空",i+1));
list.get(i).setAddStatus(true);

Loading…
Cancel
Save