修改120急救站的代码

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

@@ -129,7 +129,7 @@ public interface DutyPersonShiftMapper extends BaseMapper<DutyPersonShift> {
      */
     List<Map<String, Object>>  getDutyForSpecifyDate(String duty);
     
-    Map<String, Object>   getFireTeamBySequenceNbr (Long sequenceNbr);
+    Map<String, Object>   getFireTeamBySequenceNbr (long sequenceNbr);
     
-    List<Map<String, Object>>   getFirstAidForTypeCodeAndCompanyId(Long company);
+    List<Map<String, Object>>   getFirstAidForTypeCodeAndCompanyId(long company);
 }

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

@@ -321,24 +321,24 @@ WHERE
 </select>
 
 
-<select id='getFirstAidForTypeCodeAndCompanyId' resultType="map">>
+<select id='getFirstAidForTypeCodeAndCompanyId' resultType="map">
 SELECT
-	name,
-	sequence_nbr
+	cft.name,
+	cft.sequence_nbr
 FROM
-	cb_fire_team
+	cb_fire_team cft
 WHERE
-	company = #{company}
-AND is_delete = 0
-AND type_code = (
+	cft.is_delete = 0
+AND cft.type_code = (
 	SELECT
 		CODE
 	FROM
-		cb_data_dictionary
+		cb_data_dictionary cd
 	WHERE
-		`name` = '企（事）业单位医疗救援队（站）'
-	AND type = 'XFJGLX'
+		cd.name = '企（事）业单位医疗救援队（站）'
+	AND cd.type = 'XFJGLX'
 )
+ AND cft.company = #{company}
 </select>
 
 </mapper>

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

@@ -113,7 +113,7 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 
 	public List< Map<String, Object>> getFirstAidExportData(List<String> ids) {
 		List< Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
-		String typeString = "XFJGLX";
+		String typeString = "DUTY_POST_TYPE";
 		ids.stream().forEach(i->{
 			Map<String, Object> detailMap = new HashMap<String, Object>();
 			List<OrgUsr> personList = orgUsrServiceImpl.getPersonListByParentId(Long.parseLong(i));

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

@@ -957,7 +957,7 @@ public class ExcelServiceImpl {
 				dutyFireFightingService.saveImportData(dataList);
 			} else if (ExcelEnums.JJZB.getType().equals(dutyType)) {
 				initDutyFirstAidData(sheet, dataList, dayByMonth);
-				dutyFireFightingService.saveImportData(dataList);
+				dutyFirstAidService.saveImportData(dataList);
 			}
 		}
 	}