Commit 7c6dbab6 authored by 张森's avatar 张森

部门人员触发预警时错误显示部门,应该显示站名称

parent 368df327
...@@ -163,6 +163,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> { ...@@ -163,6 +163,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
Map<String, Object> getPersonType(@Param("typeCode") String typeCode); Map<String, Object> getPersonType(@Param("typeCode") String typeCode);
String getNameByCode(@Param("bizOrgCode") String bizOrgCode);
List<Map<String, Object>> reportResult(String startTime, String endTime, String bizOrgCode); List<Map<String, Object>> reportResult(String startTime, String endTime, String bizOrgCode);
List<Map<String, Object>> getManagePersonList(@Param("bizOrgCode") String bizOrgCode); List<Map<String, Object>> getManagePersonList(@Param("bizOrgCode") String bizOrgCode);
......
...@@ -1834,4 +1834,16 @@ ...@@ -1834,4 +1834,16 @@
GROUP BY GROUP BY
LEFT(a.biz_org_code, 18) LEFT(a.biz_org_code, 18)
</select> </select>
<select id="getNameByCode" resultType="java.lang.String">
SELECT
biz_org_name
FROM
cb_org_usr
WHERE
is_delete = 0
AND biz_org_type = 'COMPANY'
LIMIT 1
WHERE biz_org_code = #{bizOrgCode}
</select>
</mapper> </mapper>
...@@ -3787,6 +3787,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -3787,6 +3787,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
riskBizInfoVo.setWarningObjectCode(id); // 存为cb_org_user 表id 返回给idx 为附码业务后续处理 riskBizInfoVo.setWarningObjectCode(id); // 存为cb_org_user 表id 返回给idx 为附码业务后续处理
riskBizInfoVo.setSourceAttribution(peopleInfoDto.getFirefighters().getBizOrgCode().substring(0, 18)); riskBizInfoVo.setSourceAttribution(peopleInfoDto.getFirefighters().getBizOrgCode().substring(0, 18));
riskBizInfoVo.setSourceAttributionDesc(peopleInfoDto.getFirefighters().getBizOrgName()); riskBizInfoVo.setSourceAttributionDesc(peopleInfoDto.getFirefighters().getBizOrgName());
if (StringUtils.isNotEmpty(riskBizInfoVo.getSourceAttribution())) {
String nameByCode = orgUsrMapper.getNameByCode(riskBizInfoVo.getSourceAttribution());
riskBizInfoVo.setSourceAttributionDesc(StringUtils.isNotEmpty(nameByCode) ? nameByCode : riskBizInfoVo.getSourceAttributionDesc());
}
try { try {
riskBizInfoVo.setWarningTime(DateUtils.dateFormat(new Date(), DateUtils.DATE_TIME_PATTERN)); riskBizInfoVo.setWarningTime(DateUtils.dateFormat(new Date(), DateUtils.DATE_TIME_PATTERN));
} catch (ParseException e) { } catch (ParseException e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment