人员附码业务代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -353,6 +353,15 @@ public interface IOrgUsrService {
     PeopleInfoDto selectPeopleById(Long id);
 
     /**
+     * 获取人员详情 不要权限
+     * @param id 人员id
+     * @return 人员
+     */
+    PeopleInfoDto selectPeopleByIdNoAuth(Long id);
+
+
+
+    /**
      * 根据id，type删除
      * @param id 主键
      * @param type 类型

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3230,6 +3230,85 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
+	public PeopleInfoDto selectPeopleByIdNoAuth(Long id) {
+		PeopleBasicInfoDto peopleBasicInfoDto = new PeopleBasicInfoDto();
+		OrgUsr orgUsr = this.baseMapper.selectById(id);
+		// 动态表单数据
+		List<FormValue> formValues = getFormValue(id);
+
+		Map<String, Object> collect = formValues.stream().collect(Collectors.toMap(FormValue::getKey,
+				formValue -> !ObjectUtils.isEmpty(formValue.getValue()) ? formValue.getValue() : ""));
+		// 获取对象属性和值
+		Field[] fields = peopleBasicInfoDto.getClass().getDeclaredFields();
+		for (Field field : fields) {
+			try{
+				field.setAccessible(true);
+				String name = field.getName();
+				Object value = collect.get(name);
+				String genericType = ((Class)field.getGenericType()).getSimpleName();
+				if ("Date".equals(genericType)) {
+					if (!ObjectUtils.isEmpty(value)) {
+						Date date;
+						SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+						date = ft.parse(value.toString());
+						field.set(peopleBasicInfoDto, date);
+
+					}
+				} else {
+					field.set(peopleBasicInfoDto, value);
+				}
+			} catch (Exception ex){
+				logger.error("获取{}字段值失败, {}", field.getName(), ex);
+			}
+		}
+
+
+
+		if (!ObjectUtils.isEmpty(orgUsr.getSequenceNbr())) {
+			peopleBasicInfoDto.setName(orgUsr.getBizOrgName());
+			peopleBasicInfoDto.setAmosUserId(orgUsr.getAmosOrgId());
+			peopleBasicInfoDto.setAmosName(orgUsr.getAmosOrgCode());
+			peopleBasicInfoDto.setSequenceNbr(orgUsr.getSequenceNbr().toString());
+			peopleBasicInfoDto.setCompany(orgUsr.getParentId());
+			peopleBasicInfoDto.setBizOrgName(orgUsr.getParentName());
+			peopleBasicInfoDto.setBizOrgCode(orgUsr.getBizOrgCode());
+			peopleBasicInfoDto.setCompanyCode(orgUsr.getParentId());
+			peopleBasicInfoDto.setCompanyName(orgUsr.getParentName());
+		}
+
+		if ("1601".equals(peopleBasicInfoDto.getPeopleType())) {
+			QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
+			Firefighters firefighters = iFirefightersService.getOne(firefightersQueryWrapper.eq("org_usr_id", id).eq("is_delete", 0));
+			if (!ObjectUtils.isEmpty(firefighters)) {
+				peopleBasicInfoDto.setState(firefighters.getState());
+				peopleBasicInfoDto.setCompanyCode(firefighters.getCompanyCode());
+				peopleBasicInfoDto.setCompany(firefighters.getCompany());
+				peopleBasicInfoDto.setCompanyName(firefighters.getCompanyName());
+				peopleBasicInfoDto.setBizOrgCode(firefighters.getBizOrgCode());
+				peopleBasicInfoDto.setBizOrgName(firefighters.getBizOrgName());
+				peopleBasicInfoDto.setFireTeamId(firefighters.getFireTeamId());
+				peopleBasicInfoDto.setFireTeamName(firefighters.getFireTeamName());
+				//10445 BUG
+				peopleBasicInfoDto.setCertificatesType(firefighters.getCertificatesType());
+			}
+		}
+
+		// 获取联系人
+		QueryWrapper<FirefightersContacts> queryWrapper1 = new QueryWrapper<>();
+		queryWrapper1.eq("org_usr_id", String.valueOf(id));
+		FirefightersContacts firefightersContacts = ifirefightersContactsService.getOne(queryWrapper1);
+		// 获取岗位标签
+		QueryWrapper queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("org_usr_id", String.valueOf(id));
+		FirefightersDataDto firefightersDataDto = new FirefightersDataDto(
+				ifirefightersWorkexperienceService.getOne(queryWrapper),
+				ifirefightersEducationService.getOne(queryWrapper), iFirefightersPostService.getOne(queryWrapper));
+
+		return  new PeopleInfoDto(peopleBasicInfoDto, firefightersContacts, firefightersDataDto);
+	}
+
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public String deletePeopleById(Long id, String type, AgencyUserModel user) {
 
@@ -3452,13 +3531,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	public RiskBizInfoVo getPersonInfo(String id, String type) {
 		RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
 		if ("personInfo".equals(type)) {
-			PeopleInfoDto peopleInfoDto =iOrgUsrService.selectPeopleById(Long.valueOf(id));
+			PeopleInfoDto peopleInfoDto =iOrgUsrService.selectPeopleByIdNoAuth(Long.valueOf(id));
 		   return getRiskBizInfo(riskBizInfoVo,peopleInfoDto, id);
 		} else {
 			LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<>();
 			queryWrapper.eq(OrgUsr::getAmosOrgId,id);
 			OrgUsr orgUsr = iOrgUsrService.getOne(queryWrapper);
-			PeopleInfoDto peopleInfoDto =iOrgUsrService.selectPeopleById(orgUsr.getSequenceNbr());
+			PeopleInfoDto peopleInfoDto =iOrgUsrService.selectPeopleByIdNoAuth(orgUsr.getSequenceNbr());
 			return getRiskBizInfo(riskBizInfoVo,peopleInfoDto,String.valueOf(orgUsr.getSequenceNbr()));
 		}
 	}