Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/TemplateDynamicCellWriteHandlerDate.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.api.excel;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 
 import org.apache.poi.ss.usermodel.DataValidation;
 import org.apache.poi.ss.usermodel.DataValidationConstraint;
@@ -70,8 +71,9 @@ public class TemplateDynamicCellWriteHandlerDate implements SheetWriteHandler{
 		            // 如果下拉值总数大于100，则使用一个新sheet存储，避免生成的导入模板下拉值获取不到
 		            if (v.length > LIMIT_NUMBER) {
 		                //定义sheet的名称
-		                //1.创建一个隐藏的sheet 名称为 hidden + k
-		                String sheetName = "hidden" +startIndex + k;
+		                //1.创建一个隐藏的sheet 名称为 hidden + k+随机数防止数据过多造成的名字重复
+						Random random = new Random();
+						String sheetName = "hidden" +startIndex + k+random.nextInt(1000);
 		                Workbook workbook = writeWorkbookHolder.getWorkbook();
 		                Sheet hiddenSheet = workbook.createSheet(sheetName);
 		                for (int i = 0, length = v.length; i < length; i++) {

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

@@ -1750,7 +1750,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> getPersonDetailByCompanyIds(List<String> ids) {
+/*	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>();
@@ -1758,6 +1758,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		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());
@@ -1792,12 +1803,66 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			if (ObjectUtils.isEmpty(fireStationList)) {
 				continue;
 			}
-			List<String> fireStationSimpleList = new ArrayList<String>();
-			fireStationList.stream().forEach(i -> {
+			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);
 			});
-			map.put("fireStation", fireStationSimpleList);
+		});
+
+		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.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)) {
+				continue;
+			}
+			map.put("teamName", orgCompany.getBizOrgName());
+			map.put("teamId", orgCompany.getSequenceNbr().toString());
+
+			if (!map.containsKey("fireStation")){
+				map.put("fireStation", fireStationSimpleList);
+			}
 			list.add(map);
 		}
 		return list;