From adda3ce6f8b337dd7c6f238716d37bd520b8e7eb Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 15 Mar 2024 16:41:39 +0800
Subject: [PATCH] 报警记录添加字段+从业人员修改信息更新生日
---
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index 3d90109..e38134c 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -19,9 +19,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
@@ -101,8 +103,8 @@
CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(PlaceExtVO.class, placeExt);
- return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt,commonParamSet.getRegionChildCodesList(),
- commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList()));
+ return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList()));
}
/**
@@ -138,15 +140,16 @@
// 找出需要新增的，否则组成新集合进行比对
for (PlacePractitionerEntity practitionerEntity : list) {
practitionerEntity.setPlaceId(placeExt.getPlaceId());
+ if (StringUtils.isNotBlank(practitionerEntity.getIdCard())) {
+ // 从身份证号获取出生日期
+ String birthDateStr = practitionerEntity.getIdCard().substring(6, 14);
+ // 解析出生日期字符串为日期对象
+ practitionerEntity.setBirthday(DateUtil.parse(birthDateStr, "yyyyMMdd"));
+ }
if (null == practitionerEntity.getId()) {
// 新增
- PlacePractitionerEntity placePractitionerEntity = new PlacePractitionerEntity();
-
- placePractitionerEntity.setPlaceId(placeExt.getPlaceId());
- placePractitionerEntity.setName(practitionerEntity.getName());
- placePractitionerEntity.setTelephone(practitionerEntity.getTelephone());
- placePractitionerEntity.setTempAddress(practitionerEntity.getTempAddress());
- addList.add(placePractitionerEntity);
+ practitionerEntity.setPlaceId(placeExt.getPlaceId());
+ addList.add(practitionerEntity);
} else {
newList.add(practitionerEntity);
}
@@ -279,6 +282,6 @@
placeExt.setConfirmFlag(confirmFlag);
placeExt.setNeiCode(neiCode);
CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(PlaceExtVO.class, placeExt);
- return baseMapper.selectCount(placeExt,commonParamSet.getRegionChildCodesList(),commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList());
+ return baseMapper.selectCount(placeExt, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
}
}
--
Gitblit v1.9.3