Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

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("保存成功");
     }
 
 

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());

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