diff --git a/pom.xml b/pom.xml
index 5655ede..9b016a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,9 +20,18 @@
       <artifactId>zcloud_gbscommon</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>com.alibaba.cloud</groupId>
+      <artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
+    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>com.jjb.saas</groupId>
+        <artifactId>jjb-saas-system-client</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+      </dependency>
       <!--Project modules-->
       <dependency>
         <groupId>com.zcloud.accident</groupId>
diff --git a/start/src/main/java/com/zcloud/accident/Application.java b/start/src/main/java/com/zcloud/accident/Application.java
index 8f363c4..19eea32 100644
--- a/start/src/main/java/com/zcloud/accident/Application.java
+++ b/start/src/main/java/com/zcloud/accident/Application.java
@@ -1,7 +1,11 @@
 package com.zcloud.accident;
 
 import com.jjb.saas.base.starter.bootstart.JJBSpringbootApplication;
+import com.jjb.saas.framework.event.consumer.EnableConsumer;
 import org.springframework.boot.SpringApplication;
+import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.cloud.stream.messaging.Sink;
+import org.springframework.cloud.stream.messaging.Source;
 
 /**
  * Spring Boot Starter
diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml
index d921869..ecc8aa4 100644
--- a/start/src/main/resources/bootstrap.yml
+++ b/start/src/main/resources/bootstrap.yml
@@ -4,3 +4,5 @@ spring:
       - classpath:nacos.yml
       - classpath:sdk.yml
       - classpath:swagger.yml
+server:
+  port: 8085
diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml
index 4d4fd61..f11dca0 100644
--- a/start/src/main/resources/nacos.yml
+++ b/start/src/main/resources/nacos.yml
@@ -20,7 +20,7 @@ spring:
         file-extension: yml
         shared-configs:
           - config-common.yml
-          - config-port.yml
+#          - config-port.yml
           - config-mq.yml
           - config-log.yml
           - config-sdk-server.yml
diff --git a/web-adapter/pom.xml b/web-adapter/pom.xml
index 9cb0c83..0895e61 100644
--- a/web-adapter/pom.xml
+++ b/web-adapter/pom.xml
@@ -17,10 +17,6 @@
             <groupId>com.jjb.saas</groupId>
             <artifactId>jjb-saas-framework-adapter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.zcloud.accident</groupId>
diff --git a/web-adapter/src/main/java/com/zcloud/accident/web/AccidentController.java b/web-adapter/src/main/java/com/zcloud/accident/web/AccidentController.java
index e782324..8a8e957 100644
--- a/web-adapter/src/main/java/com/zcloud/accident/web/AccidentController.java
+++ b/web-adapter/src/main/java/com/zcloud/accident/web/AccidentController.java
@@ -1,6 +1,7 @@
 package com.zcloud.accident.web;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.Response;
@@ -50,13 +51,15 @@ public class AccidentController {
     @ApiOperation("新增")
     @PostMapping("/save")
     public SingleResponse<AccidentCO> add(@Validated @RequestBody AccidentAddCmd cmd) {
-        SSOUser ssoUser = AuthContext.getCurrentUser();
         return accidentService.add(cmd);
     }
 
     @ApiOperation("分页")
     @PostMapping("/list")
     public PageResponse<AccidentCO> page(@RequestBody AccidentPageQry qry) {
+        if(ObjectUtil.isNull(qry.getEqCorpinfoId())){
+            qry.setEqCorpinfoId(AuthContext.getTenantId());
+        }
         return accidentService.listPage(qry);
     }
 
@@ -94,8 +97,8 @@ public class AccidentController {
     }
 
     @ApiOperation("导出Excel")
-    @PostMapping("/export")
-    public void export(@RequestBody AccidentPageQry qry, HttpServletResponse response) throws IOException {
+    @GetMapping("/export")
+    public void export(AccidentPageQry qry, HttpServletResponse response) throws IOException {
         // 使用listAll方法获取所有符合条件的数据
         List<AccidentCO> accidentCOList = accidentService.listAll(qry);
         // 转换为导出CO
@@ -111,12 +114,5 @@ public class AccidentController {
     public MultiResponse<AccidentCountStatCO> countByCorpinfoIdAndIncidentType(@RequestBody AccidentCountQry accidentCountQry) {
         return accidentService.countByCorpinfoIdAndIncidentType(accidentCountQry);
     }
-
-    @GetMapping("/test")
-    public void test() {
-        ZcUserEvent zcUserEvent = new ZcUserEvent();
-        zcUserEvent.setName("hello world");
-        remoteEventPublisher.sendMessage(zcUserEvent,"zcloud:user:ev2" );
-    }
 }
 
diff --git a/web-app/src/main/java/com/zcloud/accident/command/query/AccidentQueryExe.java b/web-app/src/main/java/com/zcloud/accident/command/query/AccidentQueryExe.java
index c1b9d0a..2750428 100644
--- a/web-app/src/main/java/com/zcloud/accident/command/query/AccidentQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/accident/command/query/AccidentQueryExe.java
@@ -71,7 +71,7 @@ public class AccidentQueryExe {
      * @return 统计结果列表
      */
     public MultiResponse<AccidentCountStatCO> countByCorpinfoIdAndIncidentType(AccidentCountQry accidentCountQry) {
-        List<com.zcloud.accident.domain.model.AccidentCountStat> resultList = accidentGateway.countByCorpinfoIdAndIncidentType(accidentCountQry.getCorpinfoIds());
+        List<com.zcloud.accident.domain.model.AccidentCountStat> resultList = accidentGateway.countByCorpinfoIdAndIncidentType(accidentCountQry.getCorpinfoIds(),accidentCountQry.getEqAccidentType());
         List<AccidentCountStatCO> coList = accidentCountStatConvertor.convertToCOList(resultList);
         return MultiResponse.of(coList);
     }
diff --git a/web-client/src/main/java/com/zcloud/accident/dto/AccidentCountQry.java b/web-client/src/main/java/com/zcloud/accident/dto/AccidentCountQry.java
index bde4466..78582e6 100644
--- a/web-client/src/main/java/com/zcloud/accident/dto/AccidentCountQry.java
+++ b/web-client/src/main/java/com/zcloud/accident/dto/AccidentCountQry.java
@@ -8,13 +8,15 @@ import java.util.List;
 /**
  * 事故统计查询命令
  * 用于按照公司ID列表和事故类型统计事故数量
- * 
+ *
  * @Author
  * @Date
  */
 @Data
 public class AccidentCountQry extends Query {
-    
+
     @ApiModelProperty(value = "公司ID列表")
     private List<String> corpinfoIds;
-}
\ No newline at end of file
+    @ApiModelProperty(value = "类型")
+    private Integer eqAccidentType;
+}
diff --git a/web-client/src/main/java/com/zcloud/accident/dto/AccidentPageQry.java b/web-client/src/main/java/com/zcloud/accident/dto/AccidentPageQry.java
index 12c7c4f..90ca7aa 100644
--- a/web-client/src/main/java/com/zcloud/accident/dto/AccidentPageQry.java
+++ b/web-client/src/main/java/com/zcloud/accident/dto/AccidentPageQry.java
@@ -4,8 +4,10 @@ import com.alibaba.cola.dto.PageQuery;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.sql.Date;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 
@@ -27,6 +29,8 @@ public class AccidentPageQry extends PageQuery {
     * - `le`: 小于等于比较查询
     * - `ne`: 不等比较查询，对应SQL的!=操作符
     */
+    @ApiModelProperty(value = "所属企业", name = "eqCorpinfoId")
+    private Long eqCorpinfoId;
     @ApiModelProperty(value = "事故名称", name = "likeIncidentName")
     private String likeIncidentName;
     @ApiModelProperty(value = "事故地点", name = "likeLocation")
@@ -36,11 +40,13 @@ public class AccidentPageQry extends PageQuery {
     @ApiModelProperty(value = "事故级别", name = "likeIncidentLevel")
     private String eqIncidentLevel;
     @ApiModelProperty(value = "开始时间", name = "geIncidentDate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime geIncidentDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate geIncidentDate;
     @ApiModelProperty(value = "结束时间", name = "leIncidentDate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime leIncidentDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate leIncidentDate;
     @ApiModelProperty(value = "类型1事件2事故", name = "eqType")
     private Integer eqType;
 }
diff --git a/web-client/src/main/java/com/zcloud/accident/dto/clientobject/AccidentExportCO.java b/web-client/src/main/java/com/zcloud/accident/dto/clientobject/AccidentExportCO.java
index 6767a3c..56fe22f 100644
--- a/web-client/src/main/java/com/zcloud/accident/dto/clientobject/AccidentExportCO.java
+++ b/web-client/src/main/java/com/zcloud/accident/dto/clientobject/AccidentExportCO.java
@@ -45,7 +45,7 @@ public class AccidentExportCO {
 
     @ApiModelProperty(value = "事故发生时间")
     @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "事故发生时间", index = 7,format = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "事故发生时间", index = 7)
     private LocalDateTime incidentDate;
 
     @ApiModelProperty(value = "直接经济损失（万元）")
@@ -85,7 +85,8 @@ public class AccidentExportCO {
     private String measures;
 
     @ApiModelProperty(value = "报出日期")
-    @ExcelProperty(value = "报出日期", index = 17,format = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "报出日期", index = 17)
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
     private LocalDateTime reportDate;
 
 }
diff --git a/web-domain/src/main/java/com/zcloud/accident/domain/gateway/AccidentGateway.java b/web-domain/src/main/java/com/zcloud/accident/domain/gateway/AccidentGateway.java
index 64c27db..3c89ad6 100644
--- a/web-domain/src/main/java/com/zcloud/accident/domain/gateway/AccidentGateway.java
+++ b/web-domain/src/main/java/com/zcloud/accident/domain/gateway/AccidentGateway.java
@@ -27,12 +27,14 @@ public interface AccidentGateway {
     */
     Boolean deletedAccidentById(Long id);
     Boolean deletedAccidentByIds(Long[] id);
-    
+
     /**
      * 按照corpinfoId和incidentType统计个数
-     * @param corpinfoIds 公司ID列表
+     *
+     * @param corpinfoIds    公司ID列表
+     * @param eqAccidentType
      * @return 统计结果列表，包含corpinfoId、incidentType和count字段
      */
-    List<AccidentCountStat> countByCorpinfoIdAndIncidentType(List<String> corpinfoIds);
+    List<AccidentCountStat> countByCorpinfoIdAndIncidentType(List<String> corpinfoIds, Integer eqAccidentType);
 }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/accident/gatewayimpl/AccidentGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/accident/gatewayimpl/AccidentGatewayImpl.java
index 152ac81..70bb8e1 100644
--- a/web-infrastructure/src/main/java/com/zcloud/accident/gatewayimpl/AccidentGatewayImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/accident/gatewayimpl/AccidentGatewayImpl.java
@@ -1,18 +1,17 @@
 package com.zcloud.accident.gatewayimpl;
 
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.accident.domain.gateway.AccidentGateway;
 import com.zcloud.accident.domain.model.AccidentE;
 import com.zcloud.accident.domain.model.AccidentCountStat;
 import com.zcloud.accident.persistence.dataobject.AccidentDO;
 import com.zcloud.accident.persistence.repository.AccidentRepository;
-import com.zcloud.gbscommon.utils.Tools;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
 * web-infrastructure
@@ -26,8 +25,10 @@ public class AccidentGatewayImpl implements AccidentGateway {
 
     @Override
     public Boolean add(AccidentE accidentE) {
-        AccidentDO d = new AccidentDO(Tools.get32UUID());
-        BeanUtils.copyProperties(accidentE, d, "accidentId");
+        AccidentDO d = new AccidentDO();
+        BeanUtils.copyProperties(accidentE, d);
+        d.setCorpinfoId(AuthContext.getTenantId());
+        d.setCorpinfoName(AuthContext.getCurrentUser().getTenantName());
         accidentRepository.save(d);
         return true;
     }
@@ -51,8 +52,8 @@ public class AccidentGatewayImpl implements AccidentGateway {
     }
 
     @Override
-    public List<AccidentCountStat> countByCorpinfoIdAndIncidentType(List<String> corpinfoIds) {
-        return accidentRepository.countByCorpinfoIdAndIncidentType(corpinfoIds);
+    public List<AccidentCountStat> countByCorpinfoIdAndIncidentType(List<String> corpinfoIds, Integer eqAccidentType) {
+        return accidentRepository.countByCorpinfoIdAndIncidentType(corpinfoIds,eqAccidentType);
     }
 }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/accident/persistence/mapper/AccidentMapper.java b/web-infrastructure/src/main/java/com/zcloud/accident/persistence/mapper/AccidentMapper.java
index 47c1540..6347dcd 100644
--- a/web-infrastructure/src/main/java/com/zcloud/accident/persistence/mapper/AccidentMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/accident/persistence/mapper/AccidentMapper.java
@@ -18,9 +18,11 @@ public interface AccidentMapper extends BaseMapper<AccidentDO> {
 
     /**
      * 按照corpinfoId和incidentType统计个数
-     * @param corpinfoIds 公司ID列表
+     *
+     * @param corpinfoIds    公司ID列表
+     * @param eqAccidentType
      * @return 统计结果列表，包含corpinfoId、incidentType和count字段
      */
-    List<AccidentCountStat> countByCorpinfoIdAndIncidentType(@Param("corpinfoIds") List<String> corpinfoIds);
+    List<AccidentCountStat> countByCorpinfoIdAndIncidentType(@Param("corpinfoIds") List<String> corpinfoIds,@Param("eqAccidentType") Integer eqAccidentType);
 }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/accident/persistence/repository/AccidentRepository.java b/web-infrastructure/src/main/java/com/zcloud/accident/persistence/repository/AccidentRepository.java
index b4cebc7..2dc4d96 100644
--- a/web-infrastructure/src/main/java/com/zcloud/accident/persistence/repository/AccidentRepository.java
+++ b/web-infrastructure/src/main/java/com/zcloud/accident/persistence/repository/AccidentRepository.java
@@ -26,9 +26,11 @@ public interface AccidentRepository extends BaseRepository<AccidentDO> {
 
     /**
      * 按照corpinfoId和incidentType统计个数
-     * @param corpinfoIds 公司ID列表
+     *
+     * @param corpinfoIds    公司ID列表
+     * @param eqAccidentType
      * @return 统计结果列表，包含corpinfoId、incidentType和count字段
      */
-    List<AccidentCountStat> countByCorpinfoIdAndIncidentType(@Param("corpinfoIds") List<String> corpinfoIds);
+    List<AccidentCountStat> countByCorpinfoIdAndIncidentType(@Param("corpinfoIds") List<String> corpinfoIds,@Param("eqAccidentType") Integer eqAccidentType);
 }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/accident/persistence/repository/impl/AccidentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/accident/persistence/repository/impl/AccidentRepositoryImpl.java
index e1e214f..255e9d3 100644
--- a/web-infrastructure/src/main/java/com/zcloud/accident/persistence/repository/impl/AccidentRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/accident/persistence/repository/impl/AccidentRepositoryImpl.java
@@ -35,7 +35,7 @@ public class AccidentRepositoryImpl extends BaseRepositoryImpl<AccidentMapper, A
         IPage<AccidentDO> result = accidentMapper.selectPage(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
-    
+
     @Override
     public List<AccidentDO> listAll(Map<String,Object> params) {
         QueryWrapper<AccidentDO> queryWrapper = new QueryWrapper<>();
@@ -43,10 +43,10 @@ public class AccidentRepositoryImpl extends BaseRepositoryImpl<AccidentMapper, A
         queryWrapper.orderByDesc("create_time");
         return accidentMapper.selectList(queryWrapper);
     }
-    
+
     @Override
-    public List<AccidentCountStat> countByCorpinfoIdAndIncidentType(List<String> corpinfoIds) {
-        return accidentMapper.countByCorpinfoIdAndIncidentType(corpinfoIds);
+    public List<AccidentCountStat> countByCorpinfoIdAndIncidentType(List<String> corpinfoIds, Integer eqAccidentType) {
+        return accidentMapper.countByCorpinfoIdAndIncidentType(corpinfoIds,eqAccidentType);
     }
 }
 
diff --git a/web-infrastructure/src/main/resources/mapper/AccidentMapper.xml b/web-infrastructure/src/main/resources/mapper/AccidentMapper.xml
index 206501d..46b5d2e 100644
--- a/web-infrastructure/src/main/resources/mapper/AccidentMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/AccidentMapper.xml
@@ -11,6 +11,9 @@
         COUNT(*) as count
         from accident
         <where>
+            <if test="eqAccidentType != null ">
+                AND type = #{eqAccidentType}
+            </if>
             <if test="corpinfoIds != null and !corpinfoIds.isEmpty() and corpinfoIds.size()>0">
                 AND corpinfo_id IN
                 <foreach collection="corpinfoIds" item="item" open="(" separator="," close=")">