diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/component/TimingRemindImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/component/TimingRemindImpl.java
index 741fad9..aa3ac93 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/docking/component/TimingRemindImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/component/TimingRemindImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.CreditCodeUtil;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.docking.entity.SmartDeclaration;
 import com.ruoyi.docking.service.SmartDeclarationService;
+import com.ruoyi.docking.service.UserService;
 import com.ruoyi.system.mapper.SysUserMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,10 +33,12 @@ public class TimingRemindImpl implements TimingRemindService {
     private SmartDeclarationService smartDeclarationService;
 
     /**
-     * 人员
+     * 用户
      */
     @Resource
-    private SysUserMapper sysUserMapper;
+    private UserService userService;
+
+
 
 
     /**
@@ -61,32 +64,24 @@ public class TimingRemindImpl implements TimingRemindService {
 
 
     /**
-     * 政务端要定时新增数据，并且还要发短信
+     * 政务端要定时新增数据
      */
-    public void chiefTiming(String t, Long id, String pid) {
+    public void chiefTiming(String time, Long id, String pid,String content) {
         List<SmartDeclaration> listAdd = new ArrayList<>();
         //给所有政务人员发通知和短信
         //添加用户进表的时候手机号已经经过处理
-        SysUser user = new SysUser();
-        List<SysUser> sysUsers = sysUserMapper.selectUserList(user);
-        //获取到所有的符合条件的政务用户
-        List<SysUser> collect = sysUsers.stream().filter(x -> "0".equals(x.getDelFlag()) && "0".equals(x.getStatus()))
-                .filter(y -> !CreditCodeUtil.isCreditCode(y.getUserName()))
-                .collect(Collectors.toList());
-        for (SysUser x : collect) {
-            SmartDeclaration sd = new SmartDeclaration();
-            sd.setIsRead(1);
-            sd.setAlertTime(LocalDateTime.parse(t));
-            sd.setSmartRemindersId(id);
+//        for (SysUser x : userService.getAllZwUser()) {
+//            SmartDeclaration sd = new SmartDeclaration();
+//            sd.setAlertTime(LocalDateTime.parse(t));
+//            sd.setSmartRemindersId(id);
             if ("null".equals(pid)) {
-                sd.setProjectId(null);
+                userService.getAllZwUser(content,null,id,time);
             } else {
-                sd.setProjectId(Long.valueOf(pid));
+                userService.getAllZwUser(content,Long.valueOf(pid),id,time);
             }
-            sd.setZwId(x.getUserId());
-            listAdd.add(sd);
-        }
-        smartDeclarationService.saveBatch(listAdd);
+//            sd.setZwId(x.getUserId());
+//            listAdd.add(sd);
+//        }
         log.info("提醒成功!");
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/component/TimingRemindService.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/component/TimingRemindService.java
index 1fdf450..b894ffb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/docking/component/TimingRemindService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/component/TimingRemindService.java
@@ -16,5 +16,5 @@ public interface TimingRemindService {
     /**
      * 政务端要定时新增数据
      */
-    void chiefTiming(String t, Long id, String pid);
+    void chiefTiming(String time, Long id, String pid,String content);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/SmartRemindersController.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/SmartRemindersController.java
index 00f7123..0992779 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/SmartRemindersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/SmartRemindersController.java
@@ -5,14 +5,12 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.docking.component.TimingRemindService;
 import com.ruoyi.docking.entity.SmartReminders;
 import com.ruoyi.docking.entity.request.JAddJobSmart;
 import com.ruoyi.docking.entity.request.SREnterRequest;
 import com.ruoyi.docking.entity.request.SmartRemindersPageRequest;
 import com.ruoyi.docking.service.SmartRemindersService;
 import com.ruoyi.gysl.regular.NoticeTiming;
-import com.ruoyi.gysl.service.NoticeService;
 import com.ruoyi.quartz.domain.SysJob;
 import com.ruoyi.quartz.service.ISysJobService;
 import io.swagger.annotations.Api;
@@ -86,6 +84,19 @@ public class SmartRemindersController extends BaseController {
         return success(smartRemindersService.getById(id));
     }
 
+    /**
+     * 已读智能提醒
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+//    @PreAuthorize("@ss.hasAnyRoles('admin,common')")
+    @ApiOperation(value = "已读智能提醒")
+    @GetMapping("/isRead{id}")
+    public AjaxResult isRead(@PathVariable Serializable id) {
+        return success(smartRemindersService.isRead(id));
+    }
+
     /**
      * 新增定期提醒数据（政务端和企业端）
      *
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/SmartDeclaration.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/SmartDeclaration.java
index 2e52fd7..57855b4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/SmartDeclaration.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/SmartDeclaration.java
@@ -23,7 +23,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("smart_declaration")
+@TableName("gysl_smart_declaration")
 @ApiModel(value="智能提醒关联表",description = "智能提醒")
 public class SmartDeclaration {
 
@@ -52,7 +52,9 @@ public class SmartDeclaration {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime alertTime;
-   
+
+    @ApiModelProperty(value ="提醒内容" )
+    private String content;
 
     @ApiModelProperty(value ="政务用户id" )
     private Long zwId;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/SmartReminders.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/SmartReminders.java
index 140c724..8a573ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/SmartReminders.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/SmartReminders.java
@@ -23,7 +23,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel("智能提醒")
-@TableName(value = "smart_reminders")
+@TableName(value = "gysl_smart_reminders")
 public class SmartReminders extends BaseModel implements Serializable {
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/SmartRemindersMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/SmartRemindersMapper.java
index e650119..8a8c868 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/SmartRemindersMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/SmartRemindersMapper.java
@@ -7,6 +7,8 @@ import com.ruoyi.docking.entity.request.JAddJobSmart;
 import com.ruoyi.docking.entity.request.SmartRemindersPageRequest;
 import org.apache.ibatis.annotations.Param;
 
+import java.io.Serializable;
+
 /**
  * 智能提醒（j_smart_reminders）表数据访问层
  *
@@ -34,5 +36,14 @@ public interface SmartRemindersMapper extends BaseMapper<SmartReminders> {
      * 根据智能提醒id查询定时任务
      */
     JAddJobSmart selectJobSmart(@Param("id") Long id);
+
+
+    /**
+     * 已读智能提醒
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    Boolean isRead(@Param("id") Serializable id);
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/SmartDeclarationService.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/SmartDeclarationService.java
index 6c23846..af6dcf2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/SmartDeclarationService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/SmartDeclarationService.java
@@ -10,6 +10,5 @@ import com.ruoyi.docking.entity.SmartDeclaration;
  * @since 2025-03-31 14:57:57
  */
 public interface SmartDeclarationService extends IService<SmartDeclaration> {
-
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/SmartRemindersService.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/SmartRemindersService.java
index d35509d..4327736 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/SmartRemindersService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/SmartRemindersService.java
@@ -9,6 +9,7 @@ import com.ruoyi.docking.entity.request.SREnterRequest;
 import com.ruoyi.docking.entity.request.SmartRemindersPageRequest;
 import org.quartz.SchedulerException;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 
@@ -52,5 +53,13 @@ public interface SmartRemindersService extends IService<SmartReminders> {
      * 根据智能提醒id查询定时任务
      */
     JAddJobSmart selectJobSmart(Long id);
+
+    /**
+     * 已读智能提醒
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    Boolean isRead(Serializable id);
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/UserService.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/UserService.java
new file mode 100644
index 0000000..9f25fba
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/UserService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.docking.service;
+
+/**
+ * 用户数据（业务层）
+ *
+ * @author makejava
+ * @since 2025-03-25 14:49:04
+ */
+public interface UserService{
+
+    /**
+     * 获取所有符合条件的政务用户并且新增提醒
+     */
+    void getAllZwUser(String content, Long id, Long smartRemindersId, String time);
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/SmartDeclarationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/SmartDeclarationServiceImpl.java
index 544eb77..6cfc452 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/SmartDeclarationServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/SmartDeclarationServiceImpl.java
@@ -1,11 +1,17 @@
 package com.ruoyi.docking.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.docking.mapper.SmartDeclarationMapper;
 import com.ruoyi.docking.entity.SmartDeclaration;
+import com.ruoyi.docking.mapper.SmartDeclarationMapper;
 import com.ruoyi.docking.service.SmartDeclarationService;
+import com.ruoyi.docking.service.UserService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 智能提醒关联表(SmartDeclaration)表服务实现类
  *
@@ -15,5 +21,6 @@ import org.springframework.stereotype.Service;
 @Service("smartDeclarationService")
 public class SmartDeclarationServiceImpl extends ServiceImpl<SmartDeclarationMapper, SmartDeclaration> implements SmartDeclarationService {
 
+
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/SmartRemindersServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/SmartRemindersServiceImpl.java
index f7dd554..998164f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/SmartRemindersServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/SmartRemindersServiceImpl.java
@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -100,7 +101,11 @@ public class SmartRemindersServiceImpl extends ServiceImpl<SmartRemindersMapper,
             sysJob.setInvokeTarget("timingRemind.enterpriseTiming(" + "'" + jSmartReminders.getAlertTime() + "'" + "," + jSmartReminders.getId() + "L" + ")");
         } else {
             //如果是政务端的定时提醒
-            sysJob.setInvokeTarget("timingRemind.chiefTiming(" + "'" + jSmartReminders.getAlertTime() + "'" + "," + jSmartReminders.getId() + "L," + "'" + jSmartReminders.getProjectId() + "'" + ")");
+            sysJob.setInvokeTarget("timingRemind.chiefTiming(" + "'"
+                    + jSmartReminders.getAlertTime() + "'" + ","
+                    + jSmartReminders.getId() + "L," + "'"
+                    + jSmartReminders.getProjectId() + "'"+"'"
+                    + jSmartReminders.getAlertContent() + "'" + ")");
         }
         sysJob.setJobGroup("DEFAULT");
         sysJob.setJobName(jSmartReminders.getRulesName());
@@ -129,5 +134,16 @@ public class SmartRemindersServiceImpl extends ServiceImpl<SmartRemindersMapper,
     public JAddJobSmart selectJobSmart(Long id) {
         return baseMapper.selectJobSmart(id);
     }
+
+    /**
+     * 已读智能提醒
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @Override
+    public Boolean isRead(Serializable id) {
+        return baseMapper.isRead(id);
+    }
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/UserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/UserServiceImpl.java
new file mode 100644
index 0000000..b748000
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/UserServiceImpl.java
@@ -0,0 +1,53 @@
+package com.ruoyi.docking.service.impl;
+
+import cn.hutool.core.util.CreditCodeUtil;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.docking.entity.SmartDeclaration;
+import com.ruoyi.docking.service.SmartDeclarationService;
+import com.ruoyi.docking.service.UserService;
+import com.ruoyi.system.mapper.SysUserMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户数据（服务实现类）
+ *
+ * @author makejava
+ * @since 2025-03-25 14:49:04
+ */
+@Service
+public class UserServiceImpl implements UserService {
+
+    @Resource
+    private SysUserMapper sysUserMapper;
+
+    @Resource
+    private SmartDeclarationService smartDeclarationService;
+
+    @Override
+    public void getAllZwUser(String content, Long id, Long smartRemindersId, String time) {
+        SysUser user = new SysUser();
+        List<SysUser> sysUsers = sysUserMapper.selectUserList(user);
+        //获取到所有的符合条件的政务用户
+        List<SysUser> collect = sysUsers.stream().filter(x -> "0".equals(x.getDelFlag()) && "0".equals(x.getStatus()))
+                .filter(y -> !CreditCodeUtil.isCreditCode(y.getUserName()))
+                .collect(Collectors.toList());
+        List<SmartDeclaration> list = new ArrayList<>();
+        collect.forEach(x->{
+            SmartDeclaration smartDeclaration = new SmartDeclaration();
+            smartDeclaration.setZwId(x.getUserId());
+            smartDeclaration.setContent(content);
+            smartDeclaration.setProjectId(id);
+            smartDeclaration.setAlertTime(LocalDateTime.parse(time));
+            smartDeclaration.setSmartRemindersId(smartRemindersId);
+            list.add(smartDeclaration);
+        });
+        smartDeclarationService.saveBatch(list);
+    }
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java
index 0e6b02f..d9a89b3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java
@@ -9,6 +9,8 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ChangeExcelUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.docking.entity.SmartDeclaration;
+import com.ruoyi.docking.service.SmartDeclarationService;
 import com.ruoyi.gysl.entity.*;
 import com.ruoyi.gysl.entity.request.AuditRequest;
 import com.ruoyi.gysl.entity.request.BasicInformationPageReq;
@@ -65,7 +67,7 @@ public class BasicInformationController extends BaseController {
      * 消息通知
      */
     @Resource
-    private NoticeService noticeService;
+    private SmartDeclarationService smartDeclarationService;
 
     /**
      * 五要素模型信息
@@ -208,13 +210,11 @@ public class BasicInformationController extends BaseController {
                     saveOther.add(projectOtherInfo);
                 });
                 projectOtherInfoService.saveBatch(saveOther);
-                //新增消息
-                Notice notice = new Notice();
-                notice.setType(2);
+                //新增消息(也就是智能提醒)
+                SmartDeclaration notice = new SmartDeclaration();
                 notice.setTyshxydm(x.getTyshxydm());
-                notice.setXmId(x.getId());
                 notice.setContent("关于" + x.getName() + "项目,待填报的通知");
-                noticeService.save(notice);
+                smartDeclarationService.save(notice);
             });
             successMsg.append("导入成功");
         }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java
index 2386a36..77a8a86 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java
@@ -77,7 +77,7 @@ public class ZwStatsController extends BaseController {
     @ApiOperation("消息通知")
     @GetMapping("/zwNotice")
     public AjaxResult zwNotice() {
-        return success(zwStatsService.zwNotice());
+        return success(zwStatsService.zwNotice(SecurityUtils.getUserId()));
     }
 
 
@@ -87,7 +87,7 @@ public class ZwStatsController extends BaseController {
     @ApiOperation("政务消息通知数量")
     @GetMapping("/zwNoticeCount")
     public AjaxResult zwNoticeCount() {
-        return success(zwStatsService.zwNoticeCount());
+        return success(zwStatsService.zwNoticeCount(SecurityUtils.getUserId()));
     }
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java
index 49f7230..fa4322a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java
@@ -25,7 +25,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel("基本信息")
-@TableName(value = "basic_information")
+@TableName(value = "gysl_basic_information")
 public class BasicInformation extends BaseModel {
 
     @ApiModelProperty("主键id")
@@ -33,13 +33,13 @@ public class BasicInformation extends BaseModel {
     private Long id;
 
 
-    @Excel(name = "统一社会信用代码", sort = 2,required = true)
+    @Excel(name = "统一社会信用代码*", sort = 2,required = true)
     @ApiModelProperty("统一社会信用代码")
     private String tyshxydm;
 
 
     @NotBlank
-    @Excel(name = "项目名称", sort = 2,required = true)
+    @Excel(name = "项目名称*", sort = 2,required = true)
     @ApiModelProperty("项目名称")
     private String name;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java
index 9c483a5..faf5fa3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java
@@ -24,8 +24,8 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("building_information")
-@ApiModel(value = "BuildingInformation")
+@TableName("gysl_building_information")
+@ApiModel(value = "建筑信息")
 public class BuildingInformation implements Serializable {
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Dpclgl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Dpclgl.java
index 4fca0b0..15d9821 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Dpclgl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Dpclgl.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName("dpclgl")
+@TableName("gysl_dpclgl")
 public class Dpclgl extends BaseModel implements Serializable{
 
     @ApiModelProperty(value = "主键id")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Enterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Enterprise.java
index eaf54ee..ebf5d6e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Enterprise.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Enterprise.java
@@ -24,7 +24,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("enterprise")
+@TableName("gysl_enterprise")
 @ApiModel(value = "Enterprise", description = "入驻企业基本信息")
 public class Enterprise extends BaseModel implements Serializable {
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java
index d5b533f..02c9ad4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName("ml")
+@TableName("gysl_ml")
 public class Ml extends BaseModel implements Serializable{
 
     @ApiModelProperty(value = "主键id")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java
index 41dcdc4..06a41c9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java
@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("mx")
+@TableName("gysl_mx")
 @ApiModel(value = "Mx", description = "模型管理")
 public class Mx extends BaseModel implements Serializable {
     private static final long serialVersionUID = -78397958900753109L;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java
deleted file mode 100644
index 04fddb3..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.ruoyi.gysl.entity;
-
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 项目通知(Notice)表实体类
- *
- * @author makejava
- * @since 2025-03-23 16:34:27
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("notice")
-@ApiModel(value = "notice", description = "项目通知")
-public class Notice implements Serializable {
-
-    /**
-     * 主键id
-     */
-    @ApiModelProperty(value = "主键id")
-    @TableField("id")
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "1政务通知 2企业通知")
-    private Integer type;
-
-    @ApiModelProperty(value = "通知内容")
-    private String content;
-
-    @ApiModelProperty(value = "统一社会信用代码")
-    private String tyshxydm;
-
-    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "项目id")
-    private Long xmId;
-}
-
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java
index c48f9a1..84e9e35 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java
@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("pjpz")
+@TableName("gysl_pjpz")
 @ApiModel(value = "Pjpz", description = "项目评价配置")
 public class Pjpz extends BaseModel implements Serializable {
     private static final long serialVersionUID = -25318153790915105L;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java
index a595be9..9db7f8e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java
@@ -24,7 +24,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("plan_information")
+@TableName("gysl_plan_information")
 @ApiModel(value = "PlanInformation", description = "规划信息")
 public class PlanInformation extends BaseModel implements Serializable {
     private static final long serialVersionUID = 949116362621294280L;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java
index 49edb04..202613c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName(value = "project_legend")
+@TableName(value = "gysl_project_legend")
 public class ProjectLegend extends BaseModel implements Serializable {
 
     @TableField("id")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java
index ec5db90..f744228 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.gysl.entity.baseModel.BaseModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
@@ -18,7 +19,8 @@ import java.io.Serializable;
  * @since 2025-03-19 10:49:22
  */
 
-@TableName("project_other_info")
+@EqualsAndHashCode(callSuper = true)
+@TableName("gysl_project_other_info")
 @Data
 public class ProjectOtherInfo  extends BaseModel implements Serializable {
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java
index d2a8889..c8459e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName("project_remark")
+@TableName("gysl_project_remark")
 public class ProjectRemark  extends BaseModel implements Serializable {
 
     @TableField("id")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java
index e78090a..92985ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java
@@ -21,7 +21,7 @@ import java.math.BigDecimal;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName("qyrz_information")
+@TableName("gysl_qyrz_information")
 public class QyrzInformation extends BaseEntity implements Serializable {
     @TableField("id")
     @TableId(type = IdType.AUTO)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java
index 2e78238..bebdffd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("wysmx_information")
+@TableName("gysl_wysmx_information")
 @ApiModel(value = "WysmxInformation", description = "五要素模型信息")
 public class WysmxInformation extends BaseModel implements Serializable {
     private static final long serialVersionUID = 285216252862855830L;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java
index 3e0ef82..82945e1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName("xfcygl")
+@TableName("gysl_xfcygl")
 public class Xfcygl extends BaseModel implements Serializable {
 
     @ApiModelProperty(value = "主键id")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java
index e095093..3bfbd8b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java
@@ -22,7 +22,7 @@ import java.time.LocalDate;
  * @since 2025-03-22 09:22:33
  */
 @Data
-@TableName("xmpjqd")
+@TableName("gysl_xmpjqd")
 public class Xmpjqd implements Serializable {
     @ApiModelProperty(value = "主键id")
     @TableField("id")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java
index 228a3a8..8ebfa6b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java
@@ -23,7 +23,7 @@ import java.time.LocalDate;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName("xmxl")
+@TableName("gysl_xmxl")
 public class Xmxl extends BaseModel implements Serializable {
     @TableField("id")
     @TableId(type = IdType.AUTO)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java
index 778a992..7a1afcf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java
@@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("xmzsk")
+@TableName("gysl_xmzsk")
 @ApiModel(value = "Xmzsk", description = "$tableInfo.comment")
 public class Xmzsk extends BaseModel implements Serializable {
     private static final long serialVersionUID = 442554812871200496L;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/NoticeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/NoticeMapper.java
deleted file mode 100644
index 1300b66..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/NoticeMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.ruoyi.gysl.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import com.ruoyi.gysl.entity.Notice;
-
-/**
- * 项目通知(Notice)表数据库访问层
- *
- * @author makejava
- * @since 2025-03-23 16:34:27
- */
-public interface NoticeMapper extends BaseMapper<Notice> {
-}
-
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java
index 55ec43c..6775da6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java
@@ -1,9 +1,8 @@
 package com.ruoyi.gysl.mapper;
 
+import com.ruoyi.docking.entity.SmartDeclaration;
 import com.ruoyi.gysl.entity.BasicInformation;
-import com.ruoyi.gysl.entity.Notice;
 import com.ruoyi.gysl.entity.stats.AllProjectResponse;
-import com.ruoyi.gysl.entity.stats.RibbonResponse;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -28,11 +27,11 @@ public interface QyStatsMapper {
     /**
      * 消息通知
      */
-    List<Notice> qyNotice(@Param("username") String username);
+    List<SmartDeclaration> qyNotice(@Param("username") String username);
 
     /**
      * 企业消息通知数量
      */
-    int qyNoticeCount(String username);
+    int qyNoticeCount(@Param("username")String username);
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java
index 7ea989f..9eb00c8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java
@@ -1,8 +1,9 @@
 package com.ruoyi.gysl.mapper;
 
-import com.ruoyi.gysl.entity.Notice;
+import com.ruoyi.docking.entity.SmartDeclaration;
 import com.ruoyi.gysl.entity.stats.AllProjectResponse;
 import com.ruoyi.gysl.entity.stats.RibbonResponse;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -31,11 +32,11 @@ public interface ZwStatsMapper {
     /**
      * 消息通知
      */
-    List<Notice> zwNotice();
+    List<SmartDeclaration> zwNotice(@Param("userId") Long userId);
 
     /**
      * 政务消息通知数量
      */
-    int zwNoticeCount();
+    int zwNoticeCount(@Param("userId") Long userId);
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java
index e3ad58b..7852766 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java
@@ -1,19 +1,10 @@
 package com.ruoyi.gysl.regular;
 
-import cn.hutool.core.util.CreditCodeUtil;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.docking.entity.SmartDeclaration;
 import com.ruoyi.docking.entity.SmartReminders;
-import com.ruoyi.docking.service.ProjectProgressService;
-import com.ruoyi.docking.service.ProjectService;
-import com.ruoyi.docking.service.SmartDeclarationService;
-import com.ruoyi.docking.service.SmartRemindersService;
+import com.ruoyi.docking.service.*;
 import com.ruoyi.gysl.entity.BasicInformation;
 import com.ruoyi.gysl.service.BasicInformationService;
-import com.ruoyi.gysl.service.NoticeService;
-import com.ruoyi.system.mapper.SysUserMapper;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -21,20 +12,18 @@ import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 每月固定时间定时任务
+ *
  * @author du
  * @since 2025/3/23 16:35
  */
 //@Configuration
 //@EnableScheduling
-    @Component
+@Component
 public class NoticeTiming {
 
-    @Resource
-    private NoticeService noticeService;
 
     @Resource
     private ProjectProgressService projectProgressService;
@@ -51,25 +40,21 @@ public class NoticeTiming {
     @Resource
     private BasicInformationService basicInformationService;
 
-    /**
-     * 人员
-     */
+
     @Resource
-    private SysUserMapper sysUserMapper;
+    private UserService userService;
+
     /**
      * 每个月固定发一次政务通知
      */
-//    @Scheduled(cron = "0 0 0 1 * ?")
-//    private void configureTasks() {
-//        Notice notice = new Notice();
-//        notice.setType(1);
-//        notice.setContent(LocalDate.now().getYear() +
-//                "年"+
-//                LocalDate.now().getMonth().getValue()+
-//                "月"+
-//                "项目进展未填写");
-//        noticeService.save(notice);
-//    }
+    @Scheduled(cron = "0 0 0 1 * ?")
+    private void configureTasks() {
+        userService.getAllZwUser(LocalDate.now().getYear() +
+                "年" +
+                LocalDate.now().getMonth().getValue() +
+                "月" +
+                "项目进展未填写", null, null, null);
+    }
 
     /**
      * 每个月1号的2点进行上个月的项目月度信息查询并进行新增
@@ -85,6 +70,7 @@ public class NoticeTiming {
 //        List<Project> pjList = projectService.djList();
 //        projectService.saveBatch(pjList);
 //    }
+
     /**
      * 定时不定期提醒
      */
@@ -94,7 +80,7 @@ public class NoticeTiming {
         SmartReminders qy = smartRemindersService.getById(1);
         //获取政务的不定时提醒
         SmartReminders zw = smartRemindersService.getById(2);
-        List<SmartDeclaration> smdList =new ArrayList<>();
+        List<SmartDeclaration> smdList = new ArrayList<>();
         //获取所有的项目
         List<BasicInformation> list = basicInformationService.list();
         List<BasicInformation> list1 = basicInformationService.list();
@@ -102,7 +88,7 @@ public class NoticeTiming {
         list.removeIf(x ->
                 !(LocalDate.now().equals(x.getEndTime().minusDays(qy.getDaysAdvance())))
         );
-        list.forEach(x->{
+        list.forEach(x -> {
             SmartDeclaration smartDeclaration = new SmartDeclaration();
             smartDeclaration.setSmartRemindersId(1L);
             smartDeclaration.setTyshxydm(x.getTyshxydm());
@@ -113,20 +99,7 @@ public class NoticeTiming {
                 !(LocalDate.now().equals(x.getEndTime().minusDays(zw.getDaysAdvance())))
         );
         //获取到所有的符合条件的政务用户
-
-        List<SysUser> sysUsers = sysUserMapper.selectUserList(new SysUser());
-        List<SysUser> collect = sysUsers.stream().filter(x -> "0".equals(x.getDelFlag()) && "0".equals(x.getStatus()))
-                .filter(y -> !CreditCodeUtil.isCreditCode(y.getUserName()))
-                .collect(Collectors.toList());
-        list1.forEach(x->{
-            for (SysUser y : collect) {
-                SmartDeclaration sd = new SmartDeclaration();
-                sd.setAlertTime(x.getEndTime().atStartOfDay());
-                sd.setSmartRemindersId(2L);
-                sd.setZwId(y.getUserId());
-                smdList.add(sd);
-            }
-        });
+        list1.forEach(x -> userService.getAllZwUser(null, null, 2L, String.valueOf(x.getEndTime().atStartOfDay())));
         smartDeclarationService.saveBatch(smdList);
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/NoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/NoticeService.java
deleted file mode 100644
index 355d22f..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/NoticeService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ruoyi.gysl.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.gysl.entity.Notice;
-
-/**
- * 项目通知(Notice)表服务接口
- *
- * @author makejava
- * @since 2025-03-23 16:34:27
- */
-public interface NoticeService extends IService<Notice> {
-
-}
-
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java
index ac98c46..1de4cd1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java
@@ -1,9 +1,8 @@
 package com.ruoyi.gysl.service;
 
+import com.ruoyi.docking.entity.SmartDeclaration;
 import com.ruoyi.gysl.entity.BasicInformation;
-import com.ruoyi.gysl.entity.Notice;
 import com.ruoyi.gysl.entity.stats.AllProjectResponse;
-import com.ruoyi.gysl.entity.stats.RibbonResponse;
 
 import java.util.List;
 
@@ -29,7 +28,7 @@ public interface QyStatsService {
     /**
      * 消息通知
      */
-    List<Notice> qyNotice(String username);
+    List<SmartDeclaration> qyNotice(String username);
 
     /**
      * 企业消息通知数量
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java
index b04f8dd..c8a07e9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.gysl.service;
 
-import com.ruoyi.gysl.entity.Notice;
+import com.ruoyi.docking.entity.SmartDeclaration;
 import com.ruoyi.gysl.entity.stats.AllProjectResponse;
 import com.ruoyi.gysl.entity.stats.RibbonResponse;
 
@@ -33,11 +33,11 @@ public interface ZwStatsService {
     /**
      * 消息通知
      */
-    List<Notice> zwNotice();
+    List<SmartDeclaration> zwNotice(Long userId);
 
     /**
      * 政务消息通知数量
      */
-    int zwNoticeCount();
+    int zwNoticeCount(Long userId);
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java
index 477def4..2f33065 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.docking.entity.SmartDeclaration;
+import com.ruoyi.docking.service.SmartDeclarationService;
+import com.ruoyi.docking.service.UserService;
 import com.ruoyi.gysl.entity.*;
 import com.ruoyi.gysl.entity.request.AuditRequest;
 import com.ruoyi.gysl.entity.request.BasicInformationPageReq;
@@ -74,17 +77,19 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
      */
     @Resource
     private ProjectRemarkService projectRemarkService;
-    /**
-     * 消息通知
-     */
-    @Resource
-    private NoticeService noticeService;
+
     /**
      * 月度进展信息
      */
 //    @Resource
 //    private ProjectMonthInfoService projectMonthInfoService;
 
+    @Resource
+    private SmartDeclarationService smartDeclarationService;
+
+    @Resource
+    private UserService userService;
+
     /**
      * 项目巡礼
      */
@@ -97,6 +102,12 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
     @Resource
     private ProjectOtherInfoService otherInfoService;
 
+    /**
+     * 入驻的企业
+     */
+    @Resource
+    private EnterpriseService enterpriseService;
+
     /**
      * 分页查询所有数据
      *
@@ -287,21 +298,21 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
                 .eq(ProjectOtherInfo::getXmId, req.getBasicInformation().getId())
                 .remove();
         otherInfoService.saveBatch(req.getProjectOtherInfos());
-        Notice one = noticeService.lambdaQuery().eq(Notice::getXmId, req.getBasicInformation().getId()).one();
 
-        if (status == 2 && one != null) {
-            //修改消息
-            one.setType(1);
-            one.setContent("关于" + req.getBasicInformation().getId() + "项目,待审核的通知");
-            noticeService.updateById(one);
+        if (status == 2) {
+            userService.getAllZwUser("关于" + req.getBasicInformation().getName() + "项目,待审核的通知",
+                    req.getBasicInformation().getId(),
+                    null,
+                    null
+            );
         }
-        if (status == 3 && one != null) {
-            //修改消息
-            one.setType(2);
-            one.setContent("关于" + req.getBasicInformation().getId() + "项目,审核通过的通知");
-            noticeService.updateById(one);
+        if (status == 3) {
+            SmartDeclaration sd = new SmartDeclaration();
+            sd.setTyshxydm((req.getBasicInformation().getTyshxydm()));
+            sd.setProjectId(req.getBasicInformation().getId());
+            sd.setContent("关于" + req.getBasicInformation().getName() + "项目,审核通过的通知");
+            smartDeclarationService.save(sd);
         }
-
         return req.getBasicInformation().getId();
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/NoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/NoticeServiceImpl.java
deleted file mode 100644
index 80f85cc..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/NoticeServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.gysl.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.gysl.mapper.NoticeMapper;
-import com.ruoyi.gysl.entity.Notice;
-import com.ruoyi.gysl.service.NoticeService;
-import org.springframework.stereotype.Service;
-
-/**
- * 项目通知(Notice)表服务实现类
- *
- * @author makejava
- * @since 2025-03-23 16:34:27
- */
-@Service("noticeService")
-public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements NoticeService {
-
-}
-
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java
index 9ce54de..1c17b6b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java
@@ -1,13 +1,10 @@
 package com.ruoyi.gysl.service.impl;
 
+import com.ruoyi.docking.entity.SmartDeclaration;
 import com.ruoyi.gysl.entity.BasicInformation;
-import com.ruoyi.gysl.entity.Notice;
 import com.ruoyi.gysl.entity.stats.AllProjectResponse;
-import com.ruoyi.gysl.entity.stats.RibbonResponse;
 import com.ruoyi.gysl.mapper.QyStatsMapper;
-import com.ruoyi.gysl.mapper.ZwStatsMapper;
 import com.ruoyi.gysl.service.QyStatsService;
-import com.ruoyi.gysl.service.ZwStatsService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -45,7 +42,7 @@ public class QyStatsServiceImpl implements QyStatsService {
      * 消息通知
      */
     @Override
-    public List<Notice> qyNotice(String username) {
+    public List<SmartDeclaration> qyNotice(String username) {
         return qyStatsMapper.qyNotice(username);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java
index e3c5909..53db98b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.gysl.service.impl;
 
-import com.ruoyi.gysl.entity.Notice;
+import com.ruoyi.docking.entity.SmartDeclaration;
 import com.ruoyi.gysl.entity.stats.AllProjectResponse;
 import com.ruoyi.gysl.entity.stats.RibbonResponse;
 import com.ruoyi.gysl.mapper.ZwStatsMapper;
@@ -49,15 +49,15 @@ public class ZwStatsServiceImpl implements ZwStatsService {
      * 消息通知
      */
     @Override
-    public List<Notice> zwNotice() {
-        return zwStatsMapper.zwNotice();
+    public List<SmartDeclaration> zwNotice(Long userId) {
+        return zwStatsMapper.zwNotice(userId);
     }
 
     /**
      * 政务消息通知数量
      */
     @Override
-    public int zwNoticeCount() {
-        return zwStatsMapper.zwNoticeCount();
+    public int zwNoticeCount(Long userId) {
+        return zwStatsMapper.zwNoticeCount(userId);
     }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml
index acfbb2f..a945eb1 100644
--- a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml
@@ -47,9 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         c.two_and_four_cg,
         c.four_yscg
         FROM
-        basic_information a
-        LEFT JOIN plan_information b ON a.id = b.xm_id
-        LEFT JOIN building_information c ON a.id = c.xm_id
+        gysl_basic_information a
+        LEFT JOIN gysl_plan_information b ON a.id = b.xm_id
+        LEFT JOIN gysl_building_information c ON a.id = c.xm_id
         WHERE
         a.id IN
         <foreach collection="idList" item="item" open="(" separator="," close=")">
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="page" resultType="com.ruoyi.gysl.entity.BasicInformation">
         SELECT a.*,b.zydmj
-        FROM basic_information a left join plan_information b on a.id = b.xm_id
+        FROM gysl_basic_information a left join gysl_plan_information b on a.id = b.xm_id
         <where>
             <if test="req.name != null and req.name != ''">
                 AND a.name like concat('%',#{req.name},'%')
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND a.xmfrdwxz like concat('%',#{req.xmfrdwxz},'%')
             </if>
             <if test="req.name != null and req.name != ''">
-                AND a.xzfl = #{req.name}
+                AND a.xzfl = #{req.xzfl}
             </if>
             <if test="req.startTime != null">
                 AND a.begain_time &gt;= #{req.startTime}  <!-- 大于等于 -->
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="projectList" resultType="com.ruoyi.gysl.entity.BasicInformation">
         SELECT a.*,
             ROUND( IFNULL( SUM( b.zjzmj ), 0 ) / 10000, 2 ) AS zjzmj
-        FROM basic_information a left join plan_information b on a.id = b.xm_id
+        FROM gysl_basic_information a left join gysl_plan_information b on a.id = b.xm_id
         where a.longitude is not null and a.latitude is not null
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml
index 3a285eb..92874f7 100644
--- a/ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.ruoyi.gysl.mapper.BuildingInformationMapper">
 
     <select id="selectAll" resultType="com.ruoyi.gysl.entity.BuildingInformation">
-        select * from building_information
+        select * from gysl_building_information
         <where>
             <if test="req.xmId != null and req.xmId != ''">
                 AND xm_id = #{req.xmId}
diff --git a/ruoyi-admin/src/main/resources/mapper/DpclglMapper.xml b/ruoyi-admin/src/main/resources/mapper/DpclglMapper.xml
index 9d01abd..69d9f44 100644
--- a/ruoyi-admin/src/main/resources/mapper/DpclglMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/DpclglMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gysl.mapper.DpclglMapper">
     <select id="page" resultType="com.ruoyi.gysl.entity.Dpclgl">
-        select * from ml
+        select * from gysl_ml
         <where>
             <if test="req.fileTitle != null and req.fileTitle != '' ">
                 AND fileTitle like concat('%',#{req.fileTitle},'%')
diff --git a/ruoyi-admin/src/main/resources/mapper/EnterpriseMapper.xml b/ruoyi-admin/src/main/resources/mapper/EnterpriseMapper.xml
index d9bf7a5..6fa29a6 100644
--- a/ruoyi-admin/src/main/resources/mapper/EnterpriseMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/EnterpriseMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gysl.mapper.EnterpriseMapper">
     <select id="page" resultType="com.ruoyi.gysl.entity.Enterprise">
-        select * from enterprise
+        select * from gysl_enterprise
         <where>
             <if test="req.xmId != null and req.xmId != ''">
                 AND xm_id = #{req.xmId}
diff --git a/ruoyi-admin/src/main/resources/mapper/MlMapper.xml b/ruoyi-admin/src/main/resources/mapper/MlMapper.xml
index 4312e8b..eec0c64 100644
--- a/ruoyi-admin/src/main/resources/mapper/MlMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/MlMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gysl.mapper.MlMapper">
     <select id="page" resultType="com.ruoyi.gysl.entity.Ml">
-        select * from ml
+        select * from gysl_ml
         <where>
             <if test="req.slmllb != null">
                 AND slmllb = #{req.slmllb}
diff --git a/ruoyi-admin/src/main/resources/mapper/NoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/NoticeMapper.xml
deleted file mode 100644
index efc8d37..0000000
--- a/ruoyi-admin/src/main/resources/mapper/NoticeMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.gysl.mapper.NoticeMapper">
-</mapper>
-
diff --git a/ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml b/ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml
index 6d1e3d9..910f28a 100644
--- a/ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gysl.mapper.PjpzMapper">
     <select id="page" resultType="com.ruoyi.gysl.entity.Pjpz">
-        select * from pjpz
+        select * from gysl_pjpz
         <where>
             <if test="req.pjys != null and req.pjys != ''">
                 AND pjys like concat('%',#{req.pjys},'%')
diff --git a/ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml
index 1427e6d..2f74210 100644
--- a/ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectAll" resultType="com.ruoyi.gysl.entity.PlanInformation">
         SELECT *
-        FROM plan_information
+        FROM gysl_plan_information
         <where>
             <if test="req.xmId != null and req.xmId != ''">
                 AND xm_id = #{req.xmId}
diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml
index b335771..6a8d36f 100644
--- a/ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.ruoyi.gysl.mapper.ProjectLegendMapper">
 
     <select id="page" resultType="com.ruoyi.gysl.entity.ProjectLegend">
-        select * from project_legend
+        select * from gysl_project_legend
         <where>
             <if test="req.xmId != null and req.xmId != ''">
                 AND xm_id = #{req.xmId}
diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectMapper.xml
index 6dc2ba0..9b98443 100644
--- a/ruoyi-admin/src/main/resources/mapper/ProjectMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/ProjectMapper.xml
@@ -1,99 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.docking.dao.ProjectMapper">
-
-    <resultMap type="com.ruoyi.docking.entity.Project" id="ProjectMap">
-        <result property="projectId" column="project_id" jdbcType="INTEGER"/>
-        <result property="projectName" column="project_name" jdbcType="VARCHAR"/>
-        <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
-        <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
-        <result property="companyTime" column="company_time" jdbcType="VARCHAR"/>
-        <result property="agentCompanyId" column="agent_company_id" jdbcType="VARCHAR"/>
-        <result property="agentCompanyName" column="agent_company_name" jdbcType="VARCHAR"/>
-        <result property="contactName" column="contact_name" jdbcType="VARCHAR"/>
-        <result property="contactPhone" column="contact_phone" jdbcType="VARCHAR"/>
-        <result property="projectType" column="project_type" jdbcType="VARCHAR"/>
-        <result property="organizationId" column="organization_id" jdbcType="VARCHAR"/>
-        <result property="subOrganizationId" column="sub_organization_id" jdbcType="VARCHAR"/>
-        <result property="zsOrganizationId" column="zs_organization_id" jdbcType="VARCHAR"/>
-        <result property="typeId" column="type_id" jdbcType="VARCHAR"/>
-        <result property="secondTypeId" column="second_type_id" jdbcType="VARCHAR"/>
-        <result property="thirdTypeId" column="third_type_id" jdbcType="VARCHAR"/>
-        <result property="ssTypeId" column="ss_type_id" jdbcType="VARCHAR"/>
-        <result property="areaId" column="area_id" jdbcType="VARCHAR"/>
-        <result property="address" column="address" jdbcType="VARCHAR"/>
-        <result property="lat" column="lat" jdbcType="VARCHAR"/>
-        <result property="lng" column="lng" jdbcType="VARCHAR"/>
-        <result property="actualStartTime" column="actual_start_time" jdbcType="VARCHAR"/>
-        <result property="actualEndTime" column="actual_end_time" jdbcType="VARCHAR"/>
-        <result property="jgysStatus" column="jgys_status" jdbcType="VARCHAR"/>
-        <result property="tctyStatus" column="tcty_status" jdbcType="VARCHAR"/>
-        <result property="operationTime" column="operation_time" jdbcType="VARCHAR"/>
-        <result property="investmentType" column="investment_type" jdbcType="VARCHAR"/>
-        <result property="investmentEntity" column="investment_entity" jdbcType="VARCHAR"/>
-        <result property="investmentEntityType" column="investment_entity_type" jdbcType="VARCHAR"/>
-        <result property="thumbnail" column="thumbnail" jdbcType="VARCHAR"/>
-        <result property="remark" column="remark" jdbcType="VARCHAR"/>
-        <result property="status" column="status" jdbcType="VARCHAR"/>
-        <result property="reviewStep" column="review_step" jdbcType="INTEGER"/>
-        <result property="reviewObject" column="review_object" jdbcType="INTEGER"/>
-        <result property="reviewResult" column="review_result" jdbcType="INTEGER"/>
-        <result property="progressContent" column="progress_content" jdbcType="VARCHAR"/>
-        <result property="progressUpdateAt" column="progress_update_at" jdbcType="INTEGER"/>
-        <result property="extProjectId" column="ext_project_id" jdbcType="VARCHAR"/>
-        <result property="stzProjectId" column="stz_project_id" jdbcType="VARCHAR"/>
-        <result property="sgxkProjectId" column="sgxk_project_id" jdbcType="VARCHAR"/>
-        <result property="ydghProjectId" column="ydgh_project_id" jdbcType="INTEGER"/>
-        <result property="gcghProjectId" column="gcgh_project_id" jdbcType="INTEGER"/>
-        <result property="hpProjectId" column="hp_project_id" jdbcType="INTEGER"/>
-        <result property="genProjectId" column="gen_project_id" jdbcType="VARCHAR"/>
-        <result property="landId" column="land_id" jdbcType="VARCHAR"/>
-        <result property="zdxmProjectId" column="zdxm_project_id" jdbcType="VARCHAR"/>
-        <result property="ybjbProjectId" column="ybjb_project_id" jdbcType="VARCHAR"/>
-        <result property="landingTime" column="landing_time" jdbcType="VARCHAR"/>
-        <result property="landing" column="landing" jdbcType="INTEGER"/>
-        <result property="dimensionIds" column="dimension_ids" jdbcType="VARCHAR"/>
-        <result property="headquarterIds" column="headquarter_ids" jdbcType="VARCHAR"/>
-        <result property="jgysbaId" column="jgysba_id" jdbcType="INTEGER"/>
-        <result property="npId" column="np_id" jdbcType="INTEGER"/>
-        <result property="xfysId" column="xfys_id" jdbcType="INTEGER"/>
-        <result property="isDisabled" column="is_disabled" jdbcType="INTEGER"/>
-        <result property="isStats" column="is_stats" jdbcType="INTEGER"/>
-        <result property="isDraft" column="is_draft" jdbcType="INTEGER"/>
-        <result property="createdAt" column="created_at" jdbcType="INTEGER"/>
-        <result property="updatedAt" column="updated_at" jdbcType="INTEGER"/>
-        <result property="createdBy" column="created_by" jdbcType="VARCHAR"/>
-        <result property="isDeleted" column="is_deleted" jdbcType="INTEGER"/>
-        <result property="landNo" column="land_no" jdbcType="VARCHAR"/>
-        <result property="landUsage" column="land_usage" jdbcType="VARCHAR"/>
-        <result property="landArea" column="land_area" jdbcType="VARCHAR"/>
-        <result property="landAddress" column="land_address" jdbcType="VARCHAR"/>
-        <result property="landStartDate" column="land_start_date" jdbcType="VARCHAR"/>
-        <result property="landEndDate" column="land_end_date" jdbcType="VARCHAR"/>
-        <result property="landObligeeName" column="land_obligee_name" jdbcType="VARCHAR"/>
-        <result property="landApproveTime" column="land_approve_time" jdbcType="VARCHAR"/>
-        <result property="homeDisplay" column="home_display" jdbcType="INTEGER"/>
-        <result property="installment" column="installment" jdbcType="INTEGER"/>
-        <result property="installmentNum" column="installment_num" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <!-- 批量插入 -->
-    <insert id="insertBatch" keyProperty="projectId" useGeneratedKeys="true">
-        insert into gysl.project(project_namecompany_idcompany_namecompany_timeagent_company_idagent_company_namecontact_namecontact_phoneproject_typeorganization_idsub_organization_idzs_organization_idtype_idsecond_type_idthird_type_idss_type_idarea_idaddresslatlngactual_start_timeactual_end_timejgys_statustcty_statusoperation_timeinvestment_typeinvestment_entityinvestment_entity_typethumbnailremarkstatusreview_stepreview_objectreview_resultprogress_contentprogress_update_atext_project_idstz_project_idsgxk_project_idydgh_project_idgcgh_project_idhp_project_idgen_project_idland_idzdxm_project_idybjb_project_idlanding_timelandingdimension_idsheadquarter_idsjgysba_idnp_idxfys_idis_disabledis_statsis_draftcreated_atupdated_atcreated_byis_deletedland_noland_usageland_arealand_addressland_start_dateland_end_dateland_obligee_nameland_approve_timehome_displayinstallmentinstallment_num)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-        (#{entity.projectName}#{entity.companyId}#{entity.companyName}#{entity.companyTime}#{entity.agentCompanyId}#{entity.agentCompanyName}#{entity.contactName}#{entity.contactPhone}#{entity.projectType}#{entity.organizationId}#{entity.subOrganizationId}#{entity.zsOrganizationId}#{entity.typeId}#{entity.secondTypeId}#{entity.thirdTypeId}#{entity.ssTypeId}#{entity.areaId}#{entity.address}#{entity.lat}#{entity.lng}#{entity.actualStartTime}#{entity.actualEndTime}#{entity.jgysStatus}#{entity.tctyStatus}#{entity.operationTime}#{entity.investmentType}#{entity.investmentEntity}#{entity.investmentEntityType}#{entity.thumbnail}#{entity.remark}#{entity.status}#{entity.reviewStep}#{entity.reviewObject}#{entity.reviewResult}#{entity.progressContent}#{entity.progressUpdateAt}#{entity.extProjectId}#{entity.stzProjectId}#{entity.sgxkProjectId}#{entity.ydghProjectId}#{entity.gcghProjectId}#{entity.hpProjectId}#{entity.genProjectId}#{entity.landId}#{entity.zdxmProjectId}#{entity.ybjbProjectId}#{entity.landingTime}#{entity.landing}#{entity.dimensionIds}#{entity.headquarterIds}#{entity.jgysbaId}#{entity.npId}#{entity.xfysId}#{entity.isDisabled}#{entity.isStats}#{entity.isDraft}#{entity.createdAt}#{entity.updatedAt}#{entity.createdBy}#{entity.isDeleted}#{entity.landNo}#{entity.landUsage}#{entity.landArea}#{entity.landAddress}#{entity.landStartDate}#{entity.landEndDate}#{entity.landObligeeName}#{entity.landApproveTime}#{entity.homeDisplay}#{entity.installment}#{entity.installmentNum})
-        </foreach>
-    </insert>
-    <!-- 批量插入或按主键更新 -->
-    <insert id="insertOrUpdateBatch" keyProperty="projectId" useGeneratedKeys="true">
-        insert into gysl.project(project_namecompany_idcompany_namecompany_timeagent_company_idagent_company_namecontact_namecontact_phoneproject_typeorganization_idsub_organization_idzs_organization_idtype_idsecond_type_idthird_type_idss_type_idarea_idaddresslatlngactual_start_timeactual_end_timejgys_statustcty_statusoperation_timeinvestment_typeinvestment_entityinvestment_entity_typethumbnailremarkstatusreview_stepreview_objectreview_resultprogress_contentprogress_update_atext_project_idstz_project_idsgxk_project_idydgh_project_idgcgh_project_idhp_project_idgen_project_idland_idzdxm_project_idybjb_project_idlanding_timelandingdimension_idsheadquarter_idsjgysba_idnp_idxfys_idis_disabledis_statsis_draftcreated_atupdated_atcreated_byis_deletedland_noland_usageland_arealand_addressland_start_dateland_end_dateland_obligee_nameland_approve_timehome_displayinstallmentinstallment_num)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.projectName}#{entity.companyId}#{entity.companyName}#{entity.companyTime}#{entity.agentCompanyId}#{entity.agentCompanyName}#{entity.contactName}#{entity.contactPhone}#{entity.projectType}#{entity.organizationId}#{entity.subOrganizationId}#{entity.zsOrganizationId}#{entity.typeId}#{entity.secondTypeId}#{entity.thirdTypeId}#{entity.ssTypeId}#{entity.areaId}#{entity.address}#{entity.lat}#{entity.lng}#{entity.actualStartTime}#{entity.actualEndTime}#{entity.jgysStatus}#{entity.tctyStatus}#{entity.operationTime}#{entity.investmentType}#{entity.investmentEntity}#{entity.investmentEntityType}#{entity.thumbnail}#{entity.remark}#{entity.status}#{entity.reviewStep}#{entity.reviewObject}#{entity.reviewResult}#{entity.progressContent}#{entity.progressUpdateAt}#{entity.extProjectId}#{entity.stzProjectId}#{entity.sgxkProjectId}#{entity.ydghProjectId}#{entity.gcghProjectId}#{entity.hpProjectId}#{entity.genProjectId}#{entity.landId}#{entity.zdxmProjectId}#{entity.ybjbProjectId}#{entity.landingTime}#{entity.landing}#{entity.dimensionIds}#{entity.headquarterIds}#{entity.jgysbaId}#{entity.npId}#{entity.xfysId}#{entity.isDisabled}#{entity.isStats}#{entity.isDraft}#{entity.createdAt}#{entity.updatedAt}#{entity.createdBy}#{entity.isDeleted}#{entity.landNo}#{entity.landUsage}#{entity.landArea}#{entity.landAddress}#{entity.landStartDate}#{entity.landEndDate}#{entity.landObligeeName}#{entity.landApproveTime}#{entity.homeDisplay}#{entity.installment}#{entity.installmentNum})
-        </foreach>
-        on duplicate key update
-project_name = values(project_name) company_id = values(company_id) company_name = values(company_name) company_time = values(company_time) agent_company_id = values(agent_company_id) agent_company_name = values(agent_company_name) contact_name = values(contact_name) contact_phone = values(contact_phone) project_type = values(project_type) organization_id = values(organization_id) sub_organization_id = values(sub_organization_id) zs_organization_id = values(zs_organization_id) type_id = values(type_id) second_type_id = values(second_type_id) third_type_id = values(third_type_id) ss_type_id = values(ss_type_id) area_id = values(area_id) address = values(address) lat = values(lat) lng = values(lng) actual_start_time = values(actual_start_time) actual_end_time = values(actual_end_time) jgys_status = values(jgys_status) tcty_status = values(tcty_status) operation_time = values(operation_time) investment_type = values(investment_type) investment_entity = values(investment_entity) investment_entity_type = values(investment_entity_type) thumbnail = values(thumbnail) remark = values(remark) status = values(status) review_step = values(review_step) review_object = values(review_object) review_result = values(review_result) progress_content = values(progress_content) progress_update_at = values(progress_update_at) ext_project_id = values(ext_project_id) stz_project_id = values(stz_project_id) sgxk_project_id = values(sgxk_project_id) ydgh_project_id = values(ydgh_project_id) gcgh_project_id = values(gcgh_project_id) hp_project_id = values(hp_project_id) gen_project_id = values(gen_project_id) land_id = values(land_id) zdxm_project_id = values(zdxm_project_id) ybjb_project_id = values(ybjb_project_id) landing_time = values(landing_time) landing = values(landing) dimension_ids = values(dimension_ids) headquarter_ids = values(headquarter_ids) jgysba_id = values(jgysba_id) np_id = values(np_id) xfys_id = values(xfys_id) is_disabled = values(is_disabled) is_stats = values(is_stats) is_draft = values(is_draft) created_at = values(created_at) updated_at = values(updated_at) created_by = values(created_by) is_deleted = values(is_deleted) land_no = values(land_no) land_usage = values(land_usage) land_area = values(land_area) land_address = values(land_address) land_start_date = values(land_start_date) land_end_date = values(land_end_date) land_obligee_name = values(land_obligee_name) land_approve_time = values(land_approve_time) home_display = values(home_display) installment = values(installment) installment_num = values(installment_num)     </insert>
+<mapper namespace="com.ruoyi.docking.mapper.ProjectMapper">
 
 </mapper>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml
index a161864..1bc57b6 100644
--- a/ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.ruoyi.gysl.mapper.ProjectOtherInfoMapper">
 
     <select id="searchId" resultType="com.ruoyi.gysl.entity.ProjectOtherInfo">
-        select * from project_other_info
+        select * from gysl_project_other_info
         where xm_id = #{req.xmId}
     </select>
 </mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectProgressMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectProgressMapper.xml
index fd21d3a..53067f6 100644
--- a/ruoyi-admin/src/main/resources/mapper/ProjectProgressMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/ProjectProgressMapper.xml
@@ -7,7 +7,7 @@
         FROM
             project_progress a
                 LEFT JOIN project b ON a.project_id = b.project_id
-                LEFT JOIN basic_information c ON b.company_id = c.tyshxydm
+                LEFT JOIN gysl_basic_information c ON b.company_id = c.tyshxydm
         where c.id = #{req.xmId}
     </select>
 </mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml
index 290bdce..50017b2 100644
--- a/ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gysl.mapper.ProjectRemarkMapper">
     <select id="list" resultType="com.ruoyi.gysl.entity.ProjectRemark">
-       select * from project_remark
+       select * from gysl_project_remark
         <where>
             <if test="req.xmId != null and req.xmId != ''">
                 AND xm_id = #{req.xmId}
diff --git a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml
index 64472f2..826812d 100644
--- a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml
@@ -22,20 +22,21 @@
                        SUM(CASE WHEN a.xzfl = 2 AND YEAR ( a.create_time ) = YEAR ( CURRENT_DATE ()) THEN 1 ELSE 0 END ),
                        0
                )                                                                             AS currentYearBuilding2
-        FROM basic_information a
-                 LEFT JOIN plan_information b ON a.id = b.xm_id
+        FROM gysl_basic_information a
+                 LEFT JOIN gysl_plan_information b ON a.id = b.xm_id
         where a.tyshxydm = #{userName}
     </select>
     <select id="relationalProject" resultType="com.ruoyi.gysl.entity.BasicInformation">
 
     </select>
-    <select id="qyNotice" resultType="com.ruoyi.gysl.entity.Notice">
-         select * from notice
-         where tyshxydm = #{username} and type = 2
+    <select id="qyNotice" resultType="com.ruoyi.docking.entity.SmartDeclaration">
+        select * from gysl_smart_declaration
+        where tyshxydm = #{username} and is_read = 1
     </select>
     <select id="qyNoticeCount" resultType="java.lang.Integer">
-        select count(*) from notice
-        where tyshxydm = #{username} and type = 2
+        select count(*) from gysl_smart_declaration
+        where tyshxydm = #{username} and is_read = 1
     </select>
+
 </mapper>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml
index f984207..d354080 100644
--- a/ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gysl.mapper.QyrzInformationMapper">
     <select id="selectAll" resultType="com.ruoyi.gysl.entity.QyrzInformation">
-            select * from qyrz_information
+            select * from gysl_qyrz_information
             <where>
                 <if test="req.xmId != null and req.xmId != ''">
                     AND xm_id = #{req.xmId}
diff --git a/ruoyi-admin/src/main/resources/mapper/SmartDeclarationMapper.xml b/ruoyi-admin/src/main/resources/mapper/SmartDeclarationMapper.xml
index 49ad742..8aa804a 100644
--- a/ruoyi-admin/src/main/resources/mapper/SmartDeclarationMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/SmartDeclarationMapper.xml
@@ -2,33 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.docking.mapper.SmartDeclarationMapper">
 
-    <resultMap type="com.ruoyi.docking.entity.SmartDeclaration" id="SmartDeclarationMap">
-        <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="smartRemindersId" column="smart_reminders_id" jdbcType="INTEGER"/>
-        <result property="isRead" column="is_read" jdbcType="INTEGER"/>
-        <result property="tyshxydm" column="tyshxydm" jdbcType="VARCHAR"/>
-        <result property="projectId" column="project_id" jdbcType="INTEGER"/>
-        <result property="alertTime" column="alert_time" jdbcType="TIMESTAMP"/>
-        <result property="zwId" column="zw_id" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <!-- 批量插入 -->
-    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into gysl.smart_declaration(smart_reminders_idis_readtyshxydmproject_idalert_timezw_id)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-        (#{entity.smartRemindersId}#{entity.isRead}#{entity.tyshxydm}#{entity.projectId}#{entity.alertTime}#{entity.zwId})
-        </foreach>
-    </insert>
-    <!-- 批量插入或按主键更新 -->
-    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into gysl.smart_declaration(smart_reminders_idis_readtyshxydmproject_idalert_timezw_id)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.smartRemindersId}#{entity.isRead}#{entity.tyshxydm}#{entity.projectId}#{entity.alertTime}#{entity.zwId})
-        </foreach>
-        on duplicate key update
-smart_reminders_id = values(smart_reminders_id) is_read = values(is_read) tyshxydm = values(tyshxydm) project_id = values(project_id) alert_time = values(alert_time) zw_id = values(zw_id)     </insert>
 
 </mapper>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/SmartRemindersMapper.xml b/ruoyi-admin/src/main/resources/mapper/SmartRemindersMapper.xml
index b8c083b..4fac454 100644
--- a/ruoyi-admin/src/main/resources/mapper/SmartRemindersMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/SmartRemindersMapper.xml
@@ -3,9 +3,10 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.docking.mapper.SmartRemindersMapper">
+
     <select id="page" resultType="com.ruoyi.docking.entity.SmartReminders">
         select a.*
-        from smart_reminders a
+        from gysl_smart_reminders a
         <where>
             <if test="req.rulesName != null and req.rulesName != '' ">
                 and a.rules_name = #{req.rulesName}
@@ -22,4 +23,7 @@
     <select id="selectJobSmart" resultType="com.ruoyi.docking.entity.request.JAddJobSmart">
         select * from job_smart where smart_id = #{id}
     </select>
+    <update id="isRead">
+        update smart_declaration set is_read = 2 where id = #{id}
+    </update>
 </mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml b/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml
index 9bc6d7b..db6e228 100644
--- a/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gysl.mapper.WysmxInformationMapper">
     <select id="list" resultType="com.ruoyi.gysl.entity.WysmxInformation">
-        select * from wysmx_information
+        select * from gysl_wysmx_information
         <where>
             <if test="req.xmId != null and req.xmId != ''">
                 AND xm_id = #{req.xmId}
diff --git a/ruoyi-admin/src/main/resources/mapper/WysmxInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/WysmxInformationMapper.xml
index 82c7ebd..8e6887f 100644
--- a/ruoyi-admin/src/main/resources/mapper/WysmxInformationMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/WysmxInformationMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.gysl.mapper.WysmxInformationDao">
+<mapper namespace="com.ruoyi.gysl.mapper.WysmxInformationMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/XfcyglMapper.xml b/ruoyi-admin/src/main/resources/mapper/XfcyglMapper.xml
index 35bfdb6..af73725 100644
--- a/ruoyi-admin/src/main/resources/mapper/XfcyglMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/XfcyglMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gysl.mapper.XfcyglMapper">
     <select id="page" resultType="com.ruoyi.gysl.entity.Xfcygl">
-        select * from xfcygl
+        select * from gysl_xfcygl
         <where>
             <if test="req.cylb != null and req.cylb!= ''">
                 AND cylb like concat('%',#{req.cylb},'%')
diff --git a/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml
index 78e9906..02cbbf2 100644
--- a/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml
@@ -12,7 +12,7 @@
         a.xmfrdwxz,
         a.ztze,
         COUNT(*) OVER () AS count
-        FROM basic_information a
+        FROM gysl_basic_information a
         <where>
             <if test="req.xzfl != null">
                 AND xzfl = #{req.xzfl}
@@ -50,7 +50,7 @@
             a.ztze,
             COUNT(*) OVER () AS total_count
             FROM
-            basic_information a
+            gysl_basic_information a
             GROUP BY
             a.id
             ) c
@@ -60,7 +60,7 @@
     <select id="oneXmhx" resultType="com.ruoyi.gysl.entity.response.XmhxDetail.XmhxDetail">
         select ztze as pjpm,
             '总投资额' as ysmc
-        from basic_information
+        from gysl_basic_information
         where id = #{id}
     </select>
     <select id="zwsXmhx" resultType="com.ruoyi.gysl.entity.response.XmhxDetail.XmhxDetail">
@@ -71,7 +71,7 @@
                      ztze,
                      ROW_NUMBER() OVER (ORDER BY ztze) AS row_num,
                          COUNT(*) OVER () AS total_rows
-                 FROM basic_information
+                 FROM gysl_basic_information
              ) AS ranked
         WHERE row_num IN (
             (total_rows + 1) DIV 2,
@@ -81,7 +81,7 @@
     <select id="maxXmhx" resultType="com.ruoyi.gysl.entity.response.XmhxDetail.XmhxDetail">
         select MAX(ztze) as pjpm,
                '总投资额' as ysmc
-        from basic_information
+        from gysl_basic_information
     </select>
 </mapper>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml
index 4792008..32a0d44 100644
--- a/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gysl.mapper.XmxlMapper">
     <select id="list" resultType="com.ruoyi.gysl.entity.Xmxl">
-        select * from xmxl
+        select * from gysl_xmxl
         <where>
             <if test="req.xmId != null and req.xmId != ''">
                 AND xm_id = #{req.xmId}
diff --git a/ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml
index 3121d36..b4b7097 100644
--- a/ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gysl.mapper.XmzskMapper">
     <select id="page" resultType="com.ruoyi.gysl.entity.Xmzsk">
-        select * from xmzsk
+        select * from gysl_xmzsk
         <where>
             <if test="req.name != null and req.name != ''">
                 AND name like concat('%',#{req.name},'%')
diff --git a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml
index f73017e..0661766 100644
--- a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml
@@ -22,30 +22,31 @@
                        SUM(CASE WHEN a.xzfl = 2 AND YEAR ( a.create_time ) = YEAR ( CURRENT_DATE ()) THEN 1 ELSE 0 END ),
                        0
                )                                                                             AS currentYearBuilding2
-        FROM basic_information a
-                 LEFT JOIN plan_information b ON a.id = b.xm_id
+        FROM gysl_basic_information a
+                 LEFT JOIN gysl_plan_information b ON a.id = b.xm_id
     </select>
     <select id="ribbon" resultType="com.ruoyi.gysl.entity.stats.RibbonResponse">
         SELECT count(*) AS count,ssgnq
         FROM
-            basic_information
+            gysl_basic_information
+        where ssgnq is not null
         GROUP BY
             ssgnq
     </select>
     <select id="investors" resultType="com.ruoyi.gysl.entity.stats.RibbonResponse">
         SELECT count(*) AS count,nature
         FROM
-            basic_information
+            gysl_basic_information
         GROUP BY
             nature
     </select>
-    <select id="zwNotice" resultType="com.ruoyi.gysl.entity.Notice">
-        select * from notice
-        where  type = 1 and is_read = 0
+    <select id="zwNotice" resultType="com.ruoyi.docking.entity.SmartDeclaration">
+        select * from gysl_smart_declaration
+        where zw_id = #{userId} and is_read = 1
     </select>
     <select id="zwNoticeCount" resultType="java.lang.Integer">
-        select count(*) from notice
-        where  type = 1 and is_read = 0
+        select count(*) from gysl_smart_declaration
+        where zw_id = #{userId} and is_read = 1
     </select>
 </mapper>