120急救站

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.boot.module.common.api.dto.DutyFireFightingDto;
 
 public interface IDutyFireFightingService extends IDutyCommonService {
@@ -20,7 +17,5 @@ public interface IDutyFireFightingService extends IDutyCommonService {
      * @return List<DutyCarDto>
      */
 	DutyFireFightingDto update(Long instanceId, DutyFireFightingDto dto);
-
-	List<Map<String, Object>> getFirstAidExportData(List<String> companyIdList);
 	
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
+import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.common.api.dto.DutyFirstAidDto;
 
 public interface IDutyFirstAidService extends IDutyCommonService {
@@ -17,4 +20,6 @@ public interface IDutyFirstAidService extends IDutyCommonService {
      * @return List<DutyCarDto>
      */
 	DutyFirstAidDto update(Long instanceId, DutyFirstAidDto dto);
+	
+	public List< Map<String, Object>> getFirstAidExportData(List<String> ids) ;
 }

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

@@ -55,6 +55,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.RescueEquipment;
 import com.yeejoin.amos.boot.module.common.api.entity.SpecialPositionStaff;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyFireFightingService;
+import com.yeejoin.amos.boot.module.common.api.service.IDutyFirstAidService;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
 import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
 import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
@@ -185,6 +186,9 @@ public class ExcelServiceImpl {
 
 	@Autowired
 	OrgUsrSafeReportServiceImpl orgUsrSafeReportService;
+	
+	@Autowired
+	IDutyFirstAidService dutyFirstAidService;
 
 	public void templateExport(HttpServletResponse response, ExcelDto excelDto) throws ClassNotFoundException {
 		String url = excelDto.getClassUrl();
@@ -1208,7 +1212,7 @@ public class ExcelServiceImpl {
 		if (!ValidationUtil.isEmpty(ids)) {
 			companyIdList = Lists.newArrayList(ids.split(","));
 		}
-		List<Map<String, Object>> personDetailList = dutyFireFightingService.getFirstAidExportData(companyIdList);
+		List<Map<String, Object>> personDetailList = dutyFirstAidService.getFirstAidExportData(companyIdList);
 
 		if (!personDetailList.isEmpty()) {
 			AtomicInteger row = new AtomicInteger(1);