联动单位导出增加过滤

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

@@ -60,6 +60,6 @@ public interface LinkageUnitMapper extends BaseMapper<LinkageUnit> {
     Page<List<LinkageUnitDto>> getEmergencyLinkageUnitList(IPage<LinkageUnitDto> page,String unitName,
 			 String linkageUnitType, String linkageUnitTypeCode, String emergencyLinkageUnitCode);
 
-    List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode);
+    List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode);
     
 }

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

@@ -43,7 +43,7 @@ public interface ILinkageUnitService {
 	 */
 	public List<Menu> getEmergencyLinkageUnitCodeGroupBy(String type, String rootName);
 
-	List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode);
+	List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode);
 
 	List<LinkageUnitDto> queryForLinkageUnitList(Boolean isDelete);
 }

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

@@ -141,6 +141,11 @@
 	<if test="linkageUnitTypeCode != null and linkageUnitTypeCode != ''">
 		AND a.linkage_unit_type_code =#{linkageUnitTypeCode}
 	</if>
+	<if test="emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != '' ">
+		<if test="emergencyLinkageUnitCode != '-1'">
+			AND clu.emergency_linkage_unit_code =#{emergencyLinkageUnitCode}
+		</if>
+	</if>
 	order by a.rec_date desc
 </select>
 

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

@@ -304,8 +304,8 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 	}
 
 	@Override
-	public List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode) {
-		return linkageUnitMapper.exportToExcel(unitName,linkageUnitTypeCode);
+	public List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode) {
+		return linkageUnitMapper.exportToExcel(unitName,linkageUnitTypeCode,emergencyLinkageUnitCode );
 	}
 
 }
\ No newline at end of file

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

@@ -316,10 +316,11 @@ public class ExcelServiceImpl {
 
 			if(par.size()>0) {
 				LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel(par.containsKey("unitName")?par.get("unitName").toString():null,
-						par.containsKey("linkageUnitTypeCode")?par.get("linkageUnitTypeCode").toString():null
+						par.containsKey("linkageUnitTypeCode")?par.get("linkageUnitTypeCode").toString():null,
+						par.containsKey("emergencyLinkageUnitCode")?par.get("emergencyLinkageUnitCode").toString():null
 						);
 			}else{
-				LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel(null,null);
+				LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel(null,null,null);
 			}
 
 			List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(LinkageUnitDtoList), Map.class);