瀏覽代碼

联络人电话 通报状态 超期状态 采取措施 发布人员

abai 1 月之前
父節點
當前提交
39f6b0e8f7

+ 1 - 1
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjHistoricalDataController.java

@@ -19,7 +19,7 @@ import javax.annotation.Resource;
 
 /**
  * 历史数据查看
- * 前端访问路由地址为:/business/released
+ * 前端访问路由地址为:/business/historicalData
  *
  * @author LionLi
  * @date 2025-09-08

+ 1 - 1
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjNotificationInformationController.java

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
 
 /**
  * 通报信息查询
- * 前端访问路由地址为:/business/released
+ * 前端访问路由地址为:/business/notificationInformation
  *
  * @author LionLi
  * @date 2025-09-08

+ 1 - 1
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjSuperiorLeaderController.java

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
 
 /**
  * 上级领导查阅
- * 前端访问路由地址为:/business/released
+ * 前端访问路由地址为:/business/superiorLeader
  *
  * @author LionLi
  * @date 2025-09-08

+ 24 - 0
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjReleasedVo.java

@@ -220,6 +220,12 @@ public class BjReleasedVo implements Serializable {
     private String releasedUnitStr;
 
     /**
+     * 发布人员
+     */
+    @Schema(description = "发布人员")
+    private String publishers;
+
+    /**
      * 通报事项类别中文
      */
     @Schema(description = "通报事项类别中文")
@@ -238,6 +244,24 @@ public class BjReleasedVo implements Serializable {
     private String releaseStatusStr;
 
     /**
+     * 通报状态中文
+     */
+    @Schema(description = "通报状态中文")
+    private String notificationStatusStr;
+
+    /**
+     * 采取措施中文
+     */
+    @Schema(description = "采取措施中文")
+    private String takeMeasuresStr;
+
+    /**
+     * 超期状态中文
+     */
+    @Schema(description = "超期状态中文")
+    private String overdueStatusStr;
+
+    /**
      * 是否需要反馈
      */
     @Schema(description = "是否需要反馈")

+ 19 - 1
ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjReleasedMapper.xml

@@ -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">