优化

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/BjAdministrativePunish.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -40,6 +41,36 @@ public class BjAdministrativePunish extends BaseEntity {
     private String punishReason;
 
     /**
+     * 违法发现时间
+     */
+    private Date lawFindDate;
+
+    /**
+     * 处罚金额
+     */
+    private BigDecimal punishPrice;
+
+    /**
+     * 当前处理人
+     */
+    private String handler;
+
+    /**
+     * 特殊情况
+     */
+    private String exceptionalCase;
+
+    /**
+     * 违法时间
+     */
+    private Date lawDate;
+
+    /**
+     * 立案提交时间
+     */
+    private Date registerSumbitDate;
+
+    /**
      * 船舶名称
      */
     private String shipNameCn;

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BjAdministrativePunishBo.java

@@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serial;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -35,6 +35,36 @@ public class BjAdministrativePunishBo extends BaseEntity {
     private String punishReason;
 
     /**
+     * 违法发现时间
+     */
+    private Date lawFindDate;
+
+    /**
+     * 处罚金额
+     */
+    private BigDecimal punishPrice;
+
+    /**
+     * 当前处理人
+     */
+    private String handler;
+
+    /**
+     * 特殊情况
+     */
+    private String exceptionalCase;
+
+    /**
+     * 违法时间
+     */
+    private Date lawDate;
+
+    /**
+     * 立案提交时间
+     */
+    private Date registerSumbitDate;
+
+    /**
      * 船舶名称
      */
     private String shipNameCn;

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjAdministrativePunishVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -37,6 +38,39 @@ public class BjAdministrativePunishVo implements Serializable {
     private String punishReason;
 
     /**
+     * 违法发现时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lawFindDate;
+
+    /**
+     * 处罚金额
+     */
+    private BigDecimal punishPrice;
+
+    /**
+     * 当前处理人
+     */
+    private String handler;
+
+    /**
+     * 特殊情况
+     */
+    private String exceptionalCase;
+
+    /**
+     * 违法时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lawDate;
+
+    /**
+     * 立案提交时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date registerSumbitDate;
+
+    /**
      * 船舶名称
      */
     private String shipNameCn;

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjTrackShipCompanyVo.java

@@ -57,6 +57,18 @@ public class BjTrackShipCompanyVo implements Serializable {
     private String dateSource;
 
     /**
+     * 列入开始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date addStartDate;
+
+    /**
+     * 列入结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date addEndDate;
+
+    /**
      * 列入日期
      */
     private String addDate;

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjAdministrativePunishMapper.xml

@@ -7,6 +7,12 @@
         <result property="administrativePunishId" column="administrative_punish_id"/>
         <result property="caseNo" column="case_no"/>
         <result property="punishReason" column="punish_reason"/>
+        <result property="lawFindDate" column="law_find_date"/>
+        <result property="punishPrice" column="punish_price"/>
+        <result property="handler" column="handler"/>
+        <result property="exceptionalCase" column="exceptional_case"/>
+        <result property="lawDate" column="law_date"/>
+        <result property="registerSumbitDate" column="register_sumbit_date"/>
         <result property="shipNameCn" column="ship_name_cn"/>
         <result property="shipType" column="ship_type"/>
         <result property="processType" column="process_type"/>
@@ -28,9 +34,15 @@
         <result property="breakReason" column="break_reason"/>
     </resultMap>
     <select id="queryAdministrativePunishList" resultMap="securityCheckVoList">
-        select administrative_punish_id
+        select administrative_punish_id,
                case_no,
                punish_reason,
+               law_find_date,
+               punish_price,
+               handler,
+               exceptional_case,
+               law_date,
+               register_sumbit_date,
                ship_name_cn,
                ship_type,
                process_type,

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjTrackShipCompanyMapper.xml

@@ -12,6 +12,8 @@
         <result property="status" column="status"/>
         <result property="dateSource" column="date_source"/>
         <result property="addDate" column="add_date"/>
+        <result property="addStartDate" column="add_start_date"/>
+        <result property="addEndDate" column="add_end_date"/>
         <result property="releaseDate" column="release_date"/>
         <result property="file" column="file"/>
         <result property="releaseFlag" column="release_flag"/>
@@ -31,6 +33,8 @@
                status,
                date_source,
                concat(date_format(add_start_date,'%Y-%m-%d'), '/', date_format(add_end_date,'%Y-%m-%d')) as add_date,
+               add_start_date,
+               add_end_date,
                release_date,
                file,
                release_flag,