Skip to content

A
amos-boot-biz
Commit 0566dd7b authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.BUG来源Bug-13585

parent 4290fc3f
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 28 deletions
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzsUserInfoDto.java
View file @ 0566dd7b
......@@ -32,6 +32,9 @@ public class TzsUserInfoDto extends BaseDto {
@ApiModelProperty(value = "岗位")
private String post;
@ApiModelProperty(value = "岗位名称")
private String postName;
@ApiModelProperty(value = "联系电话")
private String phone;
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzsUserInfo.java
View file @ 0566dd7b
......@@ -52,6 +52,12 @@ public class TzsUserInfo extends BaseEntity {
private String post;
/**
* 岗位名称
*/
@TableField("post_name")
private String postName;
/**
* 联系电话
*/
@TableField("phone")
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml
View file @ 0566dd7b
......@@ -9,6 +9,7 @@
certificate_type,
certificate_num,
post,
post_name,
phone,
birthday,
unit_name,
......@@ -45,7 +46,7 @@
and amos_user_name like concat('%',#{dto.amosUserName},'%')
</if>
<if test="dto.post != '' and dto.post != null">
and post like concat('%',#{dto.post},'%')
and post_name like concat('%',#{dto.postName},'%')
</if>
</where>
order by rec_date
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java
View file @ 0566dd7b
......@@ -26,6 +26,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -53,9 +54,11 @@ public class TzsUserInfoController extends BaseController {
}
tzsUserInfo.setUnitName(companyModels.get(0).getCompanyName());
tzsUserInfo.setUnitCode(companyModels.get(0).getCompanyCode());
tzsUserInfo.setRecDate(new Date());
Map<String, Object> qualificationsInfo = (Map<String, Object>)map.get("qualificationsInfo");
Object subForm = qualificationsInfo.get("subForm");
List<TzsUserQualifications> list = JSON.parseArray(JSON.toJSONString(subForm), TzsUserQualifications.class);
tzsUserInfo.setPostName(tzsUserInfoServiceImpl.setPostName(tzsUserInfo.getPost()));
tzsUserInfo = tzsUserInfoServiceImpl.createWithModel(tzsUserInfo);
if (!ObjectUtils.isEmpty(list)){
tzsUserInfoService.addQualificationsMessage(String.valueOf(tzsUserInfo.getSequenceNbr()),list);
......@@ -81,6 +84,8 @@ public class TzsUserInfoController extends BaseController {
Object subForm = qualificationsInfo.get("subForm");
List<TzsUserQualifications> list = JSON.parseArray(JSON.toJSONString(subForm), TzsUserQualifications.class);
tzsUserInfo.setSequenceNbr(rowId);
tzsUserInfo.setRecDate(new Date());
tzsUserInfo.setPostName(tzsUserInfoServiceImpl.setPostName(tzsUserInfo.getPost()));
tzsUserInfoServiceImpl.updateById(tzsUserInfo);
if (!ObjectUtils.isEmpty(list)){
tzsUserInfoService.updateQualificationsMessage(String.valueOf(tzsUserInfo.getSequenceNbr()),list);
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
View file @ 0566dd7b
......@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
......@@ -19,6 +18,7 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserInfoService;
import com.yeejoin.amos.boot.module.tcm.api.vo.TzsUserInfoVo;
import com.yeejoin.amos.boot.module.tcm.api.vo.TzsUserQualificationsVo;
import com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl.RegUnitInfoServiceImpl;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
......@@ -32,6 +32,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserInfo, TzsUserInfoMapper> implements ITzsUserInfoService {
......@@ -45,8 +46,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
@Autowired
private RedisUtils redisUtils;
@Autowired
private DataDictionaryMapper dataDictionaryMapper;
RegUnitInfoServiceImpl regUnitInfoService;
//企业人员角色
private final String USER_ROLE = "QYRYJS";
//企业人员用户组
......@@ -57,38 +61,37 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
@Autowired
private TzsUserQualificationsServiceImpl tzsUserQualificationsService;
@Override
public Page<TzsUserInfoDto> page(TzsUserInfoDto dto, Page<TzsUserInfoDto> page) {
Page<TzsUserInfoDto> tzsUserInfoDtoPage = tzsUserInfoMapper.selectPageMessage(page, dto);
tzsUserInfoDtoPage.getRecords().forEach(item ->{
if (!ObjectUtils.isEmpty(item.getProfile())){
tzsUserInfoDtoPage.getRecords().forEach(item -> {
if (!ObjectUtils.isEmpty(item.getProfile())) {
List<CommonFile> commonFiles = JSON.parseArray(item.getProfile(), CommonFile.class);
item.setProfile(commonFiles.get(0).getUrl());
}
if (!ObjectUtils.isEmpty(item.getBirthday())){
if (!ObjectUtils.isEmpty(item.getBirthday())) {
int age = getAge(item.getBirthday());
item.setAge(Math.max(age, 0));
}
if (!ObjectUtils.isEmpty(item.getPost())){
JSONArray objects = JSON.parseArray(item.getPost());
item.setPost(null);
LambdaQueryWrapper<DataDictionary> lambda = new QueryWrapper<DataDictionary>().lambda();
lambda.in(DataDictionary::getSequenceNbr, objects);
List<DataDictionary> dataDictionaries = dataDictionaryMapper.selectList(lambda);
dataDictionaries.forEach(post ->{
if (!ObjectUtils.isEmpty(item.getPost())){
item.setPost(item.getPost() + "," +post.getName());
}else {
item.setPost(post.getName());
}
});
}
});
return tzsUserInfoDtoPage;
}
public String setPostName(String postKey) {
JSONArray dictIds = JSON.parseArray(postKey);
if (dictIds == null || dictIds.isEmpty()) {
return "";
}
LambdaQueryWrapper<DataDictionary> lambda = new QueryWrapper<DataDictionary>().lambda();
lambda.in(DataDictionary::getSequenceNbr, dictIds);
List<DataDictionary> dataDictionaries = regUnitInfoService.initAllDataDictionaryList();
List<DataDictionary> postDataList = dataDictionaries.stream().filter(d -> dictIds.stream().anyMatch(id -> id.toString().equals(d.getSequenceNbr().toString()))).collect(Collectors.toList());
return postDataList.stream().map(DataDictionary::getName).collect(Collectors.joining(","));
}
public int getAge(Date birth) {
private int getAge(Date birth) {
Calendar cal = Calendar.getInstance();
int thisYear = cal.get(Calendar.YEAR);
int thisMonth = cal.get(Calendar.MONTH);
......@@ -151,8 +154,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
Map<String, Object> maps = new HashMap<>();
TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(id);
TzsUserInfoVo tzsUserInfoVo = new TzsUserInfoVo();
BeanUtils.copyProperties(tzsUserInfo, tzsUserInfoVo, "identification","profile","post");
if (!ObjectUtils.isEmpty(tzsUserInfo.getPost())){
BeanUtils.copyProperties(tzsUserInfo, tzsUserInfoVo, "identification", "profile", "post");
if (!ObjectUtils.isEmpty(tzsUserInfo.getPost())) {
tzsUserInfoVo.setPost(JSON.parseArray(tzsUserInfo.getPost()));
}
tzsUserInfoVo.setIdentification(ObjectUtils.isEmpty(tzsUserInfo.getIdentification()) ? new ArrayList() : JSON.parseArray(tzsUserInfo.getIdentification()));
......@@ -162,15 +165,15 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
lambda.eq(TzsUserQualifications::getUserInfoId, id);
ArrayList<TzsUserQualificationsVo> tzsUserQualificationsVos = new ArrayList<>();
List<TzsUserQualifications> list = tzsUserQualificationsService.getBaseMapper().selectList(lambda);
list.forEach(item ->{
list.forEach(item -> {
TzsUserQualificationsVo vo = new TzsUserQualificationsVo();
BeanUtils.copyProperties(item, vo,"file");
BeanUtils.copyProperties(item, vo, "file");
vo.setFile(ObjectUtils.isEmpty(item.getFile()) ? new ArrayList() : JSON.parseArray(item.getFile()));
tzsUserQualificationsVos.add(vo);
});
HashMap<String, Object> subForm = new HashMap<>();
subForm.put("subForm", tzsUserQualificationsVos);
maps.put("qualificationsInfo",subForm);
maps.put("qualificationsInfo", subForm);
return maps;
}
......@@ -262,7 +265,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
userResult = Privilege.agencyUserClient.unlockUsers(amosUserId);
lockStatus = 200 == userResult.getStatus() ? UNLOCK : LOCK;
}
if(!ObjectUtils.isEmpty(lockStatus)){
if (!ObjectUtils.isEmpty(lockStatus)) {
TzsUserInfo tzsUserInfo = new TzsUserInfo();
tzsUserInfo.setSequenceNbr(sequenceNbr);
tzsUserInfo.setLockStatus(lockStatus);
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java
View file @ 0566dd7b
......@@ -479,7 +479,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
"getName", "getParent", null, "getCode");
}
private List<DataDictionary> initAllDataDictionaryList() {
public List<DataDictionary> initAllDataDictionaryList() {
List<DataDictionary> dictionaries;
// 使用双重检查锁定
if (redisUtil.hasKey(BizCommonConstant.TCM_ALL_DATA_DICT_REDIS_KEY)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment