维保人员和微型消防站Excle 刷选数据

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

@@ -160,7 +160,7 @@ public interface IMaintenanceCompanyService {
 	 * 将所有的维保人员导入到excle中
 	 * @return
 	 */
-	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel();
+	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel(Map map);
 
     List<MaintenanceCompany> findByInstanceIdAndType(Long instanceId, String 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/FireStationServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,23 +19,12 @@ import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationzhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.entity.FireStation;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * 微型消防站服务实现类
@@ -53,8 +53,8 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
     /**
      * 列表查询 示例
      */
-    public List<FireStationDto> queryForFireStationList(@Condition(Operator.eq) Boolean isDelete) {
-        return this.queryForList("", false, isDelete);
+    public List<FireStationDto> queryForFireStationList(@Condition(Operator.eq) Boolean isDelete,@Condition(Operator.eq) Long bizCompanyId,@Condition(Operator.eq) String name) {
+        return this.queryForList("", false, isDelete,bizCompanyId,name);
     }
 
     /**

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

@@ -35,6 +35,8 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -290,10 +292,55 @@ public class MaintenanceCompanyServiceImpl
 		});
 		return dynamicFormList;
 	}
+	public List<Map<String, Object>> getAllMaintenanceEexcleList(String maintenanceType,Map parms) {
+		String type = null;
+		switch (maintenanceType.toUpperCase()) {
+		case PERSON:
+			type = MAINTENANCE_PERSON;
+			break;
+		case DEPARTMENT:
+			type = MAINTENANCE_DEPARTMENT;
+			break;
+		default:
+			type = MAINTENANCE_COMPANY;
+		}
+		if (StringUtils.isBlank(type)) {
+			return null;
+		}
+		List<Map<String, Object>> dynamicFormList = dynamicFormInstanceService.listAll(type);
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>();
+		wrapper.eq(MaintenanceCompany::getType, maintenanceType.toUpperCase());
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
+		if(parms!=null && parms.size()>0) {
+			String name  =parms.containsKey("name")?parms.get("name").toString():null;
+			String parentId  =parms.containsKey("parentId")?parms.get("parentId").toString():null;
+			if(name!=null) {
+				wrapper.like(MaintenanceCompany::getName, name);
+			}
+			if(parentId!=null) {
+				wrapper.eq(MaintenanceCompany::getParentId, parentId);
+			}
+			
+		}
+		List<MaintenanceCompany> maintenanceCompany = this.list(wrapper);
 
+		Map<Long, MaintenanceCompany> maintenanceCompanyMap = maintenanceCompany.stream()
+				.collect(Collectors.toMap(MaintenanceCompany::getInstanceId, Function.identity()));
+		dynamicFormList.forEach(r -> {
+			MaintenanceCompany detail = maintenanceCompanyMap.get(Long.parseLong(r.get("instanceId").toString()));
+			if (!ObjectUtils.isEmpty(detail)) {
+				if(detail.getParentId()!=null && detail.getName()!=null) {
+					MaintenanceCompany map = maintenanceCompanyMapper.selectById(detail.getParentId());
+					r.put("parentName", map.getName());
+					r.putAll(Bean.BeantoMap(detail));
+				}
+			}
+		});
+		return dynamicFormList.stream().filter(i-> i.containsKey("name")).collect(Collectors.toList());
+	}
 	@Override
-	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel() {
-		List<Map<String, Object>> list = this.getAllMaintenanceList(PERSON);
+	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel(Map map) {
+		List<Map<String, Object>> list = this.getAllMaintenanceEexcleList(PERSON,map);
 		return JSONArray.parseArray(JSONArray.toJSONString(list), MaintenancePersonExcleDto.class);
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -107,6 +107,9 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.servlet.http.HttpServletResponse;
+
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import java.io.InputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -249,7 +252,13 @@ public class ExcelServiceImpl {
 					FireTeamDto.class, dataSourcesImpl, false);
 			break;
 		case "WXXFZ":
-			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false);
+            String nameString =null;
+            Long bizCompanyId =null; 
+			if(par!=null && par.size()>0) {
+				nameString =par.containsKey("name")?par.get("name").toString():null;
+				bizCompanyId =par.containsKey("bizCompanyId")?Long.parseLong(par.get("bizCompanyId").toString()):null;;
+			}
+			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false, bizCompanyId,nameString);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireStationDtoList,
 					FireStationDto.class, null, false);
 			break;
@@ -260,7 +269,7 @@ public class ExcelServiceImpl {
 			break;
 		case "WBRY":
 			List<MaintenancePersonExcleDto> maintenancePersonExcelDtoList = maintenanceCompanyService
-					.exportToMaintenancePersonExcel();
+					.exportToMaintenancePersonExcel(par);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
 					maintenancePersonExcelDtoList, MaintenancePersonExcleDto.class, null, false);
 			break;
@@ -1556,7 +1565,7 @@ public class ExcelServiceImpl {
 					FireTeamDto.class, dataSourcesImpl, false);
 			break;
 		case "WXXFZ":
-			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false);
+			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false,null,null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireStationDtoList,
 					FireStationDto.class, null, false);
 			break;
@@ -1567,7 +1576,7 @@ public class ExcelServiceImpl {
 			break;
 		case "WBRY":
 			List<MaintenancePersonExcleDto> maintenancePersonExcelDtoList = maintenanceCompanyService
-					.exportToMaintenancePersonExcel();
+					.exportToMaintenancePersonExcel(null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
 					maintenancePersonExcelDtoList, MaintenancePersonExcleDto.class, null, false);
 			break;