添加消防人员的excle导出数据帅选

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -32,7 +32,8 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
     List<FirefightersTreeDto> getFirefightersJobTitleCount();
 
-    List<FirefightersExcelDto> exportToExcel(Boolean isDelete);
-
     List<String> getFirefightersName( );
+
+	List<FirefightersExcelDto> exportToExcel(Boolean isDelete, String name, String postQualification, String fireTeamId,
+			String state, String areasExpertise, String jobTitle);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -151,10 +151,12 @@ LEFT JOIN cb_firefighters_education fe ON f.sequence_nbr = fe.firefighters_id
 LEFT JOIN cb_firefighters_post fp ON f.sequence_nbr = fp.firefighters_id
 WHERE
 	f.is_delete = 0
--- AND fc.is_delete = 0
--- AND fw.is_delete = 0
--- AND fe.is_delete = 0
--- AND fp.is_delete = 0
+<if test="name!=null and name !='-1' and name !=''">and f.`name` like concat('%',#{name},'%')</if>
+<if test='postQualification!=null'>and fp.post_qualification_code  = #{postQualification}</if>
+<if test='fireTeamId !=null'>and f.fire_team_id = #{fireTeamId}</if>
+<if test='state !=null'>and f.state_code = #{state}</if>
+<if test='areasExpertise!=null'>and fp.areas_expertise_code = #{areasExpertise}</if>
+<if test='jobTitle!=null'>and f.job_title_code = #{jobTitle}</if>
 	</select>
 
 	<select id="getFirefightersName" resultType="string">

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

@@ -29,6 +29,8 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -178,7 +180,7 @@ public class FireExpertsController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/list")
     public ResponseModel<List<FireExpertsDto>> selectForList() {
-        List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false);
+        List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,null,null);
         fireExpertsDtoList.stream().map(item -> {
             item.setAge(DateUtils.getAge(item.getBirthdayTime()));
             return item;

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -96,8 +98,14 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
     /**
      * 导出列表
      */
-    public List<FirefightersExcelDto> exportToExcel(@Condition(Operator.eq) Boolean isDelete) {
-        return firefightersMapper.exportToExcel(isDelete);
+    public List<FirefightersExcelDto> exportToExcel(@Condition(Operator.eq) Boolean isDelete,Map par) {
+    String	name  =par.containsKey("name")?par.get("name").toString():null;
+    String	postQualification  =par.containsKey("postQualification")?par.get("postQualification").toString():null; 
+    String	fireTeamId  =par.containsKey("fireTeamId")?par.get("fireTeamId").toString():null;
+    String	state  =par.containsKey("state")?par.get("state").toString():null;
+    String	areasExpertise    =par.containsKey("areasExpertise")?par.get("areasExpertise").toString():null;
+    String	jobTitle  =par.containsKey("jobTitle")?par.get("jobTitle").toString():null;
+       return firefightersMapper.exportToExcel(isDelete,name,postQualification,fireTeamId,state,areasExpertise,jobTitle);
     }
 
 

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

@@ -254,7 +254,7 @@ public class ExcelServiceImpl {
 					FireStationDto.class, null, false);
 			break;
 		case "XFRY":
-			List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false);
+			List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false, par);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
 					firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
 			break;
@@ -1561,7 +1561,7 @@ public class ExcelServiceImpl {
 					FireStationDto.class, null, false);
 			break;
 		case "XFRY":
-			List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false);
+			List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false,null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
 					firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
 			break;