我要发布、我的接收处置

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

@@ -63,7 +63,7 @@ public class BjMyAADController extends BaseController {
      *
      * @param bo 通报事项清单操作记录明细
      */
-    @Operation(summary = "获取通报事项清单详细信息")
+    @Operation(summary = "更新通报事项清单操作记录及整体状态")
 //    @SaCheckPermission("business:myAAD:edit")
     @PostMapping("/myAADUpdate")
     public AjaxResult editMyAAD(@RequestBody BjLonmMiddleLogBo bo) {

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

@@ -1,5 +1,7 @@
 package com.ruoyi.business.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +17,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@TableName("bj_released")
 public class BjReleased extends BaseEntity {
 
     @Serial
@@ -23,6 +26,7 @@ public class BjReleased extends BaseEntity {
     /**
      * 发布id
      */
+    @TableId("released_id")
     private String releasedId;
 
     /**

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

@@ -1,5 +1,6 @@
 package com.ruoyi.business.domain;
 
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
 
 import java.io.Serial;
@@ -11,7 +12,7 @@ import java.io.Serial;
  * @date 2025-09-08
  */
 @Data
-public class BjReleasedMiddle{
+public class BjReleasedMiddle extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

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

@@ -84,11 +84,17 @@ public class BjLonmBo extends BaseEntity {
     @Schema(description = "发布状态，字典")
     private String releaseStatus;
 
+//    /**
+//     * 接收单位
+//     */
+//    @Schema(description = "接收单位")
+//    private List<String> lonmMiddle;
+
     /**
      * 接收单位
      */
     @Schema(description = "接收单位")
-    private List<String> lonmMiddle;
+    private String lonmMiddle;
 
     /**
      * 接收单位搜索使用

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

@@ -91,7 +91,7 @@ public class BjLonmServiceImpl implements IBjLonmService {
         if (flag) {
 //            bo.setNotifiedMattersId(add.getNotifiedMattersId());
             baseMapper.batchInsertBjLonmMiddle(notifiedMattersId,
-                    bo.getLonmMiddle());
+                    Collections.singletonList(bo.getLonmMiddle()));
         }
         return flag;
     }
@@ -111,7 +111,7 @@ public class BjLonmServiceImpl implements IBjLonmService {
         if (f) {
             baseMapper.deleteBjLonmMiddle(Collections.singletonList(bo.getNotifiedMattersId()));
 
-            baseMapper.batchInsertBjLonmMiddle(bo.getNotifiedMattersId(), bo.getLonmMiddle());
+            baseMapper.batchInsertBjLonmMiddle(bo.getNotifiedMattersId(), Collections.singletonList(bo.getLonmMiddle()));
 
         }
         return f;

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

@@ -124,13 +124,14 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
             add.setCreateTime(new Date());
             add.setUpdateBy(SecurityUtils.getUsername());
             add.setUpdateTime(new Date());
-            add.setReleasedId(releasedId);
+
             add.setViolationNumber(number);
         }
         boolean flag;
         if (StringUtils.isNotEmpty(add.getReleasedId())){
             flag = baseMapper.updateBjReleased(add) > 0;
         }else{
+            add.setReleasedId(releasedId);
             flag = baseMapper.insertBjReleased(add) > 0;
         }
         if (flag) {
@@ -141,6 +142,10 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
                 BjReleasedMiddle middle = BeanUtil.copyProperties(middleBo, BjReleasedMiddle.class);
                 middle.setReleasedMiddleId(IdUtil.simpleUUID());
                 middle.setReleasedId(releasedId);
+                middle.setCreateBy(SecurityUtils.getUsername());
+                middle.setCreateTime(new Date());
+                middle.setUpdateBy(SecurityUtils.getUsername());
+                middle.setUpdateTime(new Date());
                 middleMapper.insertBjReleasedMiddle(middle);
                 if ("2".equals(add.getReleasedStatus())) {
                     BjLonmMiddle lonmMiddle = new BjLonmMiddle();
@@ -291,6 +296,8 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
             lonmMiddle.setTakeMeasures(bjLonmMiddleLog.getTakeMeasures());
             lonmMiddle.setAcceptanceDate(new Date());
 
+            logMapper.insert(bjLonmMiddleLog);
+
         } else if ("7".equals(bjLonmMiddleLog.getOperationRecord())) {
 
             bjLonmMiddleLog.setNotificationLink("2");
@@ -302,6 +309,8 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
             lonmMiddle.setTakeMeasures(bjLonmMiddleLog.getTakeMeasures());
             lonmMiddle.setAcceptanceDate(new Date());
 
+            logMapper.insert(bjLonmMiddleLog);
+
         } else if ("8".equals(bjLonmMiddleLog.getOperationRecord())) {
 
             BjLonmMiddle lonmMiddle1 = lonmMiddleMapper.selectOne(new LambdaQueryWrapper<BjLonmMiddle>()
@@ -319,6 +328,8 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
             lonmMiddle.setTakeMeasures(bjLonmMiddleLog.getTakeMeasures());
             lonmMiddle.setAcceptanceDate(new Date());
 
+            logMapper.insert(bjLonmMiddleLog);
+
         } else {
             switch (bjReleasedMiddle.getWfir()) {
                 case "1":
@@ -371,6 +382,7 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
                         BjLonmMiddleLog log2 = BeanUtil
                                 .copyProperties(bjLonmMiddleLog, BjLonmMiddleLog.class);
 
+                        log2.setId(IdUtil.simpleUUID());
                         log2.setOperationTime(DateUtil.date());
                         log2.setNotificationLink("4");
                         log2.setOperationRecord("5");
@@ -436,11 +448,13 @@ public class BjReleasedServiceImpl implements IBjReleasedService {
 
 
         }
-        logMapper.insert(bjLonmMiddleLog);
 
-        return lonmMiddleMapper.update(lonmMiddle, new LambdaQueryWrapper<BjLonmMiddle>()
+        int update = lonmMiddleMapper.update(lonmMiddle, new LambdaQueryWrapper<BjLonmMiddle>()
                 .eq(BjLonmMiddle::getNotifiedMattersId, notifiedMattersId)
-                .eq(BjLonmMiddle::getReceivingUnit, SecurityUtils.getLoginUser().getSysUser().getDeptId()));
+//                .eq(BjLonmMiddle::getReceivingUnit, SecurityUtils.getLoginUser().getSysUser().getDeptId()));
+                .eq(BjLonmMiddle::getReceivingUnit, "101"));
+        System.out.println(update);
+        return update;
     }
 
     /**

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

@@ -457,6 +457,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               <if test="bo.startAcceptanceDate != null and bo.endAcceptanceDate != null">
                      and blm.acceptance_date between #{bo.startAcceptanceDate} and #{bo.endAcceptanceDate}
               </if>
+              order by blm.create_time desc
        </select>
 
 
@@ -667,7 +668,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      <if test="updateTime != null">update_time,</if>
                      <if test="delFlag != null">del_flag,</if>
                      <if test="csnu != null">csnu,</if>
-                     <if test="createDept != null">create_dept,</if>
                      <if test="mmsi != null">mmsi,</if>
                      <if test="callSign != null">call_sign,</if>
                      <if test="nationality != null">nationality,</if>
@@ -703,7 +703,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      <if test="updateTime != null">#{updateTime},</if>
                      <if test="delFlag != null">#{delFlag},</if>
                      <if test="csnu != null">#{csnu},</if>
-                     <if test="createDept != null">#{createDept},</if>
                      <if test="mmsi != null">#{mmsi},</if>
                      <if test="callSign != null">#{callSign},</if>
                      <if test="nationality != null">#{nationality},</if>
@@ -742,7 +741,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      <if test="updateTime != null">update_time = #{updateTime},</if>
                      <if test="delFlag != null">del_flag = #{delFlag},</if>
                      <if test="csnu != null">csnu = #{csnu},</if>
-                     <if test="createDept != null">create_dept = #{createDept},</if>
                      <if test="mmsi != null">mmsi = #{mmsi},</if>
                      <if test="callSign != null">call_sign = #{callSign},</if>
                      <if test="nationality != null">nationality = #{nationality},</if>

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

@@ -110,11 +110,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="smr != null">smr,</if>
             <if test="smraFilePath != null">smra_file_path,</if>
             <if test="wfir != null">wfir,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createDept != null">create_dept,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="releasedMiddleId != null">#{releasedMiddleId},</if>
@@ -133,11 +128,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="smr != null">#{smr},</if>
             <if test="smraFilePath != null">#{smraFilePath},</if>
             <if test="wfir != null">#{wfir},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createDept != null">#{createDept},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
         </trim>
     </insert>