Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -766,6 +766,13 @@ public class OrgUsrController extends BaseController {
     }
     
     
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询当前人员的身份证号码", notes = "查询当前人员的身份证号码")
+    @GetMapping(value = "find/getIdNumberByAmosId")
+    public ResponseModel<String> getIdNumberByAmosId(@RequestParam String amosId) {
+    	 return ResponseHelper.buildResponse(iOrgUsrService.getIdNumberByAmosId(amosId));
+    }
+    
     
     
     

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

@@ -865,7 +865,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		orgUsrFormVo.setXfaq(Xfaq != null ? Xfaq.get("name") : "");
 		orgUsrFormVo.setXfgl(Xfgl != null ? Xfgl.get("name") : "");
 		orgUsrFormVo.setDwfz(Dwfz != null ? Dwfz.get("name") : "");
-		if (orgUsr.getParentId() != null){
+		if (orgUsr.getParentId() != null) {
 			orgUsrFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
 		}
 		return orgUsrFormVo;
@@ -1753,66 +1753,47 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	 * @return
 	 */
 	@Override
-/*	public List<Map<String, Object>> getPersonDetailByCompanyIds(List<String> ids) {
-
-		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
-		wrapper.eq(OrgUsr::getIsDelete, false);
-		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
-		wrapper.in(OrgUsr::getParentId, ids);
-		List<OrgUsr> orgPersonList = this.baseMapper.selectList(wrapper);
-
-		List<String> fireStationSimpleList = new ArrayList<String>();
-		ids.forEach(id-> {
-			List<Map<String, Object>> maps = fireStationServiceImpl
-					.queryForFireStationListByCompanyId(Long.parseLong(id));
-			maps.stream().forEach(i -> {
-				String tagertString = i.get("name").toString() + "@" + i.get("sequence_nbr").toString();
-				fireStationSimpleList.add(tagertString);
-			});
-		});
-
-		for (OrgUsr orgUsr : orgPersonList) {
-			Map<String, Object> map = new HashMap<String, Object>();
-			List<DynamicFormInstanceDto> dyList = alertFormValueServiceImpl.queryByCalledId(orgUsr.getSequenceNbr());
-			if (ObjectUtils.isEmpty(dyList)) {
-				continue;
-			}
-			for (DynamicFormInstanceDto dto : dyList) {
-				if ("positionType".equals(dto.getFieldCode())) {
-					map.put("postType", dto.getFieldValue());
-					map.put("postTypeName", dto.getFieldValueLabel());
-					break;
-				}
-			}
-			if (!map.containsKey("postType") || map.get("postType") == null
-					|| StringUtils.isBlank(map.get("postType").toString())) {
-				continue;
-			}
-			map.put("userName", orgUsr.getBizOrgName());
-			map.put("userId", orgUsr.getSequenceNbr().toString());
-			LambdaQueryWrapper<OrgUsr> wrapper1 = new LambdaQueryWrapper<OrgUsr>();
-			wrapper1.eq(OrgUsr::getIsDelete, false);
-			wrapper1.eq(OrgUsr::getBizOrgType, OrgPersonEnum.公司.getKey());
-			wrapper1.eq(OrgUsr::getSequenceNbr, Long.parseLong(orgUsr.getParentId()));
-			OrgUsr orgCompany = this.baseMapper.selectOne(wrapper1);
-			if (ObjectUtils.isEmpty(orgCompany)) {
-				continue;
-			}
-			map.put("teamName", orgCompany.getBizOrgName());
-			map.put("teamId", orgCompany.getSequenceNbr().toString());
-			List<Map<String, Object>> fireStationList = fireStationServiceImpl
-					.queryForFireStationListByCompanyId(Long.parseLong(orgUsr.getParentId()));
-			if (ObjectUtils.isEmpty(fireStationList)) {
-				continue;
-			}
-			if (!map.containsKey("fireStation")){
-				map.put("fireStation", fireStationSimpleList);
-			}
-			list.add(map);
-		}
-		return list;
-	}*/
+	/*
+	 * public List<Map<String, Object>> getPersonDetailByCompanyIds(List<String>
+	 * ids) {
+	 * 
+	 * List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+	 * LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+	 * wrapper.eq(OrgUsr::getIsDelete, false); wrapper.eq(OrgUsr::getBizOrgType,
+	 * OrgPersonEnum.人员.getKey()); wrapper.in(OrgUsr::getParentId, ids);
+	 * List<OrgUsr> orgPersonList = this.baseMapper.selectList(wrapper);
+	 * 
+	 * List<String> fireStationSimpleList = new ArrayList<String>();
+	 * ids.forEach(id-> { List<Map<String, Object>> maps = fireStationServiceImpl
+	 * .queryForFireStationListByCompanyId(Long.parseLong(id));
+	 * maps.stream().forEach(i -> { String tagertString = i.get("name").toString() +
+	 * "@" + i.get("sequence_nbr").toString();
+	 * fireStationSimpleList.add(tagertString); }); });
+	 * 
+	 * for (OrgUsr orgUsr : orgPersonList) { Map<String, Object> map = new
+	 * HashMap<String, Object>(); List<DynamicFormInstanceDto> dyList =
+	 * alertFormValueServiceImpl.queryByCalledId(orgUsr.getSequenceNbr()); if
+	 * (ObjectUtils.isEmpty(dyList)) { continue; } for (DynamicFormInstanceDto dto :
+	 * dyList) { if ("positionType".equals(dto.getFieldCode())) {
+	 * map.put("postType", dto.getFieldValue()); map.put("postTypeName",
+	 * dto.getFieldValueLabel()); break; } } if (!map.containsKey("postType") ||
+	 * map.get("postType") == null ||
+	 * StringUtils.isBlank(map.get("postType").toString())) { continue; }
+	 * map.put("userName", orgUsr.getBizOrgName()); map.put("userId",
+	 * orgUsr.getSequenceNbr().toString()); LambdaQueryWrapper<OrgUsr> wrapper1 =
+	 * new LambdaQueryWrapper<OrgUsr>(); wrapper1.eq(OrgUsr::getIsDelete, false);
+	 * wrapper1.eq(OrgUsr::getBizOrgType, OrgPersonEnum.公司.getKey());
+	 * wrapper1.eq(OrgUsr::getSequenceNbr, Long.parseLong(orgUsr.getParentId()));
+	 * OrgUsr orgCompany = this.baseMapper.selectOne(wrapper1); if
+	 * (ObjectUtils.isEmpty(orgCompany)) { continue; } map.put("teamName",
+	 * orgCompany.getBizOrgName()); map.put("teamId",
+	 * orgCompany.getSequenceNbr().toString()); List<Map<String, Object>>
+	 * fireStationList = fireStationServiceImpl
+	 * .queryForFireStationListByCompanyId(Long.parseLong(orgUsr.getParentId())); if
+	 * (ObjectUtils.isEmpty(fireStationList)) { continue; } if
+	 * (!map.containsKey("fireStation")){ map.put("fireStation",
+	 * fireStationSimpleList); } list.add(map); } return list; }
+	 */
 
 	public List<Map<String, Object>> getPersonDetailByCompanyIds(List<String> ids) {
 
@@ -1824,7 +1805,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		List<OrgUsr> orgPersonList = this.baseMapper.selectList(wrapper);
 
 		List<String> fireStationSimpleList = new ArrayList<String>();
-		ids.forEach(id-> {
+		ids.forEach(id -> {
 			List<Map<String, Object>> maps = fireStationServiceImpl
 					.queryForFireStationListByCompanyId(Long.parseLong(id));
 			maps.stream().forEach(i -> {
@@ -1854,7 +1835,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			map.put("userId", orgUsr.getSequenceNbr().toString());
 			LambdaQueryWrapper<OrgUsr> wrapper1 = new LambdaQueryWrapper<OrgUsr>();
 			wrapper1.eq(OrgUsr::getIsDelete, false);
-			wrapper1.in(OrgUsr::getBizOrgType, OrgPersonEnum.公司.getKey(),OrgPersonEnum.部门.getKey());
+			wrapper1.in(OrgUsr::getBizOrgType, OrgPersonEnum.公司.getKey(), OrgPersonEnum.部门.getKey());
 			wrapper1.eq(OrgUsr::getSequenceNbr, Long.parseLong(orgUsr.getParentId()));
 			OrgUsr orgCompany = this.baseMapper.selectOne(wrapper1);
 			if (ObjectUtils.isEmpty(orgCompany)) {
@@ -1863,7 +1844,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			map.put("teamName", orgCompany.getBizOrgName());
 			map.put("teamId", orgCompany.getSequenceNbr().toString());
 
-			if (!map.containsKey("fireStation")){
+			if (!map.containsKey("fireStation")) {
 				map.put("fireStation", fireStationSimpleList);
 			}
 			list.add(map);
@@ -2231,97 +2212,95 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 //        return result;
 //    }
 
-    @Override
-    public void updateByIdOrgPersonFlc(OrgPersonDto OrgPersonVo, Long id) throws Exception {
-        // 修改人员信息
-        OrgUsr orgUsr = new OrgUsr();
-        OrgUsr oriOrgUsr = getById(id);
-        BeanUtils.copyProperties(OrgPersonVo, orgUsr);
-        orgUsr.setSequenceNbr(id);
-        updateById(orgUsr);
-        // 保存动态表单数据
-        updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgPersonVo.getDynamicFormValue());
-    }
-
-    @Override
-    public JSONObject selectPersonByUserId(Long userId) throws Exception {
-        OrgUsr orgUsr = orgUsrMapper.queryByUserId(userId);
-        // 动态表单数据
-        List<FormValue> formValue = getFormValue(orgUsr.getSequenceNbr());
-        OrgPersonFormDto orgPersonFormVo = new OrgPersonFormDto(formValue);
-        BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
-        OrgUsr parent = getById(orgUsr.getParentId());
-        if (!ObjectUtils.isEmpty(parent)) {
-            orgPersonFormVo.setParentName(parent.getBizOrgName());
-        }
-        List<FormValue> dynamicFormAlert = orgPersonFormVo.getDynamicFormAlert();
-        Map<String, String> collect = dynamicFormAlert.stream().collect(HashMap::new, (map, item) -> map.put(item.getKey(), item.getValue()), HashMap::putAll);
-        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(orgPersonFormVo));
-        jsonObject.put("map", collect);
-        return jsonObject;
-    }
-
-    @Override
-    public UserDto getUserParentInfo(String userId) {
-        OrgUsr orgUsr = orgUsrMapper.queryByUserId(Long.parseLong(userId));
-        if (null != orgUsr) {
-            UserDto userDto = new UserDto();
-            String parentId = orgUsr.getParentId();
-            userDto.setPersonSeq(String.valueOf(orgUsr.getSequenceNbr()));
-            userDto.setPersonName(orgUsr.getBizOrgName());
-            OrgUsr bizOrg = orgUsrMapper.queryBySequenceNbr(parentId);
-            if (!ObjectUtils.isEmpty(bizOrg)) {
-                userDto.setBizOrgType(bizOrg.getBizOrgType());
-                userDto.setBizOrgCode(bizOrg.getBizOrgCode());
-                userDto.setCompanyId(String.valueOf(bizOrg.getSequenceNbr()));
-                userDto.setCompanyName(bizOrg.getBizOrgName());
-            } else {
-                throw new RuntimeException("人员所在公司不存在");
-            }
-            return userDto;
-        } else {
-           return new UserDto();
-        }
-    }
-
-
-    public Object getOrgUserByAmosUserId(String amosUserId) throws Exception {
-        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
-        wrapper.eq(OrgUsr::getIsDelete, false);
-        wrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_PERSON);
-        wrapper.like(StringUtils.isNotBlank(amosUserId), OrgUsr::getAmosOrgId, amosUserId);
-        return this.baseMapper.selectList(wrapper);
-    }
-
-
-
-    @Override
-    public List<OrgUsr> getListByBizOrgTypeCode(String orgTypes, String orgCode) {
-        List<String> orgTypeList = new ArrayList<>();
-        if (StringUtils.isNotBlank(orgTypes)) {
-            orgTypeList = Arrays.asList(orgTypes.split(","));
-        }
-        return this.getBaseMapper().listByOrgTypes(orgTypeList, orgCode);
-    }
-
-    @Override
-    public List<OrgMenuDto> companyTreeByUserNumber(ReginParams reginParams) {
-        Map<String, Object> param = new HashMap<>();
-        // 权限处理
-        PermissionInterceptorContext.setDataAuthRule(authKey);
-        param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
-        List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCount(param);
-        return buildTreeParallel(list);
-    }
-
-    @Override
-    public List<OrgMenuDto> companyTreeByUser(ReginParams reginParams) {
-        Map<String, Object> param = new HashMap<>();
-        // 权限处理
-        PermissionInterceptorContext.setDataAuthRule(authKey);
-        List<OrgUsr> list = orgUsrMapper.companyTreeByUser(reginParams.getPersonIdentity().getBizOrgCode());
-        return buildTreeParallel(list);
-    }
+	@Override
+	public void updateByIdOrgPersonFlc(OrgPersonDto OrgPersonVo, Long id) throws Exception {
+		// 修改人员信息
+		OrgUsr orgUsr = new OrgUsr();
+		OrgUsr oriOrgUsr = getById(id);
+		BeanUtils.copyProperties(OrgPersonVo, orgUsr);
+		orgUsr.setSequenceNbr(id);
+		updateById(orgUsr);
+		// 保存动态表单数据
+		updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgPersonVo.getDynamicFormValue());
+	}
+
+	@Override
+	public JSONObject selectPersonByUserId(Long userId) throws Exception {
+		OrgUsr orgUsr = orgUsrMapper.queryByUserId(userId);
+		// 动态表单数据
+		List<FormValue> formValue = getFormValue(orgUsr.getSequenceNbr());
+		OrgPersonFormDto orgPersonFormVo = new OrgPersonFormDto(formValue);
+		BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
+		OrgUsr parent = getById(orgUsr.getParentId());
+		if (!ObjectUtils.isEmpty(parent)) {
+			orgPersonFormVo.setParentName(parent.getBizOrgName());
+		}
+		List<FormValue> dynamicFormAlert = orgPersonFormVo.getDynamicFormAlert();
+		Map<String, String> collect = dynamicFormAlert.stream().collect(HashMap::new,
+				(map, item) -> map.put(item.getKey(), item.getValue()), HashMap::putAll);
+		JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(orgPersonFormVo));
+		jsonObject.put("map", collect);
+		return jsonObject;
+	}
+
+	@Override
+	public UserDto getUserParentInfo(String userId) {
+		OrgUsr orgUsr = orgUsrMapper.queryByUserId(Long.parseLong(userId));
+		if (null != orgUsr) {
+			UserDto userDto = new UserDto();
+			String parentId = orgUsr.getParentId();
+			userDto.setPersonSeq(String.valueOf(orgUsr.getSequenceNbr()));
+			userDto.setPersonName(orgUsr.getBizOrgName());
+			OrgUsr bizOrg = orgUsrMapper.queryBySequenceNbr(parentId);
+			if (!ObjectUtils.isEmpty(bizOrg)) {
+				userDto.setBizOrgType(bizOrg.getBizOrgType());
+				userDto.setBizOrgCode(bizOrg.getBizOrgCode());
+				userDto.setCompanyId(String.valueOf(bizOrg.getSequenceNbr()));
+				userDto.setCompanyName(bizOrg.getBizOrgName());
+			} else {
+				throw new RuntimeException("人员所在公司不存在");
+			}
+			return userDto;
+		} else {
+			return new UserDto();
+		}
+	}
+
+	public Object getOrgUserByAmosUserId(String amosUserId) throws Exception {
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		wrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_PERSON);
+		wrapper.like(StringUtils.isNotBlank(amosUserId), OrgUsr::getAmosOrgId, amosUserId);
+		return this.baseMapper.selectList(wrapper);
+	}
+
+	@Override
+	public List<OrgUsr> getListByBizOrgTypeCode(String orgTypes, String orgCode) {
+		List<String> orgTypeList = new ArrayList<>();
+		if (StringUtils.isNotBlank(orgTypes)) {
+			orgTypeList = Arrays.asList(orgTypes.split(","));
+		}
+		return this.getBaseMapper().listByOrgTypes(orgTypeList, orgCode);
+	}
+
+	@Override
+	public List<OrgMenuDto> companyTreeByUserNumber(ReginParams reginParams) {
+		Map<String, Object> param = new HashMap<>();
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
+		param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
+		List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCount(param);
+		return buildTreeParallel(list);
+	}
+
+	@Override
+	public List<OrgMenuDto> companyTreeByUser(ReginParams reginParams) {
+		Map<String, Object> param = new HashMap<>();
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
+		List<OrgUsr> list = orgUsrMapper.companyTreeByUser(reginParams.getPersonIdentity().getBizOrgCode());
+		return buildTreeParallel(list);
+	}
 //    /**
 //     * 同步单位信息到防火监督point表
 //     *
@@ -2350,4 +2329,34 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 //        })).start();
 //    }
 
+	public String getIdNumberByAmosId(String amosId) {
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		wrapper.eq(OrgUsr::getAmosOrgId, amosId);
+		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
+		OrgUsr orgUsr = this.baseMapper.selectOne(wrapper);
+		if (orgUsr == null) {
+			return null;
+		}
+		List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(orgUsr.getSequenceNbr());
+		String certificateTypeValueString = null;
+		String certificatesNumberValueString = null;
+		if (list != null && list.size() > 0) {
+			for (DynamicFormInstanceDto dynamicFormInstanceDto : list) {
+				if ("certificatesTypeCode".equals(dynamicFormInstanceDto.getFieldCode())) {
+					certificateTypeValueString = dynamicFormInstanceDto.getFieldValue();
+					continue;
+				}
+				if ("certificatesNumber".equals(dynamicFormInstanceDto.getFieldCode())) {
+					certificatesNumberValueString = dynamicFormInstanceDto.getFieldValue();
+					continue;
+				}
+			}
+			if (certificateTypeValueString != null && "120".equals(certificateTypeValueString)) {
+				return certificatesNumberValueString;
+			}
+		}
+		return null;
+	}
+
 }
\ No newline at end of file