|
|
@@ -161,11 +161,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="vesselType" column="vessel_type"/>
|
|
|
<result property="buildDate" column="build_date"/>
|
|
|
<result property="csnu" column="csnu"/>
|
|
|
+ <result property="callSign" column="call_sign"/>
|
|
|
<result property="releasedUnitStr" column="releasedUnitStr"/>
|
|
|
<result property="conmStr" column="conmStr"/>
|
|
|
<result property="names" column="names"/>
|
|
|
<result property="releaseStatusStr" column="releaseStatusStr"/>
|
|
|
<result property="wfirStr" column="wfirStr"/>
|
|
|
+ <result property="notificationStatusStr" column="notificationStatusStr"/>
|
|
|
+ <result property="overdueStatusStr" column="overdueStatusStr"/>
|
|
|
+ <result property="takeMeasuresStr" column="takeMeasuresStr"/>
|
|
|
+ <result property="publishers" column="publishers"/>
|
|
|
</resultMap>
|
|
|
<select id="queryReleasedList" resultMap="releasedVoList">
|
|
|
select
|
|
|
@@ -210,7 +215,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
bl.conmStr,
|
|
|
blm.names,
|
|
|
sdd.dict_label as releaseStatusStr,
|
|
|
- sdd2.dict_label as wfirStr
|
|
|
+ sdd2.dict_label as wfirStr,
|
|
|
+ sdd3.dict_label as notificationStatusStr,
|
|
|
+ sdd4.dict_label as takeMeasuresStr,
|
|
|
+ sdd5.dict_label as overdueStatusStr,
|
|
|
+ blm2.publishers
|
|
|
from
|
|
|
ry.bj_released br
|
|
|
left join ry.bj_released_middle brm on
|
|
|
@@ -247,6 +256,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
left join ry.sys_dict_data sdd on
|
|
|
br.released_status = sdd.dict_value
|
|
|
and sdd.dict_type = 'bj_notify_os'
|
|
|
+ left join ry.sys_dict_data sdd3 on
|
|
|
+ blm2.notification_status = sdd3.dict_value
|
|
|
+ and sdd3.dict_type = 'bj_notification_status'
|
|
|
+ left join ry.sys_dict_data sdd4 on
|
|
|
+ blm2.take_measures = sdd4.dict_value
|
|
|
+ and sdd2.dict_type = 'bj_take_measures'
|
|
|
+ left join ry.sys_dict_data sdd5 on
|
|
|
+ blm2.overdue_status = sdd5.dict_value
|
|
|
+ and sdd5.dict_type = 'bj_overdue_status'
|
|
|
where
|
|
|
br.del_flag = '0'
|
|
|
<if test="bo.violationNumber != null and bo.violationNumber">
|