修改代码

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

@@ -155,7 +155,7 @@ public interface DutyPersonShiftMapper extends BaseMapper<DutyPersonShift> {
     
     List<Map<String, Object>> getNewEquipmentForSpecifyDate(String dutyDate,String groupCode,String equipmentId,String equipmentName,String groupByName);
 
-    String getFirstAidCompanyId ();
+
         /**
          * 获取指定人 指定日期下所有的排班
          * @param instanceId 动态表单 关联id

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

@@ -485,12 +485,6 @@
 
     </select>
 
-    <select id='getFirstAidCompanyId' resultType="string">
-        SELECT sequence_nbr
-        FROM cb_org_usr a
-        WHERE a.is_delete = 0
-          AND a.biz_org_name = '消防救援保障部'
-    </select>
 
     <select id='getFirstAidForTypeCodeAndCompanyId' resultType="map">
         SELECT cft.name,

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

@@ -640,7 +640,7 @@ FROM
 						FROM
 							cb_org_usr
 						WHERE
-							biz_org_name = '消防救援保障部'
+							biz_org_name = '消防急救保障部'
 						AND biz_org_type = 'COMPANY'
 					)
 			)

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

@@ -8,6 +8,7 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
@@ -31,6 +32,9 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 	@Autowired
 	DataDictionaryServiceImpl dataDictionaryService;
 
+	@Value("${fire-rescue}")
+	private String firstAidCompanyId;
+
 	public String getGroupCode() {
 		return "dutyFirstAid";
 	}
@@ -127,7 +131,7 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 		List<String> firstAidSimpleList = new ArrayList<String>();
 		List<String> companyNameList = new ArrayList<String>();
 
-		String firstAidCompanyId = dutyPersonShiftMapper.getFirstAidCompanyId();
+		//无需再查询消救部ID 此ID已固定 配置文件中维护。
 		if (firstAidCompanyId != "" && firstAidCompanyId != null){
 			ids.add(firstAidCompanyId);
 			OrgUsr companyDetail =	orgUsrServiceImpl.getDetailById(Long.parseLong(firstAidCompanyId));
@@ -147,7 +151,7 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 				detailMap.put("userName", userNameList);
 			}
 
-			//单位默认为 消防救援保障部，不可编辑。
+			//单位默认为 消防急救保障部，不可编辑。
 			detailMap.put("companyName", companyNameList);
 
 			List<DataDictionary>  dataDicList=	dataDictionaryService.getByType(typeString);

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

@@ -515,7 +515,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         queryWrapper.eq(FireTeam::getTypeCode, code);
         queryWrapper.eq(FireTeam::getIsDelete, false);
         //   queryWrapper.eq(FireTeam::getCompanyName, "消防急救保障部");
-        // 消防救援保障部为保证灵活性以及防止名字变更 通过id查询  ID在配置文件中配置
+        // 消防急救保障部为保证灵活性以及防止名字变更 通过id查询  ID在配置文件中配置
       queryWrapper.eq(FireTeam::getCompany,fireRescueId);
         LambdaQueryWrapper<FireTeam> queryWrapper1 = new LambdaQueryWrapper<FireTeam>();
         queryWrapper1.eq(FireTeam::getIsDelete, false);

amos-boot-system-jcs/src/main/resources/application.properties

@@ -122,7 +122,7 @@ auth-key-fire-fighters=fire_fighters_info
 #权限开关： true 启用权限 false 不启用
 mybatis.interceptor.enabled = true
 
-## 消防救援保障部ID
+## 消防急救保障部ID
 fire-rescue=1432549862557130753
 
 

amos-boot-system-latentdanger/src/main/resources/application.properties

@@ -63,7 +63,7 @@ feign.httpclient.connection-timeout=5000
 video.fegin.name=video
 latentDanger.feign.name=AMOS-LATENT-DANGER
 Knowledgebase.fegin.name=AMOS-API-KNOWLEDGEBASE
-## 消防救援保障部ID
+## 消防急救保障部ID
 fire-rescue=1432549862557130753
 #management.endpoints.enabled-by-default=false
 ##  增加接口文档验证