上级领导查阅、通报信息查询、历史数据查看、通报信息代办、流程

ruoyi-modules/ruoyi-business/src/main/java/org/dromara/business/controller/BjHistoricalDataController.java

@@ -0,0 +1,60 @@
+package org.dromara.business.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.business.domain.bo.BjReleasedBo;
+import org.dromara.business.domain.vo.BjReleasedVo;
+import org.dromara.business.service.IBjReleasedService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+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;
+
+/**
+ * 历史数据查看
+ * 前端访问路由地址为:/business/released
+ *
+ * @author LionLi
+ * @date 2025-09-08
+ */
+@Tag(name = "历史数据查看")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/historicalData")
+public class BjHistoricalDataController extends BaseController {
+
+    private final IBjReleasedService bjReleasedService;
+
+    /**
+     * 查询历史数据查看列表
+     */
+    @Operation(summary = "查询我要发布列表")
+    @SaCheckPermission("business:historicalData:list")
+    @GetMapping("/list")
+    public TableDataInfo<BjReleasedVo> list(BjReleasedBo bo, PageQuery pageQuery) {
+        return bjReleasedService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取历史数据查看详细信息
+     *
+     * @param releasedId 主键
+     */
+    @Operation(summary = "获取我要发布详细信息")
+    @SaCheckPermission("business:historicalData:query")
+    @GetMapping("/{releasedId}")
+    public R<BjReleasedVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("releasedId") String releasedId) {
+        return R.ok(bjReleasedService.queryById(releasedId));
+    }
+
+}

ruoyi-modules/ruoyi-business/src/main/java/org/dromara/business/controller/BjNotificationInformationController.java

@@ -0,0 +1,60 @@
+package org.dromara.business.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.business.domain.bo.BjReleasedBo;
+import org.dromara.business.domain.vo.BjReleasedVo;
+import org.dromara.business.service.IBjReleasedService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+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;
+
+/**
+ * 通报信息查询
+ * 前端访问路由地址为:/business/released
+ *
+ * @author LionLi
+ * @date 2025-09-08
+ */
+@Tag(name = "通报信息查询")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/notificationInformation")
+public class BjNotificationInformationController extends BaseController {
+
+    private final IBjReleasedService bjReleasedService;
+
+    /**
+     * 通报信息查询列表
+     */
+    @Operation(summary = "查询我要发布列表")
+    @SaCheckPermission("business:notificationInformation:list")
+    @GetMapping("/list")
+    public TableDataInfo<BjReleasedVo> list(BjReleasedBo bo, PageQuery pageQuery) {
+        return bjReleasedService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取通报信息查询详细信息
+     *
+     * @param releasedId 主键
+     */
+    @Operation(summary = "获取我要发布详细信息")
+    @SaCheckPermission("business:notificationInformation:query")
+    @GetMapping("/{releasedId}")
+    public R<BjReleasedVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("releasedId") String releasedId) {
+        return R.ok(bjReleasedService.queryById(releasedId));
+    }
+
+}

ruoyi-modules/ruoyi-business/src/main/java/org/dromara/business/controller/BjSuperiorLeaderController.java

@@ -0,0 +1,67 @@
+package org.dromara.business.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.business.domain.bo.BjReleasedBo;
+import org.dromara.business.domain.vo.BjReleasedVo;
+import org.dromara.business.service.IBjReleasedService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 上级领导查阅
+ * 前端访问路由地址为:/business/released
+ *
+ * @author LionLi
+ * @date 2025-09-08
+ */
+@Tag(name = "上级领导查阅")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/superiorLeader")
+public class BjSuperiorLeaderController extends BaseController {
+
+    private final IBjReleasedService bjReleasedService;
+
+    /**
+     * 查询上级领导查阅列表
+     */
+    @Operation(summary = "查询我要发布列表")
+    @SaCheckPermission("business:superiorLeader:list")
+    @GetMapping("/list")
+    public TableDataInfo<BjReleasedVo> list(BjReleasedBo bo, PageQuery pageQuery) {
+        return bjReleasedService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取上级领导查阅详细信息
+     *
+     * @param releasedId 主键
+     */
+    @Operation(summary = "获取我要发布详细信息")
+    @SaCheckPermission("business:superiorLeader:query")
+    @GetMapping("/{releasedId}")
+    public R<BjReleasedVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("releasedId") String releasedId) {
+        return R.ok(bjReleasedService.queryById(releasedId));
+    }
+
+}

ruoyi-modules/ruoyi-business/src/main/java/org/dromara/business/controller/BjToDoController.java

@@ -0,0 +1,74 @@
+package org.dromara.business.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.business.domain.bo.BjLonmMiddleLogBo;
+import org.dromara.business.domain.bo.BjReleasedBo;
+import org.dromara.business.domain.vo.BjMyAADVo;
+import org.dromara.business.service.IBjReleasedService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 通报信息代办
+ * 前端访问路由地址为:/business/toDo
+ *
+ * @author LionLi
+ * @date 2025-09-09
+ */
+@Tag(name = "通报信息代办")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/toDo")
+public class BjToDoController extends BaseController {
+
+    private final IBjReleasedService bjReleasedService;
+
+    /**
+     * 通报信息代办列表
+     */
+    @Operation(summary = "我的接收处置列表")
+    @SaCheckPermission("business:toDo:list")
+    @GetMapping("/list")
+    public TableDataInfo<BjMyAADVo> list(BjReleasedBo bo, PageQuery pageQuery) {
+        return bjReleasedService.myAADList(bo, pageQuery);
+    }
+
+
+    /**
+     * 获取通报事项清单详细信息
+     *
+     * @param notifiedMattersId 主键
+     */
+    @Operation(summary = "获取通报事项清单详细信息")
+    @SaCheckPermission("business:toDo:query")
+    @GetMapping("/{notifiedMattersId}")
+    public R<BjMyAADVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("notifiedMattersId") String notifiedMattersId) {
+        return R.ok(bjReleasedService.querymyAADById(notifiedMattersId));
+    }
+
+
+
+
+    /**
+     * 更新通报事项清单操作记录及整体状态
+     *
+     * @param bo 通报事项清单操作记录明细
+     */
+    @Operation(summary = "获取通报事项清单详细信息")
+    @SaCheckPermission("business:toDo:edit")
+    @PostMapping("/toDoUpdate")
+    public R<Void> editMyAAD(@RequestBody BjLonmMiddleLogBo bo) {
+        return toAjax(bjReleasedService.editMyAAD(bo));
+    }
+
+}

ruoyi-modules/ruoyi-business/src/main/java/org/dromara/business/domain/vo/BjMyAADVo.java

@@ -28,17 +28,15 @@ public class BjMyAADVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+
+
+
     /**
      * 通报事项清单id
      */
     @Schema(description = "通报事项清单id")
     private String notifiedMattersId;
 
-    /**
-     * 通报事项类别，字典
-     */
-    @Schema(description = "通报事项类别，字典")
-    private String conm;
 
     /**
      * 违法事件编号
@@ -47,6 +45,7 @@ public class BjMyAADVo implements Serializable {
     @ExcelProperty(value = "违法事件编号")
     private String violationNumber;
 
+
     /**
      * 发布单位，组织架构
      */
@@ -54,12 +53,6 @@ public class BjMyAADVo implements Serializable {
     @ExcelProperty(value = "发布单位，组织架构")
     private String releasedUnit;
 
-    /**
-     * 发布日期
-     */
-    @Schema(description = "发布日期")
-    @ExcelProperty(value = "发布日期")
-    private Date releasedDate;
 
     /**
      * 中文船名
@@ -69,6 +62,36 @@ public class BjMyAADVo implements Serializable {
     private String chineseVesselName;
 
     /**
+     * 通报事项类别，字典
+     */
+    @Schema(description = "通报事项类别，字典")
+    private String conm;
+
+
+    /**
+     * 通报事项
+     */
+    @Schema(description = "通报事项")
+    private String notificationMatters;
+
+
+    /**
+     * 接收单位
+     */
+    @Schema(description = "接收单位")
+    private String receivingUnit;
+
+
+    /**
+     * 发布日期
+     */
+    @Schema(description = "发布日期")
+    @ExcelProperty(value = "发布日期")
+    private Date releasedDate;
+
+
+
+    /**
      * 英文船名
      */
     @Schema(description = "英文船名")
@@ -117,17 +140,9 @@ public class BjMyAADVo implements Serializable {
     @Schema(description = "通报事项类别")
     private String notificationMattersType;
 
-    /**
-     * 通报事项
-     */
-    @Schema(description = "通报事项")
-    private String notificationMatters;
 
-    /**
-     * 接收单位
-     */
-    @Schema(description = "接收单位")
-    private String receivingUnit;
+
+
 
     /**
      * MMSI
@@ -285,4 +300,48 @@ public class BjMyAADVo implements Serializable {
     @ExcelProperty(value = "是否需要反馈")
     private String wfir;
 
+    /**
+     * 发布单位名称中文
+     */
+    private String releasedName;
+
+    /**
+     * 接收单位名称中文
+     */
+    private String receivingName;
+
+    /**
+     * 联系人电话
+     */
+    private String namePhone;
+
+    /**
+     * 通报状态中文
+     */
+    private String notificationStatusStr;
+
+    /**
+     * 超期状态中文
+     */
+    private String overdueStatusStr;
+
+    /**
+     * 通报整体状态中文
+     */
+    private String nosStr;
+
+    /**
+     * 采取措施中文
+     */
+    private String takeMeasuresStr;
+
+    /**
+     * 受理日期
+     */
+    private Date acceptanceDate;
+
+    /**
+     * 发布人员
+     */
+    private String publishers;
 }

ruoyi-modules/ruoyi-business/src/main/java/org/dromara/business/service/impl/BjReleasedServiceImpl.java

@@ -8,10 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.business.domain.BjLonmMiddle;
-import org.dromara.business.domain.BjLonmMiddleLog;
-import org.dromara.business.domain.BjReleased;
-import org.dromara.business.domain.BjReleasedMiddle;
+import org.dromara.business.domain.*;
 import org.dromara.business.domain.bo.BjLonmMiddleLogBo;
 import org.dromara.business.domain.bo.BjReleasedBo;
 import org.dromara.business.domain.bo.BjReleasedMiddleBo;
@@ -19,10 +16,7 @@ import org.dromara.business.domain.vo.BjLonmMiddleVo;
 import org.dromara.business.domain.vo.BjMyAADVo;
 import org.dromara.business.domain.vo.BjReleasedMiddleVo;
 import org.dromara.business.domain.vo.BjReleasedVo;
-import org.dromara.business.mapper.BjLonmMiddleLogMapper;
-import org.dromara.business.mapper.BjLonmMiddleMapper;
-import org.dromara.business.mapper.BjReleasedMapper;
-import org.dromara.business.mapper.BjReleasedMiddleMapper;
+import org.dromara.business.mapper.*;
 import org.dromara.business.service.IBjReleasedService;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -56,6 +50,8 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
 
     private final BjLonmMiddleLogMapper logMapper;
 
+    private final BjNtloMapper ntloMapper;
+
     /**
      * 查询我要发布
      *
@@ -225,9 +221,9 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
      */
     private void validEntityBeforeSave(BjReleased entity, BjReleasedBo bo) {
         //TODO 做一些数据校验,如唯一约束
-        if (StringUtils.isNotEmpty(bo.getReleasedId())){
+        if (StringUtils.isNotEmpty(bo.getReleasedId())) {
             BjReleased released = baseMapper.selectById(bo.getReleasedId());
-            if (released != null && "2".equals(released.getReleasedStatus())){
+            if (released != null && "2".equals(released.getReleasedStatus())) {
                 throw new RuntimeException("通报已发布，不可编辑！");
             }
         }
@@ -276,8 +272,8 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
         BjLonmMiddleLog bjLonmMiddleLog = BeanUtil.copyProperties(bo, BjLonmMiddleLog.class);
         String notifiedMattersId = bjLonmMiddleLog.getNotifiedMattersId();
         LambdaQueryWrapper<BjLonmMiddleLog> bjLogWpr = new LambdaQueryWrapper<>();
-        bjLogWpr.eq(BjLonmMiddleLog::getNotifiedMattersId,notifiedMattersId);
-        bjLogWpr.eq(BjLonmMiddleLog::getReceivingUnit,LoginHelper.getDeptIdStr());
+        bjLogWpr.eq(BjLonmMiddleLog::getNotifiedMattersId, notifiedMattersId);
+        bjLogWpr.eq(BjLonmMiddleLog::getReceivingUnit, LoginHelper.getDeptIdStr());
         List<BjLonmMiddleLog> bjLonmMiddleLogs = logMapper.selectList(bjLogWpr);
         BjLonmMiddleLog log1 = bjLonmMiddleLogs.get(0);
         bjLonmMiddleLog.setReceivingUnit(log1.getReceivingUnit());
@@ -285,112 +281,176 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
 
         BjReleasedMiddleVo bjReleasedMiddleVo = middleMapper.selectVoById(notifiedMattersId);
         String releasedId = bjReleasedMiddleVo.getReleasedId();
-        switch (bjReleasedMiddleVo.getWfir()) {
-            case "1":
-                if ("2".equals(bjLonmMiddleLog.getOperationRecord())){
-                    bjLonmMiddleLog.setOperationTime(DateUtil.date());
-                    bjLonmMiddleLog.setNotificationLink("2");
-                    bjLonmMiddleLog.setPar(log1.getPar());
-                    bjLonmMiddleLog.setNotificationStatus("2");
-                    bjLonmMiddleLog.setTodm("1");
-                    bjLonmMiddleLog.setRarp(LoginHelper.getNickName());
-                }
+        BjReleased bjReleased = baseMapper.selectById(releasedId);
+        BjLonmMiddle lonmMiddle = new BjLonmMiddle();
+        lonmMiddle.setAcceptanceDate(new Date());
+        if ("6".equals(bjLonmMiddleLog.getOperationRecord())) {
 
-                if ("3".equals(bjLonmMiddleLog.getOperationRecord())){
-                    bjLonmMiddleLog.setOperationTime(DateUtil.date());
-                    bjLonmMiddleLog.setNotificationLink("3");
-                    bjLonmMiddleLog.setPar(log1.getPar());
-                    bjLonmMiddleLog.setNotificationStatus("5");
-                    bjLonmMiddleLog.setTodm("2");
-                    bjLonmMiddleLog.setRarp(LoginHelper.getNickName());
-                }
-                if ("5".equals(bjLonmMiddleLog.getOperationRecord())){
-                    bjLonmMiddleLog.setOperationTime(DateUtil.date());
-                    bjLonmMiddleLog.setNotificationLink("4");
-                    bjLonmMiddleLog.setPar(log1.getPar());
-                    bjLonmMiddleLog.setNotificationStatus("8");
-                    bjLonmMiddleLog.setRarp(LoginHelper.getNickName());
-                }
+            bjLonmMiddleLog.setNotificationLink("2");
+            bjLonmMiddleLog.setPar(bjReleased.getReleasedUnit());
+            bjLonmMiddleLog.setNotificationStatus("3");
+            bjLonmMiddleLog.setTodm("4");
+            bjLonmMiddleLog.setRarp(bjReleased.getCreateBy());
 
-                logMapper.insert(bjLonmMiddleLog);
+            lonmMiddle.setNotificationStatus("3");
+            lonmMiddle.setTakeMeasures(bjLonmMiddleLog.getTakeMeasures());
+            lonmMiddle.setAcceptanceDate(new Date());
 
-                break;
-            case "2":
+        } else if ("7".equals(bjLonmMiddleLog.getOperationRecord())) {
 
-                if ("6".equals(bjLonmMiddleLog.getOperationRecord())) {
+            bjLonmMiddleLog.setNotificationLink("2");
+            bjLonmMiddleLog.setPar(bjReleased.getReleasedUnit());
+            bjLonmMiddleLog.setNotificationStatus("5");
+            bjLonmMiddleLog.setRarp(bjReleased.getCreateBy());
 
-                }
+            lonmMiddle.setNotificationStatus("5");
+            lonmMiddle.setTakeMeasures(bjLonmMiddleLog.getTakeMeasures());
+            lonmMiddle.setAcceptanceDate(new Date());
 
-                if ("4".equals(bjLonmMiddleLog.getOperationRecord())) {
-                    bjLonmMiddleLog.setNotificationLink("2");
-                    bjLonmMiddleLog.setPar(log1.getPar());
-                    bjLonmMiddleLog.setNotificationStatus("7");
-                    bjLonmMiddleLog.setTodm("3");
-                    bjLonmMiddleLog.setRarp(LoginHelper.getNickName());
+        } else if ("8".equals(bjLonmMiddleLog.getOperationRecord())) {
 
-                    logMapper.insert(bjLonmMiddleLog);
+            BjLonmMiddle lonmMiddle1 = lonmMiddleMapper.selectOne(new LambdaQueryWrapper<BjLonmMiddle>()
+                    .eq(BjLonmMiddle::getNotifiedMattersId, notifiedMattersId));
 
-                    BjLonmMiddleLog log2 = BeanUtil
-                            .copyProperties(bjLonmMiddleLog, BjLonmMiddleLog.class);
+            BjNtlo bjNtlo = ntloMapper.selectList(new LambdaQueryWrapper<BjNtlo>()
+                    .eq(BjNtlo::getUnitName, lonmMiddle1.getReceivingUnit())).get(0);
 
-                    log2.setOperationTime(DateUtil.date());
-                    log2.setNotificationLink("4");
-                    log2.setOperationRecord("5");
-                    log2.setNotificationStatus("8");
-                    log2.setRarp("系统处置完成");
-                    log2.setOpinions("系统自动结案");
-                    log2.setTodm(null);
-                    log2.setTakeMeasures(null);
-                    log2.setDoom(null);
+            bjLonmMiddleLog.setNotificationLink("2");
+            bjLonmMiddleLog.setPar(lonmMiddle1.getReceivingUnit());
+            bjLonmMiddleLog.setNotificationStatus("1");
+            bjLonmMiddleLog.setRarp(bjNtlo.getLiaisonId());
 
-                    logMapper.insert(log2);
-                }
-                break;
-            default:
-                throw new RuntimeException("数据异常，请联系管理员！");
-        }
+            lonmMiddle.setNotificationStatus("1");
+            lonmMiddle.setTakeMeasures(bjLonmMiddleLog.getTakeMeasures());
+            lonmMiddle.setAcceptanceDate(new Date());
 
-        List<BjReleasedMiddle> releasedMiddles = middleMapper.selectList(new LambdaQueryWrapper<BjReleasedMiddle>()
-                .eq(BjReleasedMiddle::getReleasedId, releasedId));
+        } else {
+            switch (bjReleasedMiddleVo.getWfir()) {
+                case "1":
+                    if ("2".equals(bjLonmMiddleLog.getOperationRecord())) {
+                        bjLonmMiddleLog.setNotificationLink("2");
+                        bjLonmMiddleLog.setPar(log1.getPar());
+                        bjLonmMiddleLog.setNotificationStatus("2");
+                        bjLonmMiddleLog.setTodm("1");
+                        bjLonmMiddleLog.setRarp(LoginHelper.getNickName());
+
+                        lonmMiddle.setNotificationStatus("2");
+                        lonmMiddle.setTakeMeasures(bjLonmMiddleLog.getTakeMeasures());
+                    }
+
+                    if ("3".equals(bjLonmMiddleLog.getOperationRecord())) {
+                        bjLonmMiddleLog.setNotificationLink("3");
+                        bjLonmMiddleLog.setPar(log1.getPar());
+                        bjLonmMiddleLog.setNotificationStatus("5");
+                        bjLonmMiddleLog.setTodm("2");
+                        bjLonmMiddleLog.setRarp(LoginHelper.getNickName());
+
+                        lonmMiddle.setNotificationStatus("5");
+                        lonmMiddle.setTakeMeasures(bjLonmMiddleLog.getTakeMeasures());
+
+                    }
+                    if ("5".equals(bjLonmMiddleLog.getOperationRecord())) {
+                        bjLonmMiddleLog.setNotificationLink("4");
+                        bjLonmMiddleLog.setPar(log1.getPar());
+                        bjLonmMiddleLog.setNotificationStatus("8");
+                        bjLonmMiddleLog.setRarp(LoginHelper.getNickName());
+
+                        lonmMiddle.setNotificationStatus("8");
+                        lonmMiddle.setTakeMeasures(bjLonmMiddleLog.getTakeMeasures());
+                    }
 
-        //判断我要发布下是否只有一个通报事项
-        if (releasedMiddles.size() == 1) {
 
-                if (logMapper.selectList(new LambdaQueryWrapper<BjLonmMiddleLog>()
-                                .eq(BjLonmMiddleLog::getNotifiedMattersId, notifiedMattersId))
-                        .stream().filter(item ->
-                                "8".equals(item.getNotificationStatus())).count() == 1) {
+                    logMapper.insert(bjLonmMiddleLog);
+
+                    break;
+                case "2":
+                    if ("4".equals(bjLonmMiddleLog.getOperationRecord())) {
+                        bjLonmMiddleLog.setNotificationLink("2");
+                        bjLonmMiddleLog.setPar(log1.getPar());
+                        bjLonmMiddleLog.setNotificationStatus("7");
+                        bjLonmMiddleLog.setTodm("3");
+                        bjLonmMiddleLog.setRarp(LoginHelper.getNickName());
+
+                        logMapper.insert(bjLonmMiddleLog);
+
+                        BjLonmMiddleLog log2 = BeanUtil
+                                .copyProperties(bjLonmMiddleLog, BjLonmMiddleLog.class);
+
+                        log2.setOperationTime(DateUtil.date());
+                        log2.setNotificationLink("4");
+                        log2.setOperationRecord("5");
+                        log2.setNotificationStatus("8");
+                        log2.setRarp("系统处置完成");
+                        log2.setOpinions("系统自动结案");
+                        log2.setTodm(null);
+                        log2.setTakeMeasures(null);
+                        log2.setDoom(null);
+
+                        logMapper.insert(log2);
+
+                        lonmMiddle.setNotificationStatus("8");
+                        lonmMiddle.setTakeMeasures(log2.getTakeMeasures());
+                        lonmMiddle.setNotifyOverallStatus("3");
+
+                    }
+
+                    List<BjReleasedMiddle> releasedMiddles = middleMapper.selectList(new LambdaQueryWrapper<BjReleasedMiddle>()
+                            .eq(BjReleasedMiddle::getReleasedId, releasedId));
+
+                    //判断我要发布下是否只有一个通报事项
+                    if (releasedMiddles.size() == 1) {
+
+                        if (logMapper.selectList(new LambdaQueryWrapper<BjLonmMiddleLog>()
+                                        .eq(BjLonmMiddleLog::getNotifiedMattersId, notifiedMattersId))
+                                .stream().filter(item ->
+                                        "8".equals(item.getNotificationStatus())).count() == 1) {
+
+                            //我要发布下的通报事项只有一条并且只有一个接收单位且状态为已处置完成 ‘8’ 直接更改我要发布状态为 已结案 ‘3’
+                            getBjReleasedStatus(releasedId);
+                        }
+                    } else {
+                        //通报事项id
+                        List<String> notificationMatterIds = releasedMiddles.stream()
+                                .map(BjReleasedMiddle::getNotifiedMattersId).toList();
+
+                        Map<String, List<BjLonmMiddleLog>> collect = logMapper.selectList(new LambdaQueryWrapper<BjLonmMiddleLog>()
+                                        .in(BjLonmMiddleLog::getNotifiedMattersId, notificationMatterIds)).stream()
+                                .collect(Collectors.groupingBy(BjLonmMiddleLog::getReceivingUnit));
+
+                        int i = 0;
+                        int n = 0;
+                        for (String receivingUnit : collect.keySet()) {
+                            if (collect.get(receivingUnit).stream().anyMatch(item ->
+                                    "8".equals(item.getNotificationStatus()))) {
+                                i = i + 1;
+                            }
+                        }
+                        if (i == collect.size()) {
+                            //接收单位为多个时判断是否全部都是 已处置完成 ‘8’ ，如是的情况更改我要发布 发布状态  已结案 ‘3’，如否不做操作
+                            getBjReleasedStatus(releasedId);
+                        }
+                    }
+
+                    return lonmMiddleMapper.update(lonmMiddle, new LambdaQueryWrapper<BjLonmMiddle>()
+                            .eq(BjLonmMiddle::getNotifiedMattersId, notifiedMattersId)
+                            .eq(BjLonmMiddle::getReceivingUnit, LoginHelper.getDeptId()));
+                default:
+                    throw new RuntimeException("数据异常，请联系管理员！");
 
-                    //我要发布下的通报事项只有一条并且只有一个接收单位且状态为已处置完成 ‘8’ 直接更改我要发布状态为 已结案 ‘3’
-                    return getBjReleasedStatus(releasedId);
-            }
-        }else{
-            //通报事项id
-            List<String> notificationMatterIds = releasedMiddles.stream()
-                    .map(BjReleasedMiddle::getNotifiedMattersId).toList();
-
-            Map<String, List<BjLonmMiddleLog>> collect = logMapper.selectList(new LambdaQueryWrapper<BjLonmMiddleLog>()
-                            .in(BjLonmMiddleLog::getNotifiedMattersId, notificationMatterIds)).stream()
-                    .collect(Collectors.groupingBy(BjLonmMiddleLog::getReceivingUnit));
-
-            int i = 0;
-            for (String receivingUnit : collect.keySet()) {
-                if (collect.get(receivingUnit).stream().anyMatch(item ->
-                        "8".equals(item.getNotificationStatus()))) {
-                    i = i + 1;
-                }
-            }
-            if (i == collect.size()) {
-                //接收单位为多个时判断是否全部都是 已处置完成 ‘8’ ，如是的情况更改我要发布 发布状态  已结案 ‘3’，如否不做操作
-                return getBjReleasedStatus(releasedId);
             }
+
+
         }
+        logMapper.insert(bjLonmMiddleLog);
 
-        return 0;
+        return lonmMiddleMapper.update(lonmMiddle, new LambdaQueryWrapper<BjLonmMiddle>()
+                .eq(BjLonmMiddle::getNotifiedMattersId, notifiedMattersId)
+                .eq(BjLonmMiddle::getReceivingUnit, LoginHelper.getDeptId()));
     }
 
     /**
      * 更改我要发布整体状态为3
+     *
      * @param releasedId
      * @return
      */

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

@@ -306,7 +306,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        </select>
 
        <resultMap id="myAADResultList" type="org.dromara.business.domain.vo.BjMyAADVo">
-
+              <result property="notifiedMattersId" column="notified_matters_id"/>
+              <result property="violationNumber" column="violation_number"/>
+              <result property="releasedName" column="releasedName"/>
+              <result property="chineseVesselName" column="vessel_name"/>
+              <result property="conmStr" column="conmStr"/>
+              <result property="notificationMatters" column="notification_matters"/>
+              <result property="receivingName" column="receivingName"/>
+              <result property="namePhone" column="namePhone"/>
+              <result property="notificationStatusStr" column="notificationStatusStr"/>
+              <result property="overdueStatusStr" column="overdueStatusStr"/>
+              <result property="nosStr" column="nosStr"/>
+              <result property="takeMeasuresStr" column="takeMeasuresStr"/>
+              <result property="wfirStr" column="wfirStr"/>
+              <result property="releasedDate" column="released_date"/>
+              <result property="acceptanceDate" column="acceptance_date"/>
+              <result property="publishers" column="publishers"/>
        </resultMap>
 
        <select id="selectMyAADList" resultMap="myAADResultList">