bonus
/
Bonus-Cloud-SafetyWarning
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

手动调试

This commit is contained in:
mashuai 2024-11-07 14:46:32 +08:00
parent 74cda37124
commit ff26f25a99
3 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/base/src/main/java/com/bonus/base/basic/mapper/TbPeopleMapper.java
View File

@ -80,7 +80,5 @@ public interface TbPeopleMapper {
* @return * @return
*/ */
SysUser getUserById(Long userId); SysUser getUserById(Long userId);
TbPeople queryByName1(TbPeopleDto tbPeople);
} }

53
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbPeopleServiceImpl.java
View File

@ -383,30 +383,35 @@ public class TbPeopleServiceImpl implements TbPeopleService {
List<TbPeopleDto> tbPeopleList = util.importExcel(file.getInputStream()); List<TbPeopleDto> tbPeopleList = util.importExcel(file.getInputStream());
int result = 0; int result = 0;
for (TbPeopleDto tbPeople : tbPeopleList) { for (TbPeopleDto tbPeople : tbPeopleList) {
//List<TbPeople> peopleList = tbPeopleDao.queryByName(tbPeople); List<TbPeople> peopleList = tbPeopleDao.queryByName(tbPeople);
TbPeople people = tbPeopleDao.queryByName1(tbPeople); if (CollectionUtils.isNotEmpty(peopleList)) {
if (people != null) { for (TbPeople people : peopleList) {
//进行更新操作 if (StringUtils.isNotBlank(people.getIdCard()) && StringUtils.isNotBlank(tbPeople.getIdCard())) {
TbPeople dto = new TbPeople(); if (Objects.equals(Sm4Utils.decode(people.getIdCard()), tbPeople.getIdCard())) {
dto.setId(people.getId()); //进行更新操作
dto.setUpdateUser(SecurityUtils.getUserId()); TbPeople dto = new TbPeople();
dto.setDelFlag(0); dto.setId(people.getId());
dto.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone())); dto.setUpdateUser(SecurityUtils.getUserId());
dto.setIdCard(tbPeople.getIdCard()); dto.setDelFlag(0);
dto.setSex(tbPeople.getGender()); dto.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone()));
dto.setRelName(tbPeople.getRelName()); dto.setIdCard(Sm4Utils.encode(tbPeople.getIdCard()));
dto.setPostCode(tbPeople.getPostCode()); dto.setSex(tbPeople.getGender());
result += tbPeopleDao.update(dto); dto.setRelName(tbPeople.getRelName());
} else { dto.setPostCode(tbPeople.getPostCode());
//新增操作 result += tbPeopleDao.update(dto);
TbPeople dto = new TbPeople(); } else {
dto.setCreateUser(SecurityUtils.getUserId()); //新增操作
dto.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone())); TbPeople dto = new TbPeople();
dto.setIdCard(tbPeople.getIdCard()); dto.setCreateUser(SecurityUtils.getUserId());
dto.setSex(tbPeople.getGender()); dto.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone()));
dto.setRelName(tbPeople.getRelName()); dto.setIdCard(Sm4Utils.encode(tbPeople.getIdCard()));
dto.setPostCode(tbPeople.getPostCode()); dto.setSex(tbPeople.getGender());
result += tbPeopleDao.insert(dto); dto.setRelName(tbPeople.getRelName());
dto.setPostCode(tbPeople.getPostCode());
result += tbPeopleDao.insert(dto);
}
}
}
} }
} }
if (result > 0) { if (result > 0) {

15
bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml
View File

@ -156,19 +156,6 @@
<select id="getUserById" resultType="com.bonus.system.api.domain.SysUser"> <select id="getUserById" resultType="com.bonus.system.api.domain.SysUser">
select user_id as userId, user_name as userName, password as password from sys_user where user_id = #{userId} select user_id as userId, user_name as userName, password as password from sys_user where user_id = #{userId}
</select> </select>
<select id="queryByName1" resultType="com.bonus.base.basic.domain.TbPeople">
select tp.id as id,
tp.team_id as teamId,
tp.rel_name as relName,
tp.rel_phone as relPhone,
tp.id_card as idCard,
tp.post_code as postCode,
tp.sex as sex
from tb_people tp
where tp.del_flag = '0'
<if test="idCard != null and idCard != ''">
and tp.id_card = #{idCard}
</if>
</select>
</mapper> </mapper>