不予通报、脱离接口

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjAdministrativePunishController.java

@@ -1,20 +1,21 @@
 package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.bo.BjAdministrativePunishBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.service.IBjAdministrativePunishService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 /**
  * 行政处罚查询
@@ -55,4 +56,15 @@ public class BjAdministrativePunishController extends BaseController {
         return success(bjAdministrativePunishService.queryById(caseNo));
     }
 
+    /**
+     * 不予通报
+     */
+    @Operation(summary = "不予通报")
+//    @RequiresPermissions("business:administrativePunish:edit")
+    @Log(title = "不予通报", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateReportFlag")
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+        return toAjax(bjAdministrativePunishService.updateFlag(bo));
+    }
+
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjBuildCheckController.java

@@ -1,20 +1,21 @@
 package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.bo.BjBuildCheckBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.service.IBjBuildCheckService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 /**
  * 建造检验监督查询
@@ -55,4 +56,15 @@ public class BjBuildCheckController extends BaseController {
         return success(bjBuildCheckService.queryById(buildCheckId));
     }
 
+    /**
+     * 不予通报
+     */
+    @Operation(summary = "不予通报")
+//    @RequiresPermissions("business:buildCheck:edit")
+    @Log(title = "不予通报", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateReportFlag")
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+        return toAjax(bjBuildCheckService.updateFlag(bo));
+    }
+
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjLocaleSecurityCheckController.java

@@ -1,20 +1,21 @@
 package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.bo.BjLocaleSecurityCheckBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.service.IBjLocaleSecurityCheckService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 /**
  * 现场安全监督检查查询
@@ -55,4 +56,15 @@ public class BjLocaleSecurityCheckController extends BaseController {
         return success(bjLocaleSecurityCheckService.queryById(localeSecurityCheckId));
     }
 
+    /**
+     * 不予通报
+     */
+    @Operation(summary = "不予通报")
+//    @RequiresPermissions("business:localeSecurityCheck:edit")
+    @Log(title = "不予通报", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateReportFlag")
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+        return toAjax(bjLocaleSecurityCheckService.updateFlag(bo));
+    }
+
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjPortReportController.java

@@ -1,20 +1,21 @@
 package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.bo.BjPortReportBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.service.IBjPortReportService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 /**
  * 进出口岸报告查询
@@ -55,4 +56,15 @@ public class BjPortReportController extends BaseController {
         return success(bjPortReportService.queryById(portReportId));
     }
 
+    /**
+     * 不予通报
+     */
+    @Operation(summary = "不予通报")
+//    @RequiresPermissions("business:portReport:edit")
+    @Log(title = "不予通报", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateReportFlag")
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+        return toAjax(bjPortReportService.updateFlag(bo));
+    }
+
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjSecurityCheckController.java

@@ -1,20 +1,21 @@
 package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.bo.BjSecurityCheckBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.service.IBjSecurityCheckService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 /**
  * 安全检查查询
@@ -55,4 +56,15 @@ public class BjSecurityCheckController extends BaseController {
         return success(bjSecurityCheckService.queryById(shipId));
     }
 
+    /**
+     * 不予通报
+     */
+    @Operation(summary = "不予通报")
+//    @RequiresPermissions("business:securityCheck:edit")
+    @Log(title = "不予通报", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateReportFlag")
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+        return toAjax(bjSecurityCheckService.updateFlag(bo));
+    }
+
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjServiceCheckController.java

@@ -1,20 +1,21 @@
 package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.bo.BjServiceCheckBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.service.IBjServiceCheckService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 /**
  * 营运检验监督查询
@@ -55,4 +56,15 @@ public class BjServiceCheckController extends BaseController {
         return success(bjServiceCheckService.queryById(serviceCheckId));
     }
 
+    /**
+     * 不予通报
+     */
+    @Operation(summary = "不予通报")
+//    @RequiresPermissions("business:serviceCheck:edit")
+    @Log(title = "不予通报", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateReportFlag")
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+        return toAjax(bjServiceCheckService.updateFlag(bo));
+    }
+
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjShipsRegistrationController.java

@@ -1,20 +1,21 @@
 package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.bo.BjShipsRegistrationBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.service.IBjShipsRegistrationService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 /**
  * 船舶登记查询
@@ -55,4 +56,15 @@ public class BjShipsRegistrationController extends BaseController {
         return success(bjShipsRegistrationService.queryById(shipId));
     }
 
+    /**
+     * 不予通报
+     */
+    @Operation(summary = "不予通报")
+//    @RequiresPermissions("business:shipsRegistration:edit")
+    @Log(title = "不予通报", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateReportFlag")
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+        return toAjax(bjShipsRegistrationService.updateFlag(bo));
+    }
+
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjTrackShipsController.java

@@ -1,20 +1,21 @@
 package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.bo.BjTrackShipsBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.service.IBjTrackShipsService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 /**
  * 重点跟踪船舶查询
@@ -55,4 +56,15 @@ public class BjTrackShipsController extends BaseController {
         return success(bjTrackShipsService.queryById(trackShipsId));
     }
 
+    /**
+     * 不予通报
+     */
+    @Operation(summary = "不予通报")
+//    @RequiresPermissions("business:trackShips:edit")
+    @Log(title = "不予通报", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateReportFlag")
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+        return toAjax(bjTrackShipsService.updateFlag(bo));
+    }
+
 }

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

@@ -100,6 +100,31 @@ public class BjAdministrativePunish extends BaseEntity {
     private String declareDate;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -115,6 +115,31 @@ public class BjBuildCheck extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -86,6 +86,31 @@ public class BjLocaleSecurityCheck extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -100,6 +100,31 @@ public class BjPortReport extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -114,6 +114,31 @@ public class BjSecurityCheck extends BaseEntity {
      */
     private Date builddate;
 
+    /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
 
     /**
      * 是否删除  0：未删除  1：已删除

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

@@ -95,6 +95,31 @@ public class BjServiceCheck extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -54,6 +54,31 @@ public class BjShipsRegistration extends BaseEntity {
     private String deletionReason;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -112,12 +112,6 @@ public class BjTrackShips extends BaseEntity {
     private String removeOrganization;
 
     /**
-     * 脱离时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date breakDate;
-
-    /**
      * 发布时间
      */
     private Date releaseDate;
@@ -128,6 +122,31 @@ public class BjTrackShips extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -95,6 +95,31 @@ public class BjAdministrativePunishBo extends BaseEntity {
     private String declareDate;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 开始时间搜索使用
      */
     private String startDecisionDate;

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

@@ -113,6 +113,31 @@ public class BjBuildCheckBo extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -83,6 +83,31 @@ public class BjLocaleSecurityCheckBo extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 开始时间搜索使用
      */
     private String startCheckDate;

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

@@ -99,6 +99,31 @@ public class BjPortReportBo extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -113,6 +113,31 @@ public class BjSecurityCheckBo extends BaseEntity {
     private Date builddate;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 开始时间搜索使用
      */
     private String startCheckDate;

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

@@ -95,6 +95,31 @@ public class BjServiceCheckBo extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -52,6 +52,31 @@ public class BjShipsRegistrationBo extends BaseEntity {
     private String deletionReason;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 开始时间搜索使用
      */
     private String startDeletionDate;

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

@@ -110,12 +110,6 @@ public class BjTrackShipsBo extends BaseEntity {
     private String removeOrganization;
 
     /**
-     * 脱离时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date breakDate;
-
-    /**
      * 发布时间
      */
     private Date releaseDate;
@@ -126,6 +120,31 @@ public class BjTrackShipsBo extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 开始时间搜索使用
      */
     private String startCheckDate;

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

@@ -98,4 +98,29 @@ public class BjAdministrativePunishVo implements Serializable {
      */
     private String declareDate;
 
+    /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
 }

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

@@ -113,4 +113,29 @@ public class BjBuildCheckVo implements Serializable {
      */
     private String releaseFlag;
 
+    /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
 }

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

@@ -79,6 +79,31 @@ public class BjLocaleSecurityCheckVo implements Serializable {
     private Date releaseDate;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否已发布  0：未发布 1：已发布
      */
     private String releaseFlag;

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

@@ -101,6 +101,31 @@ public class BjPortReportVo implements Serializable {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -1,5 +1,6 @@
 package com.ruoyi.business.domain.vo;
 
+import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,6 +14,7 @@ import java.util.List;
  * @date 2025-09-08
  */
 @Data
+@Builder
 public class BjReleasedMiddleVo implements Serializable {
 
 

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -19,6 +20,7 @@ import java.util.List;
  */
 @Schema(description = "我要发布视图对象")
 @Data
+@Builder
 public class BjReleasedVo extends BaseEntity implements Serializable {
 
 

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

@@ -113,4 +113,29 @@ public class BjSecurityCheckVo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date builddate;
 
+    /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
 }

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

@@ -95,4 +95,29 @@ public class BjServiceCheckVo implements Serializable {
      */
     private String releaseFlag;
 
+    /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
 }

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

@@ -49,4 +49,29 @@ public class BjShipsRegistrationVo implements Serializable {
      */
     private String deletionReason;
 
+    /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
 }

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

@@ -108,12 +108,6 @@ public class BjTrackShipsVo implements Serializable {
     private String removeOrganization;
 
     /**
-     * 脱离时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date breakDate;
-
-    /**
      * 发布时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -124,4 +118,29 @@ public class BjTrackShipsVo implements Serializable {
      */
     private String releaseFlag;
 
+    /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjAdministrativePunishService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.bo.BjAdministrativePunishBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjAdministrativePunishVo;
 
 import java.util.List;
@@ -28,4 +30,8 @@ public interface IBjAdministrativePunishService {
      * @return 行政处罚信息查询分页列表
      */
     List<BjAdministrativePunishVo> queryPageList(BjAdministrativePunishBo bo);
+
+    Boolean updateFlag(ReportFlagBo bo);
+
+    Boolean updateBreak(BreakBo bo);
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjBuildCheckService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.bo.BjBuildCheckBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjBuildCheckVo;
 
 import java.util.List;
@@ -28,4 +30,8 @@ public interface IBjBuildCheckService {
      * @return 建造检验监督信息查询分页列表
      */
     List<BjBuildCheckVo> queryPageList(BjBuildCheckBo bo);
+
+    Boolean updateFlag(ReportFlagBo bo);
+
+    Boolean updateBreak(BreakBo bo);
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjLocaleSecurityCheckService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.bo.BjLocaleSecurityCheckBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjLocaleSecurityCheckVo;
 
 import java.util.List;
@@ -28,4 +30,8 @@ public interface IBjLocaleSecurityCheckService {
      * @return 现场安全监督检查信息查询分页列表
      */
     List<BjLocaleSecurityCheckVo> queryPageList(BjLocaleSecurityCheckBo bo);
+
+    Boolean updateFlag(ReportFlagBo bo);
+
+    Boolean updateBreak(BreakBo bo);
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjPortReportService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.bo.BjPortReportBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjPortReportVo;
 
 import java.util.List;
@@ -28,4 +30,8 @@ public interface IBjPortReportService {
      * @return 进出口岸报告信息查询分页列表
      */
     List<BjPortReportVo> queryPageList(BjPortReportBo bo);
+
+    Boolean updateFlag(ReportFlagBo bo);
+
+    Boolean updateBreak(BreakBo bo);
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjSecurityCheckService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.bo.BjSecurityCheckBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjSecurityCheckVo;
 
 import java.util.List;
@@ -28,4 +30,8 @@ public interface IBjSecurityCheckService {
      * @return 安全检查信息查询分页列表
      */
     List<BjSecurityCheckVo> queryPageList(BjSecurityCheckBo bo);
+
+    Boolean updateFlag(ReportFlagBo bo);
+
+    Boolean updateBreak(BreakBo bo);
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjServiceCheckService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.bo.BjServiceCheckBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjServiceCheckVo;
 
 import java.util.List;
@@ -28,4 +30,8 @@ public interface IBjServiceCheckService {
      * @return 营运检验监督信息查询分页列表
      */
     List<BjServiceCheckVo> queryPageList(BjServiceCheckBo bo);
+
+    Boolean updateFlag(ReportFlagBo bo);
+
+    Boolean updateBreak(BreakBo bo);
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjShipsRegistrationService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.bo.BjShipsRegistrationBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjShipsRegistrationVo;
 
 import java.util.List;
@@ -28,4 +30,8 @@ public interface IBjShipsRegistrationService {
      * @return 船舶登记信息查询分页列表
      */
     List<BjShipsRegistrationVo> queryPageList(BjShipsRegistrationBo bo);
+
+    Boolean updateFlag(ReportFlagBo bo);
+
+    Boolean updateBreak(BreakBo bo);
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjTrackShipsService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.bo.BjTrackShipsBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjTrackShipsVo;
 
 import java.util.List;
@@ -28,4 +30,8 @@ public interface IBjTrackShipsService {
      * @return 重点跟踪船舶信息查询分页列表
      */
     List<BjTrackShipsVo> queryPageList(BjTrackShipsBo bo);
+
+    Boolean updateFlag(ReportFlagBo bo);
+
+    Boolean updateBreak(BreakBo bo);
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjAdministrativePunishServiceImpl.java

@@ -2,7 +2,10 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjAdministrativePunish;
+import com.ruoyi.business.domain.BjAdministrativePunish;
 import com.ruoyi.business.domain.bo.BjAdministrativePunishBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjAdministrativePunishVo;
 import com.ruoyi.business.mapper.BjAdministrativePunishMapper;
 import com.ruoyi.business.service.IBjAdministrativePunishService;
@@ -49,4 +52,22 @@ public class BjAdministrativePunishServiceImpl implements IBjAdministrativePunis
     public List<BjAdministrativePunishVo> queryPageList(BjAdministrativePunishBo bo) {
         return baseMapper.queryAdministrativePunishList(bo);
     }
+
+    @Override
+    public Boolean updateFlag(ReportFlagBo bo) {
+        BjAdministrativePunish administrativePunish = baseMapper.selectById(bo.getId());
+        administrativePunish.setReportFlag("1");
+        administrativePunish.setReportReason(bo.getReportReason());
+        administrativePunish.setReportFile(bo.getReportFile());
+        return baseMapper.updateById(administrativePunish) > 0;
+    }
+
+    @Override
+    public Boolean updateBreak(BreakBo bo) {
+        BjAdministrativePunish administrativePunish = baseMapper.selectById(bo.getId());
+        String[] breakDate = bo.getBreakDate();
+        administrativePunish.setBreakDate(breakDate[0].split(" ")[0].concat("/").concat(breakDate[1].split(" ")[0]));
+        administrativePunish.setBreakReason(bo.getBreakReason());
+        return baseMapper.updateById(administrativePunish) > 0;
+    }
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjBuildCheckServiceImpl.java

@@ -2,7 +2,10 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjBuildCheck;
+import com.ruoyi.business.domain.BjBuildCheck;
 import com.ruoyi.business.domain.bo.BjBuildCheckBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjBuildCheckVo;
 import com.ruoyi.business.mapper.BjBuildCheckMapper;
 import com.ruoyi.business.service.IBjBuildCheckService;
@@ -49,4 +52,22 @@ public class BjBuildCheckServiceImpl implements IBjBuildCheckService {
     public List<BjBuildCheckVo> queryPageList(BjBuildCheckBo bo) {
         return baseMapper.queryBuildCheckList(bo);
     }
+
+    @Override
+    public Boolean updateFlag(ReportFlagBo bo) {
+        BjBuildCheck bjBuildCheck = baseMapper.selectById(bo.getId());
+        bjBuildCheck.setReportFlag("1");
+        bjBuildCheck.setReportReason(bo.getReportReason());
+        bjBuildCheck.setReportFile(bo.getReportFile());
+        return baseMapper.updateById(bjBuildCheck) > 0;
+    }
+
+    @Override
+    public Boolean updateBreak(BreakBo bo) {
+        BjBuildCheck bjBuildCheck = baseMapper.selectById(bo.getId());
+        String[] breakDate = bo.getBreakDate();
+        bjBuildCheck.setBreakDate(breakDate[0].split(" ")[0].concat("/").concat(breakDate[1].split(" ")[0]));
+        bjBuildCheck.setBreakReason(bo.getBreakReason());
+        return baseMapper.updateById(bjBuildCheck) > 0;
+    }
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjLocaleSecurityCheckServiceImpl.java

@@ -2,7 +2,10 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjLocaleSecurityCheck;
+import com.ruoyi.business.domain.BjLocaleSecurityCheck;
 import com.ruoyi.business.domain.bo.BjLocaleSecurityCheckBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjLocaleSecurityCheckVo;
 import com.ruoyi.business.mapper.BjLocaleSecurityCheckMapper;
 import com.ruoyi.business.service.IBjLocaleSecurityCheckService;
@@ -49,4 +52,22 @@ public class BjLocaleSecurityCheckServiceImpl implements IBjLocaleSecurityCheckS
     public List<BjLocaleSecurityCheckVo> queryPageList(BjLocaleSecurityCheckBo bo) {
         return baseMapper.queryLocalSecurityCheckList(bo);
     }
+
+    @Override
+    public Boolean updateFlag(ReportFlagBo bo) {
+        BjLocaleSecurityCheck localeSecurityCheck = baseMapper.selectById(bo.getId());
+        localeSecurityCheck.setReportFlag("1");
+        localeSecurityCheck.setReportReason(bo.getReportReason());
+        localeSecurityCheck.setReportFile(bo.getReportFile());
+        return baseMapper.updateById(localeSecurityCheck) > 0;
+    }
+
+    @Override
+    public Boolean updateBreak(BreakBo bo) {
+        BjLocaleSecurityCheck localeSecurityCheck = baseMapper.selectById(bo.getId());
+        String[] breakDate = bo.getBreakDate();
+        localeSecurityCheck.setBreakDate(breakDate[0].split(" ")[0].concat("/").concat(breakDate[1].split(" ")[0]));
+        localeSecurityCheck.setBreakReason(bo.getBreakReason());
+        return baseMapper.updateById(localeSecurityCheck) > 0;
+    }
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjPortReportServiceImpl.java

@@ -2,7 +2,10 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjPortReport;
+import com.ruoyi.business.domain.BjPortReport;
 import com.ruoyi.business.domain.bo.BjPortReportBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjPortReportVo;
 import com.ruoyi.business.mapper.BjPortReportMapper;
 import com.ruoyi.business.service.IBjPortReportService;
@@ -49,4 +52,22 @@ public class BjPortReportServiceImpl implements IBjPortReportService {
     public List<BjPortReportVo> queryPageList(BjPortReportBo bo) {
         return baseMapper.queryPortReportList(bo);
     }
+
+    @Override
+    public Boolean updateFlag(ReportFlagBo bo) {
+        BjPortReport portReport = baseMapper.selectById(bo.getId());
+        portReport.setReportFlag("1");
+        portReport.setReportReason(bo.getReportReason());
+        portReport.setReportFile(bo.getReportFile());
+        return baseMapper.updateById(portReport) > 0;
+    }
+
+    @Override
+    public Boolean updateBreak(BreakBo bo) {
+        BjPortReport portReport = baseMapper.selectById(bo.getId());
+        String[] breakDate = bo.getBreakDate();
+        portReport.setBreakDate(breakDate[0].split(" ")[0].concat("/").concat(breakDate[1].split(" ")[0]));
+        portReport.setBreakReason(bo.getBreakReason());
+        return baseMapper.updateById(portReport) > 0;
+    }
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjSecurityCheckServiceImpl.java

@@ -2,7 +2,10 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjSecurityCheck;
+import com.ruoyi.business.domain.BjSecurityCheck;
 import com.ruoyi.business.domain.bo.BjSecurityCheckBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjSecurityCheckVo;
 import com.ruoyi.business.mapper.BjSecurityCheckMapper;
 import com.ruoyi.business.service.IBjSecurityCheckService;
@@ -49,4 +52,22 @@ public class BjSecurityCheckServiceImpl implements IBjSecurityCheckService {
     public List<BjSecurityCheckVo> queryPageList(BjSecurityCheckBo bo) {
         return baseMapper.querySecurityCheckList(bo);
     }
+
+    @Override
+    public Boolean updateFlag(ReportFlagBo bo) {
+        BjSecurityCheck securityCheck = baseMapper.selectById(bo.getId());
+        securityCheck.setReportFlag("1");
+        securityCheck.setReportReason(bo.getReportReason());
+        securityCheck.setReportFile(bo.getReportFile());
+        return baseMapper.updateById(securityCheck) > 0;
+    }
+
+    @Override
+    public Boolean updateBreak(BreakBo bo) {
+        BjSecurityCheck securityCheck = baseMapper.selectById(bo.getId());
+        String[] breakDate = bo.getBreakDate();
+        securityCheck.setBreakDate(breakDate[0].split(" ")[0].concat("/").concat(breakDate[1].split(" ")[0]));
+        securityCheck.setBreakReason(bo.getBreakReason());
+        return baseMapper.updateById(securityCheck) > 0;
+    }
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjServiceCheckServiceImpl.java

@@ -2,7 +2,10 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjServiceCheck;
+import com.ruoyi.business.domain.BjServiceCheck;
 import com.ruoyi.business.domain.bo.BjServiceCheckBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjServiceCheckVo;
 import com.ruoyi.business.mapper.BjServiceCheckMapper;
 import com.ruoyi.business.service.IBjServiceCheckService;
@@ -49,4 +52,22 @@ public class BjServiceCheckServiceImpl implements IBjServiceCheckService {
     public List<BjServiceCheckVo> queryPageList(BjServiceCheckBo bo) {
         return baseMapper.queryServiceCheckList(bo);
     }
+
+    @Override
+    public Boolean updateFlag(ReportFlagBo bo) {
+        BjServiceCheck serviceCheck = baseMapper.selectById(bo.getId());
+        serviceCheck.setReportFlag("1");
+        serviceCheck.setReportReason(bo.getReportReason());
+        serviceCheck.setReportFile(bo.getReportFile());
+        return baseMapper.updateById(serviceCheck) > 0;
+    }
+
+    @Override
+    public Boolean updateBreak(BreakBo bo) {
+        BjServiceCheck serviceCheck = baseMapper.selectById(bo.getId());
+        String[] breakDate = bo.getBreakDate();
+        serviceCheck.setBreakDate(breakDate[0].split(" ")[0].concat("/").concat(breakDate[1].split(" ")[0]));
+        serviceCheck.setBreakReason(bo.getBreakReason());
+        return baseMapper.updateById(serviceCheck) > 0;
+    }
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjShipsRegistrationServiceImpl.java

@@ -2,7 +2,10 @@ package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjShipsRegistration;
+import com.ruoyi.business.domain.BjShipsRegistration;
 import com.ruoyi.business.domain.bo.BjShipsRegistrationBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjShipsRegistrationVo;
 import com.ruoyi.business.mapper.BjShipsRegistrationMapper;
 import com.ruoyi.business.service.IBjShipsRegistrationService;
@@ -49,4 +52,22 @@ public class BjShipsRegistrationServiceImpl implements IBjShipsRegistrationServi
     public List<BjShipsRegistrationVo> queryPageList(BjShipsRegistrationBo bo) {
         return baseMapper.queryShipsRegistrationList(bo);
     }
+
+    @Override
+    public Boolean updateFlag(ReportFlagBo bo) {
+        BjShipsRegistration shipsRegistration = baseMapper.selectById(bo.getId());
+        shipsRegistration.setReportFlag("1");
+        shipsRegistration.setReportReason(bo.getReportReason());
+        shipsRegistration.setReportFile(bo.getReportFile());
+        return baseMapper.updateById(shipsRegistration) > 0;
+    }
+
+    @Override
+    public Boolean updateBreak(BreakBo bo) {
+        BjShipsRegistration shipsRegistration = baseMapper.selectById(bo.getId());
+        String[] breakDate = bo.getBreakDate();
+        shipsRegistration.setBreakDate(breakDate[0].split(" ")[0].concat("/").concat(breakDate[1].split(" ")[0]));
+        shipsRegistration.setBreakReason(bo.getBreakReason());
+        return baseMapper.updateById(shipsRegistration) > 0;
+    }
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjTrackShipsServiceImpl.java

@@ -3,6 +3,8 @@ package com.ruoyi.business.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.business.domain.BjTrackShips;
 import com.ruoyi.business.domain.bo.BjTrackShipsBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjTrackShipsVo;
 import com.ruoyi.business.mapper.BjTrackShipsMapper;
 import com.ruoyi.business.service.IBjTrackShipsService;
@@ -49,4 +51,22 @@ public class BjTrackShipsServiceImpl implements IBjTrackShipsService {
     public List<BjTrackShipsVo> queryPageList(BjTrackShipsBo bo) {
         return baseMapper.queryTrackShipsList(bo);
     }
+
+    @Override
+    public Boolean updateFlag(ReportFlagBo bo) {
+        BjTrackShips trackShips = baseMapper.selectById(bo.getId());
+        trackShips.setReportFlag("1");
+        trackShips.setReportReason(bo.getReportReason());
+        trackShips.setReportFile(bo.getReportFile());
+        return baseMapper.updateById(trackShips) > 0;
+    }
+
+    @Override
+    public Boolean updateBreak(BreakBo bo) {
+        BjTrackShips trackShips = baseMapper.selectById(bo.getId());
+        String[] breakDate = bo.getBreakDate();
+        trackShips.setBreakDate(breakDate[0].split(" ")[0].concat("/").concat(breakDate[1].split(" ")[0]));
+        trackShips.setBreakReason(bo.getBreakReason());
+        return baseMapper.updateById(trackShips) > 0;
+    }
 }

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

@@ -19,6 +19,11 @@
         <result property="registerDate" column="register_date"/>
         <result property="punishAmount" column="punish_amount"/>
         <result property="declareDate" column="declare_date"/>
+        <result property="reportFlag" column="report_flag"/>
+        <result property="reportReason" column="report_reason"/>
+        <result property="reportFile" column="report_file"/>
+        <result property="breakDate" column="break_date"/>
+        <result property="breakReason" column="break_reason"/>
     </resultMap>
     <select id="queryAdministrativePunishList" resultMap="securityCheckVoList">
         select case_no,
@@ -35,7 +40,12 @@
                case_status,
                register_date,
                punish_amount,
-               declare_date
+               declare_date,
+               report_flag,
+               report_reason,
+               report_file,
+               break_date,
+               break_reason
         from bj_administrative_punish
         where del_flag = '0'
         <if test="bo.caseNo != null and bo.caseNo != ''">

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

@@ -22,6 +22,11 @@
         <result property="defect" column="defect"/>
         <result property="releaseDate" column="release_date"/>
         <result property="releaseFlag" column="release_flag"/>
+        <result property="reportFlag" column="report_flag"/>
+        <result property="reportReason" column="report_reason"/>
+        <result property="reportFile" column="report_file"/>
+        <result property="breakDate" column="break_date"/>
+        <result property="breakReason" column="break_reason"/>
     </resultMap>
     <select id="queryBuildCheckList" resultMap="buildCheckVoList">
         select build_check_id,
@@ -41,7 +46,12 @@
                check_result,
                defect,
                release_date,
-               release_flag
+               release_flag,
+               report_flag,
+               report_reason,
+               report_file,
+               break_date,
+               break_reason
         from bj_build_check
         where del_flag = '0'
         <if test="bo.shipyard != null and bo.shipyard != ''">

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

@@ -16,6 +16,11 @@
         <result property="priority" column="priority"/>
         <result property="releaseDate" column="release_date"/>
         <result property="releaseFlag" column="release_flag"/>
+        <result property="reportFlag" column="report_flag"/>
+        <result property="reportReason" column="report_reason"/>
+        <result property="reportFile" column="report_file"/>
+        <result property="breakDate" column="break_date"/>
+        <result property="breakReason" column="break_reason"/>
     </resultMap>
     <select id="queryLocalSecurityCheckList" resultMap="localeSecurityCheckVoList">
         select locale_security_check_id,
@@ -29,7 +34,12 @@
                risk,
                priority,
                release_date,
-               release_flag
+               release_flag,
+               report_flag,
+               report_reason,
+               report_file,
+               break_date,
+               break_reason
         from bj_locale_security_check
         where del_flag = '0'
         <if test="bo.shipId != null and bo.shipId != ''">

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

@@ -19,6 +19,11 @@
         <result property="declareDate" column="declare_date"/>
         <result property="releaseDate" column="release_date"/>
         <result property="releaseFlag" column="release_flag"/>
+        <result property="reportFlag" column="report_flag"/>
+        <result property="reportReason" column="report_reason"/>
+        <result property="reportFile" column="report_file"/>
+        <result property="breakDate" column="break_date"/>
+        <result property="breakReason" column="break_reason"/>
     </resultMap>
     <select id="queryPortReportList" resultMap="portReportVoList">
         select port_report_id,
@@ -35,7 +40,12 @@
                next_harbor,
                declare_date,
                release_date,
-               release_flag
+               release_flag,
+               report_flag,
+               report_reason,
+               report_file,
+               break_date,
+               break_reason
         from bj_port_report
         where del_flag = '0'
         <if test="bo.shipImo != null and bo.shipImo != ''">

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

@@ -22,6 +22,11 @@
         <result property="shipImo" column="ship_imo"/>
         <result property="datasource" column="datasource"/>
         <result property="builddate" column="builddate"/>
+        <result property="reportFlag" column="report_flag"/>
+        <result property="reportReason" column="report_reason"/>
+        <result property="reportFile" column="report_file"/>
+        <result property="breakDate" column="break_date"/>
+        <result property="breakReason" column="break_reason"/>
     </resultMap>
     <select id="querySecurityCheckList" resultMap="securityCheckVoList">
         select ship_id,
@@ -42,6 +47,11 @@
                ship_imo,
                datasource,
                builddate,
+               report_flag,
+               report_reason,
+               report_file,
+               break_date,
+               break_reason,
                create_time
         from bj_security_check
         where del_flag = '0'

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

@@ -18,6 +18,11 @@
         <result property="defect" column="defect"/>
         <result property="releaseDate" column="release_date"/>
         <result property="releaseFlag" column="release_flag"/>
+        <result property="reportFlag" column="report_flag"/>
+        <result property="reportReason" column="report_reason"/>
+        <result property="reportFile" column="report_file"/>
+        <result property="breakDate" column="break_date"/>
+        <result property="breakReason" column="break_reason"/>
     </resultMap>
     <select id="queryServiceCheckList" resultMap="serviceCheckVoList">
         select service_check_id,
@@ -33,7 +38,12 @@
                check_result,
                defect,
                release_date,
-               release_flag
+               release_flag,
+               report_flag,
+               report_reason,
+               report_file,
+               break_date,
+               break_reason
         from bj_service_check
         where del_flag = '0'
         <if test="bo.shipId != null and bo.shipId != ''">

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

@@ -10,6 +10,11 @@
         <result property="shipFirstregNo" column="ship_firstreg_no"/>
         <result property="shipOwner" column="ship_owner"/>
         <result property="deletionReason" column="deletionReason"/>
+        <result property="reportFlag" column="report_flag"/>
+        <result property="reportReason" column="report_reason"/>
+        <result property="reportFile" column="report_file"/>
+        <result property="breakDate" column="break_date"/>
+        <result property="breakReason" column="break_reason"/>
     </resultMap>
     <select id="queryShipsRegistrationList" resultMap="shipsRegistrationVoList">
         select ship_id,
@@ -17,7 +22,12 @@
                ship_name_en,
                ship_firstreg_no,
                ship_owner,
-               deletion_reason
+               deletion_reason,
+               report_flag,
+               report_reason,
+               report_file,
+               break_date,
+               break_reason
         from bj_ships_registration
         where del_flag = '0'
         <if test="bo.shipId != null and bo.shipId != ''">

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

@@ -21,9 +21,13 @@
         <result property="traceReason" column="trace_reason"/>
         <result property="traceDate" column="trace_date"/>
         <result property="removeOrganization" column="remove_organization"/>
-        <result property="breakDate" column="break_date"/>
         <result property="releaseDate" column="release_date"/>
         <result property="releaseFlag" column="release_flag"/>
+        <result property="reportFlag" column="report_flag"/>
+        <result property="reportReason" column="report_reason"/>
+        <result property="reportFile" column="report_file"/>
+        <result property="breakDate" column="break_date"/>
+        <result property="breakReason" column="break_reason"/>
     </resultMap>
     <select id="queryTrackShipsList" resultMap="trackShipsVoList">
         select track_ships_id,
@@ -45,7 +49,12 @@
                remove_organization,
                break_date,
                release_date,
-               release_flag
+               release_flag,
+               report_flag,
+               report_reason,
+               report_file,
+               break_date,
+               break_reason
         from bj_track_ships
         where del_flag = '0'
         <if test="bo.shipNameCn != null and bo.shipNameCn != ''">