From cd67d3571b67c8e1577d78f3b9e94c73e2e0a1c2 Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Wed, 12 Aug 2026 11:00:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A2=84=E7=BA=A6=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EfcodeCpNoticeServiceImpl.java          | 6 +++---
 .../mapper/enforcementcode/EfcodeCpReserveMapper.xml     | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java
index 2bfe616c..f1ba454b 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java
@@ -275,9 +275,9 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService {
             case 3 -> "其他";
             default -> "";
         };
-        String message = "尊敬的:" + notice.getContactPerson() + "您好！您收到一则行政检查发布反馈消息。信息内容如下：企业名称："
-            + notice.getEnterpriseName() + "执法单位：" + notice.getBureauDeptName()
-            + "检查时间：" + notice.getEnforceDate();
+        String message = "尊敬的:" + notice.getContactPerson() + "您好！您收到一则行政检查消息。信息内容如下：<br/>企业名称："
+            + notice.getEnterpriseName() + "<br/>执法单位：" + notice.getBureauDeptName()
+            + "<br/>检查时间：" + notice.getEnforceDate() + enforceTimeText;
 
         EfcodeCpNoticeMessage msg = new EfcodeCpNoticeMessage();
         msg.setId(IdUtil.getSnowflakeNextIdStr());
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml
index 27466269..3f021efb 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml
@@ -73,7 +73,14 @@
         FROM efcode_cp_reserve r
             LEFT JOIN efcode_cp_plan p ON r.plan_id = p.id
             LEFT JOIN efcode_cp_plan p2 ON r.plan_group_id = p2.id
-                WHERE  r.sender_id != 'manual_system_sender' and r.is_read=0 and r.op_status = 3 and r.create_by = #{userId}
+                WHERE r.is_read = 0 and r.op_status = 3
+                    AND (
+                        <!-- 用户自己创建的手动预约-->
+                        (r.sender_id != 'manual_system_sender' and r.create_by = #{userId})
+                        OR
+                       <!-- 系统匹配生成的预约（create_by为系统用户），通过接收者关联当前用户-->
+                        (r.res_from = 1 and r.receiver_id = #{userId})
+                    )
                     AND NOT EXISTS (
                             SELECT 1
                             FROM sys_message_view_log smvl

From 782d606c09014c4821529ecfbdcb1a8b9dbb592a Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Wed, 12 Aug 2026 11:16:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEnforcementRegistrationController.java            | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java
index 0b03b8ec..ba1b0fa9 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java
@@ -85,7 +85,14 @@ public class AppEnforcementRegistrationController extends BaseController {
     @ResponseBody
     public R<Void> addSave(@RequestBody EnforcementRegistrationBo bo)
     {
-        return toAjax(enforcementRegistrationService.insertEnforcementRegistration(bo));
+        if (StringUtils.isNotEmpty(bo.getId())) {
+            bo.setIsSubmit(0L);
+            enforcementRegistrationService.updateEnforcementRegistration(bo);
+        }else{
+            enforcementRegistrationService.insertEnforcementRegistration(bo);
+        }
+
+        return R.ok("保存成功");
     }