diff --git a/dl-module-base/pom.xml b/dl-module-base/pom.xml
index 8d5385a2..a6cbdc43 100644
--- a/dl-module-base/pom.xml
+++ b/dl-module-base/pom.xml
@@ -25,11 +25,18 @@
             <artifactId>yudao-module-infra-api</artifactId>
             <version>${revision}</version>
         </dependency>
+        <!-- 多租户相关 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
             <version>2.1.0-jdk8-snapshot</version>
         </dependency>
+        <!-- 数据权限 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
+            <version>2.1.0-jdk8-snapshot</version>
+        </dependency>
         <!-- Web 相关 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java b/dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java
index d4778c9b..b6b9a208 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java
@@ -25,6 +25,12 @@ public class BaseConstants {
     public static final String PASSWORD_DEFAULT = "123456";
     /**租户下部门名称*/
     public static final String DEPT_NAME_CORP_NAME = "政企客户";
+    /**计算下次保险时间*/
+    public static final String COMPUTE_TYPE_BX = "bx";
+    /**计算下次保养时间*/
+    public static final String COMPUTE_TYPE_BY = "by";
+    /**计算下次检测时间*/
+    public static final String COMPUTE_TYPE_JC = "jc";
     /**企业管理-员工管理表名称*/
     public static final String COMPANY_STAFF = "company_staff";
     /**员工标识*/
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CarMain.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CarMain.java
index 384a95e9..aed4e4c7 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CarMain.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CarMain.java
@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.custom.entity;
 
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -16,6 +18,9 @@ import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 /**
  * 车辆信息 DO
@@ -51,42 +56,50 @@ public class CarMain extends TenantBaseDO {
     /**
      * 保养日期
      */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime maintenanceDate;
     /**
      * 保养里程
      */
-    private String maintenanceMileage;
+    private BigDecimal maintenanceMileage;
     /**
      * 年检日期
      */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime inspectionDate;
     /**
      * 保险日期
      */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime insuranceDate;
     /**
      * 二级维护时间
      */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime checkDate;
     /**
      * 下次保养日期
      */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime nextMaintenanceDate;
     /**
      * 下次保养里程
      */
-    private Integer nextMaintenanceMileage;
+    private BigDecimal nextMaintenanceMileage;
     /**
      * 下次年检日期
      */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime nextInspectionDate;
     /**
      * 保险到期日期
      */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime insuranceExpiryDate;
     /**
      * 下次二级维护时间
      */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime nextCheckDate;
     /**
      * 车辆品牌
@@ -103,6 +116,7 @@ public class CarMain extends TenantBaseDO {
     /**
      * 车辆注册日期
      */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime carRegisterDate;
     /**
      * 行驶证图片
@@ -115,6 +129,7 @@ public class CarMain extends TenantBaseDO {
     /**
      * 最近办理业务的时间
      */
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime recentlyHandleBusinessTime;
 
 
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CarMainService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CarMainService.java
index 94c236db..5daf0a75 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CarMainService.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CarMainService.java
@@ -5,12 +5,14 @@ import javax.validation.*;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.custom.entity.CarMain;
+import cn.iocoder.yudao.module.custom.vo.CarBrandRespVO;
 import cn.iocoder.yudao.module.custom.vo.CarMainReqVO;
 import cn.iocoder.yudao.module.custom.vo.CarMainRespVO;
 import cn.iocoder.yudao.module.custom.vo.CustomerMainSaveReqVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -66,4 +68,15 @@ public interface CarMainService extends IService<CarMain> {
      * @return void
      **/
     void bindCustomAndCar(CarMainReqVO saveReqVO);
+
+    /**
+     * 测算车辆下一次保养/检测/保险时间
+     * @author PQZ
+     * @date 7:45 2024/8/9
+     * @param reqVO TODO
+     * @return java.time.LocalDateTime
+    **/
+    LocalDateTime compute(CarMainReqVO reqVO);
+
+
 }
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
index 10373e6f..f7c567d4 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
@@ -20,9 +20,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import static cn.iocoder.yudao.common.BaseConstants.COMPUTE_TYPE_BX;
 import static cn.iocoder.yudao.common.BaseConstants.CUS_SIGN_CAR;
 
 /**
@@ -195,6 +198,20 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
         customerCarService.bindCustomerCar(saveReqVO.getId(),CUS_SIGN_CAR,customerCars);
     }
 
+    /**
+     * 测算车辆下一次保养/检测/保险时间
+     * @author PQZ
+     * @date 7:45 2024/8/9
+     * @param reqVO CarMainReqVO
+     * @return java.time.LocalDateTime
+     **/
+    @Override
+    public LocalDateTime compute(CarMainReqVO reqVO) {
+        LocalDateTime resultTime;
+
+        return null;
+    }
+
     /**
      * 车牌号，车架号，发动机号码 查重
      * @param reqVO
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java
index dba7d736..cc30d480 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java
@@ -1,10 +1,16 @@
 package cn.iocoder.yudao.module.custom.vo;
 
+import cn.iocoder.yudao.module.custom.entity.CarMain;
 import cn.iocoder.yudao.module.label.entity.BusiLabel;
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -15,75 +21,23 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class CarMainReqVO extends PageParam {
-    @Schema(description = "主键ID")
-    private String id;
+public class CarMainReqVO extends CarMain {
 
-    @Schema(description = "发动机号码")
-    private String engineNumber;
+    @Schema(description = "页码，从 1 开始", requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
+    @NotNull(message = "页码不能为空")
+    @Min(value = 1, message = "页码最小值为 1")
+    private Integer pageNo = 1;
 
-    @Schema(description = "车架号")
-    private String vin;
+    @Schema(description = "每页条数，最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @NotNull(message = "每页条数不能为空")
+    @Min(value = 1, message = "每页条数最小值为 1")
+    @Max(value = 100, message = "每页条数最大值为 100")
+    private Integer pageSize = 10;
 
-    @Schema(description = "车牌号")
-    private String licenseNumber;
 
-    @Schema(description = "车辆型号")
-    private String carModel;
-
-    @Schema(description = "保养日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime maintenanceDate;
-
-    @Schema(description = "保养里程")
-    private String maintenanceMileage;
-
-    @Schema(description = "年检日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime inspectionDate;
-
-    @Schema(description = "保险日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime insuranceDate;
-
-    @Schema(description = "二级维护时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime checkDate;
-
-    @Schema(description = "车辆品牌")
-    private String carBrand;
-
-    @Schema(description = "车辆性质：营运 非营运等")
-    private String carNature;
-
-    @Schema(description = "车辆类别：私家车 货车 教练车 公务车 出租车")
-    private String carCategory;
-
-    @Schema(description = "车辆注册日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime carRegisterDate;
-
-    @Schema(description = "行驶证图片")
-    private String carLicenseImg;
-
-    @Schema(description = "最近办理业务")
-    private String recentlyHandledBusiness;
-
-    @Schema(description = "最近办理业务的时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime recentlyHandleBusinessTime;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime createTime;
-
-    @Schema(description = "租户ID")
-    private String tenantId;
-
-    @Schema(description = "车辆绑定客户信息")
+    /**车辆绑定客户信息*/
     private List<CustomerMainRespVO> cusList;
-
-    @Schema(description = "车辆绑定标签信息")
+    /**车辆绑定标签信息*/
     List<BusiLabel> labelList;
     /**车辆品牌型号数组*/
     List<String> brandAndModel;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java
index eb533506..6f9e3ff0 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java
@@ -18,9 +18,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 public class CarMainRespVO extends CarMain {
 
 
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
+
 
     /**是否车主（0否1是）*/
     @Schema(description = "是否车主（0否1是）")
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemRespVO.java
deleted file mode 100644
index 0a7fc4e9..00000000
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemRespVO.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package cn.iocoder.yudao.module.custom.vo;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 企业管理-资产处置子 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class PropertyDealItemRespVO {
-
-    @Schema(description = "主键标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "18095")
-    @ExcelProperty("主键标识")
-    private String id;
-
-    @Schema(description = "处置单/变动单id", example = "12936")
-    @ExcelProperty("处置单/变动单id")
-    private String dealId;
-
-    @Schema(description = "资产id", example = "14421")
-    @ExcelProperty("资产id")
-    private String propertyId;
-
-    @Schema(description = "处置方式")
-    @ExcelProperty(value = "处置方式", converter = DictConvert.class)
-    @DictFormat("company_deal_way") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private String dealWay;
-
-    @Schema(description = "原企业id", example = "17291")
-    @ExcelProperty("原企业id")
-    private String oldCorpId;
-
-    @Schema(description = "调入企业id", example = "21009")
-    @ExcelProperty("调入企业id")
-    private String corpId;
-
-    @Schema(description = "原部门id", example = "23846")
-    @ExcelProperty("原部门id")
-    private Long oldDeptId;
-
-    @Schema(description = "调入部门id", example = "3881")
-    @ExcelProperty("调入部门id")
-    private Long deptId;
-
-    @Schema(description = "原存放地id", example = "8837")
-    @ExcelProperty("原存放地id")
-    private String oldPosId;
-
-    @Schema(description = "调入存放地id", example = "28147")
-    @ExcelProperty("调入存放地id")
-    private String posId;
-
-    @Schema(description = "原使用人id", example = "23983")
-    @ExcelProperty("原使用人id")
-    private Long oldUserId;
-
-    @Schema(description = "调入使用人id", example = "918")
-    @ExcelProperty("调入使用人id")
-    private Long userId;
-
-    @Schema(description = "备注", example = "你说的对")
-    @ExcelProperty("备注")
-    private String remark;
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealRespVO.java
deleted file mode 100644
index 27c5e635..00000000
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealRespVO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cn.iocoder.yudao.module.custom.vo;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 企业管理-资产处置单/变动单 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class PropertyDealRespVO {
-
-    @Schema(description = "主键标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "29577")
-    @ExcelProperty("主键标识")
-    private String id;
-
-    @Schema(description = "企业id（base_company表中的id）", example = "21595")
-    @ExcelProperty("企业id（base_company表中的id）")
-    private String corpId;
-
-    @Schema(description = "部门id（system_dept表中的id，用来做数据权限控制）", example = "19510")
-    @ExcelProperty("部门id（system_dept表中的id，用来做数据权限控制）")
-    private Long deptId;
-
-    @Schema(description = "数据类型", example = "1")
-    @ExcelProperty(value = "数据类型", converter = DictConvert.class)
-    @DictFormat("property_data_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private String dataType;
-
-    @Schema(description = "处置/变动单号")
-    @ExcelProperty("处置/变动单号")
-    private String dealNo;
-
-    @Schema(description = "处置/变动日期")
-    @ExcelProperty("处置/变动日期")
-    private LocalDate dealDate;
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosRespVO.java
deleted file mode 100644
index dd1605d7..00000000
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosRespVO.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cn.iocoder.yudao.module.custom.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-
-@Schema(description = "管理后台 - 企业管理-资产存放位置 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class PropertyPosRespVO {
-
-    @Schema(description = "主键标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "19336")
-    @ExcelProperty("主键标识")
-    private String id;
-
-    @Schema(description = "企业id（base_company表中的id）", example = "5018")
-    @ExcelProperty("企业id（base_company表中的id）")
-    private String corpId;
-
-    @Schema(description = "部门id（system_dept表中的id，用来做数据权限控制）", example = "25943")
-    @ExcelProperty("部门id（system_dept表中的id，用来做数据权限控制）")
-    private Long deptId;
-
-    @Schema(description = "存放地名称", example = "王五")
-    @ExcelProperty("存放地名称")
-    private String posName;
-
-    @Schema(description = "存放地地址")
-    @ExcelProperty("存放地地址")
-    private String address;
-
-    @Schema(description = "面积")
-    @ExcelProperty("面积")
-    private BigDecimal area;
-
-    @Schema(description = "存放类型", example = "2")
-    @ExcelProperty(value = "存放类型", converter = DictConvert.class)
-    @DictFormat("company_deposit_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private String depositType;
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}
\ No newline at end of file
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/config/CompanyDataPermissionConfiguration.java b/dl-module-company/src/main/java/cn/iocoder/yudao/config/CompanyDataPermissionConfiguration.java
new file mode 100644
index 00000000..7141a848
--- /dev/null
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/config/CompanyDataPermissionConfiguration.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.config;
+
+import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
+import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 数据权限 Configuration
+ *
+ * @author vinjor-m
+ */
+@Configuration(proxyBeanMethods = false)
+public class CompanyDataPermissionConfiguration {
+
+    @Bean
+    public DeptDataPermissionRuleCustomizer companyDataPermissionRuleCustomizer() {
+        return rule -> {
+            // 应用部门的数据权限都有哪些表，默认dept_id
+            rule.addDeptColumn(CompanyStaff.class);
+            // 应用用户的数据权限都有哪些表和对应字段，默认creator
+//            rule.addUserColumn(CompanyStaff.class, "id");
+        };
+    }
+
+}
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyController.java
similarity index 92%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyController.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyController.java
index 80397052..0d44356d 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyController.java
@@ -1,14 +1,14 @@
-package cn.iocoder.yudao.module.custom.controller.admin;
+package cn.iocoder.yudao.module.property.controller.admin;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.custom.entity.Property;
-import cn.iocoder.yudao.module.custom.service.PropertyService;
-import cn.iocoder.yudao.module.custom.vo.PropertyReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyRespVO;
+import cn.iocoder.yudao.module.property.entity.Property;
+import cn.iocoder.yudao.module.property.service.PropertyService;
+import cn.iocoder.yudao.module.property.vo.PropertyReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyDealController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealController.java
similarity index 92%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyDealController.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealController.java
index 4a9c21d6..01cba850 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyDealController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealController.java
@@ -1,14 +1,14 @@
-package cn.iocoder.yudao.module.custom.controller.admin;
+package cn.iocoder.yudao.module.property.controller.admin;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.custom.entity.PropertyDealDO;
-import cn.iocoder.yudao.module.custom.service.PropertyDealService;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
+import cn.iocoder.yudao.module.property.service.PropertyDealService;
+import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyDealItemController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealItemController.java
similarity index 92%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyDealItemController.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealItemController.java
index 2d5418a1..e55e75b2 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyDealItemController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyDealItemController.java
@@ -1,14 +1,14 @@
-package cn.iocoder.yudao.module.custom.controller.admin;
+package cn.iocoder.yudao.module.property.controller.admin;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.custom.entity.PropertyDealItemDO;
-import cn.iocoder.yudao.module.custom.service.PropertyDealItemService;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealItemReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealItemRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
+import cn.iocoder.yudao.module.property.service.PropertyDealItemService;
+import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyKeepController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyKeepController.java
similarity index 92%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyKeepController.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyKeepController.java
index be736424..dad3e7e5 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyKeepController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyKeepController.java
@@ -1,14 +1,14 @@
-package cn.iocoder.yudao.module.custom.controller.admin;
+package cn.iocoder.yudao.module.property.controller.admin;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.custom.entity.PropertyKeep;
-import cn.iocoder.yudao.module.custom.service.PropertyKeepService;
-import cn.iocoder.yudao.module.custom.vo.PropertyKeepReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyKeepRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyKeep;
+import cn.iocoder.yudao.module.property.service.PropertyKeepService;
+import cn.iocoder.yudao.module.property.vo.PropertyKeepReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyKeepRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyPosController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyPosController.java
similarity index 92%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyPosController.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyPosController.java
index 78ed3255..42eb15f2 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/PropertyPosController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyPosController.java
@@ -1,14 +1,14 @@
-package cn.iocoder.yudao.module.custom.controller.admin;
+package cn.iocoder.yudao.module.property.controller.admin;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.custom.entity.PropertyPosDO;
-import cn.iocoder.yudao.module.custom.service.PropertyPosService;
-import cn.iocoder.yudao.module.custom.vo.PropertyPosReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyPosRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
+import cn.iocoder.yudao.module.property.service.PropertyPosService;
+import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/Property.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/Property.java
similarity index 94%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/Property.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/Property.java
index 4fa8ccdd..915e3b64 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/Property.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/Property.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.custom.entity;
+package cn.iocoder.yudao.module.property.entity;
 
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -9,6 +9,7 @@ import lombok.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 企业管理-资产 DO
@@ -28,7 +29,7 @@ public class Property extends TenantBaseDO {
     /**
      * 主键标识
      */
-    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
     /**
      * 企业id
@@ -105,7 +106,7 @@ public class Property extends TenantBaseDO {
     /**
      * 取得日期
      */
-    private LocalDate getDate;
+    private LocalDateTime getDate;
     /**
      * 出厂日期
      */
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealDO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealDO.java
similarity index 93%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealDO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealDO.java
index f41253a9..171e6742 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealDO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealDO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.custom.entity;
+package cn.iocoder.yudao.module.property.entity;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -27,7 +27,7 @@ public class PropertyDealDO extends BaseDO {
     /**
      * 主键标识
      */
-    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
     /**
      * 企业id（base_company表中的id）
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealItemDO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealItemDO.java
similarity index 94%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealItemDO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealItemDO.java
index f1edfcad..1d5419da 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealItemDO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyDealItemDO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.custom.entity;
+package cn.iocoder.yudao.module.property.entity;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -25,7 +25,7 @@ public class PropertyDealItemDO extends BaseDO {
     /**
      * 主键标识
      */
-    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
     /**
      * 处置单/变动单id
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyKeep.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyKeep.java
similarity index 92%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyKeep.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyKeep.java
index 494cc79d..91bcee8f 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyKeep.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyKeep.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.custom.entity;
+package cn.iocoder.yudao.module.property.entity;
 
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -27,7 +27,7 @@ public class PropertyKeep extends TenantBaseDO {
     /**
      * 主键标识
      */
-    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
     /**
      * 资产id
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyPosDO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyPosDO.java
similarity index 85%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyPosDO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyPosDO.java
index 8fb6bf09..f387edd8 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyPosDO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/entity/PropertyPosDO.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.custom.entity;
+package cn.iocoder.yudao.module.property.entity;
 
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -22,12 +22,12 @@ import java.math.BigDecimal;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PropertyPosDO extends BaseDO {
+public class PropertyPosDO extends TenantBaseDO {
 
     /**
      * 主键标识
      */
-    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
     /**
      * 企业id（base_company表中的id）
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyDealItemMapper.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealItemMapper.java
similarity index 63%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyDealItemMapper.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealItemMapper.java
index 5ac8fff5..99c42e7e 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyDealItemMapper.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealItemMapper.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.custom.mapper;
+package cn.iocoder.yudao.module.property.mapper;
 
-import cn.iocoder.yudao.module.custom.entity.PropertyDealItemDO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealItemReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealItemRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyDealMapper.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealMapper.java
similarity index 64%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyDealMapper.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealMapper.java
index f77d1002..47517b03 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyDealMapper.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyDealMapper.java
@@ -1,9 +1,9 @@
-package cn.iocoder.yudao.module.custom.mapper;
+package cn.iocoder.yudao.module.property.mapper;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.custom.entity.PropertyDealDO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyKeepMapper.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyKeepMapper.java
similarity index 63%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyKeepMapper.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyKeepMapper.java
index 360cda63..47e4521d 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyKeepMapper.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyKeepMapper.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.custom.mapper;
+package cn.iocoder.yudao.module.property.mapper;
 
-import cn.iocoder.yudao.module.custom.entity.PropertyKeep;
-import cn.iocoder.yudao.module.custom.vo.PropertyKeepReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyKeepRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyKeep;
+import cn.iocoder.yudao.module.property.vo.PropertyKeepReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyKeepRespVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyMapper.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyMapper.java
similarity index 63%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyMapper.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyMapper.java
index 72b705e4..67dbc93a 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyMapper.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyMapper.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.custom.mapper;
+package cn.iocoder.yudao.module.property.mapper;
 
-import cn.iocoder.yudao.module.custom.entity.Property;
-import cn.iocoder.yudao.module.custom.vo.PropertyReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyRespVO;
+import cn.iocoder.yudao.module.property.entity.Property;
+import cn.iocoder.yudao.module.property.vo.PropertyReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyRespVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyPosMapper.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyPosMapper.java
similarity index 63%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyPosMapper.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyPosMapper.java
index dd9e7d33..827ffddc 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/PropertyPosMapper.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/mapper/PropertyPosMapper.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.custom.mapper;
+package cn.iocoder.yudao.module.property.mapper;
 
-import cn.iocoder.yudao.module.custom.entity.PropertyPosDO;
-import cn.iocoder.yudao.module.custom.vo.PropertyPosReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyPosRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
+import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyDealItemService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealItemService.java
similarity index 83%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyDealItemService.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealItemService.java
index e771a503..1294266d 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyDealItemService.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealItemService.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.custom.service;
+package cn.iocoder.yudao.module.property.service;
 
-import cn.iocoder.yudao.module.custom.entity.PropertyDealItemDO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealItemReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealItemRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyDealService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealService.java
similarity index 84%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyDealService.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealService.java
index 738fe16d..c6bac6a6 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyDealService.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyDealService.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.custom.service;
+package cn.iocoder.yudao.module.property.service;
 
-import cn.iocoder.yudao.module.custom.entity.PropertyDealDO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyKeepService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyKeepService.java
similarity index 82%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyKeepService.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyKeepService.java
index 18219535..fce10486 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyKeepService.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyKeepService.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.custom.service;
+package cn.iocoder.yudao.module.property.service;
 
-import cn.iocoder.yudao.module.custom.entity.PropertyKeep;
-import cn.iocoder.yudao.module.custom.vo.PropertyKeepReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyKeepRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyKeep;
+import cn.iocoder.yudao.module.property.vo.PropertyKeepReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyKeepRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyPosService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyPosService.java
similarity index 83%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyPosService.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyPosService.java
index c80de4a9..75fffecc 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyPosService.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyPosService.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.custom.service;
+package cn.iocoder.yudao.module.property.service;
 
-import cn.iocoder.yudao.module.custom.entity.PropertyPosDO;
-import cn.iocoder.yudao.module.custom.vo.PropertyPosReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyPosRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
+import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyService.java
similarity index 82%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyService.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyService.java
index 3bc25573..7475e086 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/PropertyService.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/PropertyService.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.custom.service;
+package cn.iocoder.yudao.module.property.service;
 
-import cn.iocoder.yudao.module.custom.entity.Property;
-import cn.iocoder.yudao.module.custom.vo.PropertyReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyRespVO;
+import cn.iocoder.yudao.module.property.entity.Property;
+import cn.iocoder.yudao.module.property.vo.PropertyReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyDealItemServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealItemServiceImpl.java
similarity index 79%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyDealItemServiceImpl.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealItemServiceImpl.java
index 1f4599ec..14edc399 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyDealItemServiceImpl.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealItemServiceImpl.java
@@ -1,11 +1,11 @@
-package cn.iocoder.yudao.module.custom.service.impl;
+package cn.iocoder.yudao.module.property.service.impl;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.custom.entity.PropertyDealItemDO;
-import cn.iocoder.yudao.module.custom.mapper.PropertyDealItemMapper;
-import cn.iocoder.yudao.module.custom.service.PropertyDealItemService;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealItemReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealItemRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
+import cn.iocoder.yudao.module.property.mapper.PropertyDealItemMapper;
+import cn.iocoder.yudao.module.property.service.PropertyDealItemService;
+import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyDealServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealServiceImpl.java
similarity index 79%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyDealServiceImpl.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealServiceImpl.java
index 8f7f0b2f..78b7209a 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyDealServiceImpl.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyDealServiceImpl.java
@@ -1,11 +1,11 @@
-package cn.iocoder.yudao.module.custom.service.impl;
+package cn.iocoder.yudao.module.property.service.impl;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.custom.entity.PropertyDealDO;
-import cn.iocoder.yudao.module.custom.mapper.PropertyDealMapper;
-import cn.iocoder.yudao.module.custom.service.PropertyDealService;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyDealRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
+import cn.iocoder.yudao.module.property.mapper.PropertyDealMapper;
+import cn.iocoder.yudao.module.property.service.PropertyDealService;
+import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyKeepServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyKeepServiceImpl.java
similarity index 79%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyKeepServiceImpl.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyKeepServiceImpl.java
index bc246af9..a1dbe2c1 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyKeepServiceImpl.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyKeepServiceImpl.java
@@ -1,11 +1,11 @@
-package cn.iocoder.yudao.module.custom.service.impl;
+package cn.iocoder.yudao.module.property.service.impl;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.custom.entity.PropertyKeep;
-import cn.iocoder.yudao.module.custom.mapper.PropertyKeepMapper;
-import cn.iocoder.yudao.module.custom.service.PropertyKeepService;
-import cn.iocoder.yudao.module.custom.vo.PropertyKeepReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyKeepRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyKeep;
+import cn.iocoder.yudao.module.property.mapper.PropertyKeepMapper;
+import cn.iocoder.yudao.module.property.service.PropertyKeepService;
+import cn.iocoder.yudao.module.property.vo.PropertyKeepReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyKeepRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyPosServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyPosServiceImpl.java
similarity index 79%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyPosServiceImpl.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyPosServiceImpl.java
index 91750cc8..1ca4c3e3 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyPosServiceImpl.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyPosServiceImpl.java
@@ -1,11 +1,11 @@
-package cn.iocoder.yudao.module.custom.service.impl;
+package cn.iocoder.yudao.module.property.service.impl;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.custom.entity.PropertyPosDO;
-import cn.iocoder.yudao.module.custom.mapper.PropertyPosMapper;
-import cn.iocoder.yudao.module.custom.service.PropertyPosService;
-import cn.iocoder.yudao.module.custom.vo.PropertyPosReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyPosRespVO;
+import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
+import cn.iocoder.yudao.module.property.mapper.PropertyPosMapper;
+import cn.iocoder.yudao.module.property.service.PropertyPosService;
+import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyServiceImpl.java
similarity index 70%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyServiceImpl.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyServiceImpl.java
index cf2767ec..bbe0b702 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyServiceImpl.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/service/impl/PropertyServiceImpl.java
@@ -1,12 +1,13 @@
-package cn.iocoder.yudao.module.custom.service.impl;
+package cn.iocoder.yudao.module.property.service.impl;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.custom.entity.Property;
-import cn.iocoder.yudao.module.custom.mapper.PropertyMapper;
-import cn.iocoder.yudao.module.custom.service.PropertyService;
-import cn.iocoder.yudao.module.custom.vo.PropertyReqVO;
-import cn.iocoder.yudao.module.custom.vo.PropertyRespVO;
+import cn.iocoder.yudao.module.property.entity.Property;
+import cn.iocoder.yudao.module.property.mapper.PropertyMapper;
+import cn.iocoder.yudao.module.property.service.PropertyService;
+import cn.iocoder.yudao.module.property.vo.PropertyReqVO;
+import cn.iocoder.yudao.module.property.vo.PropertyRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -49,7 +50,9 @@ public class PropertyServiceImpl extends ServiceImpl<PropertyMapper, Property> i
 
     @Override
     public IPage<PropertyRespVO> getPropertyPage(PropertyReqVO pageReqVO) {
-        return baseMapper.selectPage(pageReqVO);
+        Page<Property> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+
+        return null;
     }
 
 }
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemReqVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealItemReqVO.java
similarity index 89%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemReqVO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealItemReqVO.java
index 38648b19..c6e54fc2 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemReqVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealItemReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.custom.vo;
+package cn.iocoder.yudao.module.property.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 @Schema(description = "管理后台 - 企业管理-资产处置子分页 Request VO")
 @Data
@@ -57,7 +57,7 @@ public class PropertyDealItemReqVO extends PageParam {
     private String remark;
 
     @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime createTime;
 
 }
\ No newline at end of file
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealItemRespVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealItemRespVO.java
new file mode 100644
index 00000000..98a003bd
--- /dev/null
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealItemRespVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.property.vo;
+
+import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 企业管理-资产处置子 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PropertyDealItemRespVO extends PropertyDealItemDO {
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealReqVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealReqVO.java
similarity index 80%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealReqVO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealReqVO.java
index 1cebdff3..ee149c0b 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealReqVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.custom.vo;
+package cn.iocoder.yudao.module.property.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 @Schema(description = "管理后台 - 企业管理-资产处置单/变动单分页 Request VO")
 @Data
@@ -34,11 +34,11 @@ public class PropertyDealReqVO extends PageParam {
     private String dealNo;
 
     @Schema(description = "处置/变动日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDate[] dealDate;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDate dealDate;
 
     @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime createTime;
 
 }
\ No newline at end of file
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealRespVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealRespVO.java
new file mode 100644
index 00000000..b2f21783
--- /dev/null
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyDealRespVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.property.vo;
+
+import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 企业管理-资产处置单/变动单 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PropertyDealRespVO extends PropertyDealDO {
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyKeepReqVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyKeepReqVO.java
similarity index 96%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyKeepReqVO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyKeepReqVO.java
index 451b1aee..6baec255 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyKeepReqVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyKeepReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.custom.vo;
+package cn.iocoder.yudao.module.property.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyKeepRespVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyKeepRespVO.java
similarity index 82%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyKeepRespVO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyKeepRespVO.java
index af7b40ae..6ee1d979 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyKeepRespVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyKeepRespVO.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.custom.vo;
+package cn.iocoder.yudao.module.property.vo;
 
-import cn.iocoder.yudao.module.custom.entity.Property;
+import cn.iocoder.yudao.module.property.entity.Property;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosReqVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosReqVO.java
similarity index 86%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosReqVO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosReqVO.java
index 26ccf5cd..89c9a724 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosReqVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.custom.vo;
+package cn.iocoder.yudao.module.property.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 @Schema(description = "管理后台 - 企业管理-资产存放位置分页 Request VO")
 @Data
@@ -40,7 +40,7 @@ public class PropertyPosReqVO extends PageParam {
     private String depositType;
 
     @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime createTime;
 
 }
\ No newline at end of file
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosRespVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosRespVO.java
new file mode 100644
index 00000000..e85930c9
--- /dev/null
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyPosRespVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.property.vo;
+
+import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 企业管理-资产存放位置 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PropertyPosRespVO extends PropertyPosDO {
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyReqVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyReqVO.java
similarity index 92%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyReqVO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyReqVO.java
index 117195ba..4de079a0 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyReqVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.custom.vo;
+package cn.iocoder.yudao.module.property.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -8,7 +8,6 @@ import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@@ -75,18 +74,18 @@ public class PropertyReqVO extends PageParam {
 
     @Schema(description = "取得日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate[] getDate;
+    private LocalDateTime getDate;
 
     @Schema(description = "出厂日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate[] prodDate;
+    private LocalDateTime prodDate;
 
     @Schema(description = "供应商")
     private String supplier;
 
     @Schema(description = "启用日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate[] openDate;
+    private LocalDateTime openDate;
 
     @Schema(description = "净值（元）")
     private BigDecimal netValue;
@@ -102,11 +101,11 @@ public class PropertyReqVO extends PageParam {
 
     @Schema(description = "上次维修/保养日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate[] lastKeepDate;
+    private LocalDateTime lastKeepDate;
 
     @Schema(description = "下次维修/保养日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate[] nextKeepDate;
+    private LocalDateTime nextKeepDate;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyRespVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyRespVO.java
similarity index 82%
rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyRespVO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyRespVO.java
index 2de03972..c605c6b2 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyRespVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/vo/PropertyRespVO.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.custom.vo;
+package cn.iocoder.yudao.module.property.vo;
 
-import cn.iocoder.yudao.module.custom.entity.Property;
+import cn.iocoder.yudao.module.property.entity.Property;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
index 724c54c8..72678e6d 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
@@ -4,6 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.common.BaseConstants;
 import cn.iocoder.yudao.common.CommonErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.util.io.FileUtils;
+import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
+import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRule;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.company.entity.Company;
 import cn.iocoder.yudao.module.company.service.CompanyService;
@@ -64,6 +68,8 @@ public class CompanyStaffServiceImpl extends ServiceImpl<CompanyStaffMapper, Com
 
     @Resource
     private UniqueCodeService uniqueCodeService;
+    @Resource
+    private DataPermissionRule dataPermissionRule;
 
     @Resource
     private DeptApi deptApi;
diff --git a/dl-module-base/src/main/resources/mapper/custom/PropertyDealItemMapper.xml b/dl-module-company/src/main/resources/mapper/property/PropertyDealItemMapper.xml
similarity index 100%
rename from dl-module-base/src/main/resources/mapper/custom/PropertyDealItemMapper.xml
rename to dl-module-company/src/main/resources/mapper/property/PropertyDealItemMapper.xml
diff --git a/dl-module-base/src/main/resources/mapper/custom/PropertyDealMapper.xml b/dl-module-company/src/main/resources/mapper/property/PropertyDealMapper.xml
similarity index 100%
rename from dl-module-base/src/main/resources/mapper/custom/PropertyDealMapper.xml
rename to dl-module-company/src/main/resources/mapper/property/PropertyDealMapper.xml
diff --git a/dl-module-base/src/main/resources/mapper/custom/PropertyKeepMapper.xml b/dl-module-company/src/main/resources/mapper/property/PropertyKeepMapper.xml
similarity index 100%
rename from dl-module-base/src/main/resources/mapper/custom/PropertyKeepMapper.xml
rename to dl-module-company/src/main/resources/mapper/property/PropertyKeepMapper.xml
diff --git a/dl-module-base/src/main/resources/mapper/custom/PropertyMapper.xml b/dl-module-company/src/main/resources/mapper/property/PropertyMapper.xml
similarity index 100%
rename from dl-module-base/src/main/resources/mapper/custom/PropertyMapper.xml
rename to dl-module-company/src/main/resources/mapper/property/PropertyMapper.xml
diff --git a/dl-module-base/src/main/resources/mapper/custom/PropertyPosMapper.xml b/dl-module-company/src/main/resources/mapper/property/PropertyPosMapper.xml
similarity index 84%
rename from dl-module-base/src/main/resources/mapper/custom/PropertyPosMapper.xml
rename to dl-module-company/src/main/resources/mapper/property/PropertyPosMapper.xml
index 319c0a54..a6db6fd0 100644
--- a/dl-module-base/src/main/resources/mapper/custom/PropertyPosMapper.xml
+++ b/dl-module-company/src/main/resources/mapper/property/PropertyPosMapper.xml
@@ -1,6 +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="cn.iocoder.yudao.module.company.dal.mysql.property.PropertyPosMapper">
+<mapper namespace="cn.iocoder.yudao.module.property.dal.mysql.property.PropertyPosMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
diff --git a/dl-module-knowledge/pom.xml b/dl-module-knowledge/pom.xml
new file mode 100644
index 00000000..380cc9d6
--- /dev/null
+++ b/dl-module-knowledge/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dl-module-knowledge</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+
+    <description>
+        点亮企业知识管理模块
+    </description>
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>dl-module-base</artifactId>
+            <version>${revision}</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/annotation/ExcelOut.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/annotation/ExcelOut.java
new file mode 100644
index 00000000..17c9c43b
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/annotation/ExcelOut.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.knowledge.annotation;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD,ElementType.TYPE})
+public @interface ExcelOut {
+    //列名
+    String name() default "";
+
+    //排序，实体类中从1开始排序，0被序号列占用
+    int sort();
+
+    //列宽
+    int width() default 15;
+    String dateFormat() default "";
+    boolean isFileUrl() default false;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/CharsetKit.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/CharsetKit.java
new file mode 100644
index 00000000..e58c41ff
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/CharsetKit.java
@@ -0,0 +1,85 @@
+package cn.iocoder.yudao.module.knowledge.common;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 字符集工具类
+ *
+ * @author ruoyi
+ */
+public class CharsetKit
+{
+    /** ISO-8859-1 */
+    public static final String ISO_8859_1 = "ISO-8859-1";
+    /** UTF-8 */
+    public static final String UTF_8 = "UTF-8";
+    /** GBK */
+    public static final String GBK = "GBK";
+
+    /** ISO-8859-1 */
+    public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
+    /** UTF-8 */
+    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
+    /** GBK */
+    public static final Charset CHARSET_GBK = Charset.forName(GBK);
+
+    /**
+     * 转换为Charset对象
+     *
+     * @param charset 字符集，为空则返回默认字符集
+     * @return Charset
+     */
+    public static Charset charset(String charset)
+    {
+        return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
+    }
+
+    /**
+     * 转换字符串的字符集编码
+     *
+     * @param source 字符串
+     * @param srcCharset 源字符集，默认ISO-8859-1
+     * @param destCharset 目标字符集，默认UTF-8
+     * @return 转换后的字符集
+     */
+    public static String convert(String source, String srcCharset, String destCharset)
+    {
+        return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
+    }
+
+    /**
+     * 转换字符串的字符集编码
+     *
+     * @param source 字符串
+     * @param srcCharset 源字符集，默认ISO-8859-1
+     * @param destCharset 目标字符集，默认UTF-8
+     * @return 转换后的字符集
+     */
+    public static String convert(String source, Charset srcCharset, Charset destCharset)
+    {
+        if (null == srcCharset)
+        {
+            srcCharset = StandardCharsets.ISO_8859_1;
+        }
+
+        if (null == destCharset)
+        {
+            destCharset = StandardCharsets.UTF_8;
+        }
+
+        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
+        {
+            return source;
+        }
+        return new String(source.getBytes(srcCharset), destCharset);
+    }
+
+    /**
+     * @return 系统字符集编码
+     */
+    public static String systemCharset()
+    {
+        return Charset.defaultCharset().name();
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/Convert.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/Convert.java
new file mode 100644
index 00000000..a5083374
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/Convert.java
@@ -0,0 +1,1006 @@
+package cn.iocoder.yudao.module.knowledge.common;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.text.NumberFormat;
+import java.util.Set;
+
+/**
+ * 类型转换器
+ *
+ * @author ruoyi
+ */
+public class Convert
+{
+    /**
+     * 转换为字符串<br>
+     * 如果给定的值为null，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static String toStr(Object value, String defaultValue)
+    {
+        if (null == value)
+        {
+            return defaultValue;
+        }
+        if (value instanceof String)
+        {
+            return (String) value;
+        }
+        return value.toString();
+    }
+
+    /**
+     * 转换为字符串<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static String toStr(Object value)
+    {
+        return toStr(value, null);
+    }
+
+    /**
+     * 转换为字符<br>
+     * 如果给定的值为null，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Character toChar(Object value, Character defaultValue)
+    {
+        if (null == value)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Character)
+        {
+            return (Character) value;
+        }
+
+        final String valueStr = toStr(value, null);
+        return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
+    }
+
+    /**
+     * 转换为字符<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Character toChar(Object value)
+    {
+        return toChar(value, null);
+    }
+
+    /**
+     * 转换为byte<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Byte toByte(Object value, Byte defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Byte)
+        {
+            return (Byte) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).byteValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Byte.parseByte(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为byte<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Byte toByte(Object value)
+    {
+        return toByte(value, null);
+    }
+
+    /**
+     * 转换为Short<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Short toShort(Object value, Short defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Short)
+        {
+            return (Short) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).shortValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Short.parseShort(valueStr.trim());
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Short<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Short toShort(Object value)
+    {
+        return toShort(value, null);
+    }
+
+    /**
+     * 转换为Number<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Number toNumber(Object value, Number defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Number)
+        {
+            return (Number) value;
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return NumberFormat.getInstance().parse(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Number<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Number toNumber(Object value)
+    {
+        return toNumber(value, null);
+    }
+
+    /**
+     * 转换为int<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Integer toInt(Object value, Integer defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Integer)
+        {
+            return (Integer) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).intValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Integer.parseInt(valueStr.trim());
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为int<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Integer toInt(Object value)
+    {
+        return toInt(value, null);
+    }
+
+    /**
+     * 转换为Integer数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Integer[] toIntArray(String str)
+    {
+        return toIntArray(",", str);
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String str)
+    {
+        return toLongArray(",", str);
+    }
+
+    /**
+     * 转换为Integer数组<br>
+     *
+     * @param split 分隔符
+     * @param split 被转换的值
+     * @return 结果
+     */
+    public static Integer[] toIntArray(String split, String str)
+    {
+        if (StringUtils.isEmpty(str))
+        {
+            return new Integer[] {};
+        }
+        String[] arr = str.split(split);
+        final Integer[] ints = new Integer[arr.length];
+        for (int i = 0; i < arr.length; i++)
+        {
+            final Integer v = toInt(arr[i], 0);
+            ints[i] = v;
+        }
+        return ints;
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param split 分隔符
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String split, String str)
+    {
+        if (StringUtils.isEmpty(str))
+        {
+            return new Long[] {};
+        }
+        String[] arr = str.split(split);
+        final Long[] longs = new Long[arr.length];
+        for (int i = 0; i < arr.length; i++)
+        {
+            final Long v = toLong(arr[i], null);
+            longs[i] = v;
+        }
+        return longs;
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String str)
+    {
+        return toStrArray(",", str);
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param split 分隔符
+     * @param split 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String split, String str)
+    {
+        return str.split(split);
+    }
+
+    /**
+     * 转换为long<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Long toLong(Object value, Long defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Long)
+        {
+            return (Long) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).longValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            // 支持科学计数法
+            return new BigDecimal(valueStr.trim()).longValue();
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为long<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Long toLong(Object value)
+    {
+        return toLong(value, null);
+    }
+
+    /**
+     * 转换为double<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Double toDouble(Object value, Double defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Double)
+        {
+            return (Double) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).doubleValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            // 支持科学计数法
+            return new BigDecimal(valueStr.trim()).doubleValue();
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为double<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Double toDouble(Object value)
+    {
+        return toDouble(value, null);
+    }
+
+    /**
+     * 转换为Float<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Float toFloat(Object value, Float defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Float)
+        {
+            return (Float) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).floatValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Float.parseFloat(valueStr.trim());
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Float<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Float toFloat(Object value)
+    {
+        return toFloat(value, null);
+    }
+
+    /**
+     * 转换为boolean<br>
+     * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Boolean toBool(Object value, Boolean defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Boolean)
+        {
+            return (Boolean) value;
+        }
+        String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        valueStr = valueStr.trim().toLowerCase();
+        switch (valueStr)
+        {
+            case "true":
+            case "yes":
+            case "ok":
+            case "1":
+                return true;
+            case "false":
+            case "no":
+            case "0":
+                return false;
+            default:
+                return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为boolean<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Boolean toBool(Object value)
+    {
+        return toBool(value, null);
+    }
+
+    /**
+     * 转换为Enum对象<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     *
+     * @param clazz Enum的Class
+     * @param value 值
+     * @param defaultValue 默认值
+     * @return Enum
+     */
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (clazz.isAssignableFrom(value.getClass()))
+        {
+            @SuppressWarnings("unchecked")
+            E myE = (E) value;
+            return myE;
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Enum.valueOf(clazz, valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Enum对象<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     *
+     * @param clazz Enum的Class
+     * @param value 值
+     * @return Enum
+     */
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value)
+    {
+        return toEnum(clazz, value, null);
+    }
+
+    /**
+     * 转换为BigInteger<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static BigInteger toBigInteger(Object value, BigInteger defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof BigInteger)
+        {
+            return (BigInteger) value;
+        }
+        if (value instanceof Long)
+        {
+            return BigInteger.valueOf((Long) value);
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return new BigInteger(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为BigInteger<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static BigInteger toBigInteger(Object value)
+    {
+        return toBigInteger(value, null);
+    }
+
+    /**
+     * 转换为BigDecimal<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof BigDecimal)
+        {
+            return (BigDecimal) value;
+        }
+        if (value instanceof Long)
+        {
+            return new BigDecimal((Long) value);
+        }
+        if (value instanceof Double)
+        {
+            return BigDecimal.valueOf((Double) value);
+        }
+        if (value instanceof Integer)
+        {
+            return new BigDecimal((Integer) value);
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return new BigDecimal(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为BigDecimal<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static BigDecimal toBigDecimal(Object value)
+    {
+        return toBigDecimal(value, null);
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @return 字符串
+     */
+    public static String utf8Str(Object obj)
+    {
+        return str(obj, CharsetKit.CHARSET_UTF_8);
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @param charsetName 字符集
+     * @return 字符串
+     */
+    public static String str(Object obj, String charsetName)
+    {
+        return str(obj, Charset.forName(charsetName));
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @param charset 字符集
+     * @return 字符串
+     */
+    public static String str(Object obj, Charset charset)
+    {
+        if (null == obj)
+        {
+            return null;
+        }
+
+        if (obj instanceof String)
+        {
+            return (String) obj;
+        }
+        else if (obj instanceof byte[])
+        {
+            return str((byte[]) obj, charset);
+        }
+        else if (obj instanceof Byte[])
+        {
+            byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj);
+            return str(bytes, charset);
+        }
+        else if (obj instanceof ByteBuffer)
+        {
+            return str((ByteBuffer) obj, charset);
+        }
+        return obj.toString();
+    }
+
+    /**
+     * 将byte数组转为字符串
+     *
+     * @param bytes byte数组
+     * @param charset 字符集
+     * @return 字符串
+     */
+    public static String str(byte[] bytes, String charset)
+    {
+        return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
+    }
+
+    /**
+     * 解码字节码
+     *
+     * @param data 字符串
+     * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
+     * @return 解码后的字符串
+     */
+    public static String str(byte[] data, Charset charset)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+
+        if (null == charset)
+        {
+            return new String(data);
+        }
+        return new String(data, charset);
+    }
+
+    /**
+     * 将编码的byteBuffer数据转换为字符串
+     *
+     * @param data 数据
+     * @param charset 字符集，如果为空使用当前系统字符集
+     * @return 字符串
+     */
+    public static String str(ByteBuffer data, String charset)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+
+        return str(data, Charset.forName(charset));
+    }
+
+    /**
+     * 将编码的byteBuffer数据转换为字符串
+     *
+     * @param data 数据
+     * @param charset 字符集，如果为空使用当前系统字符集
+     * @return 字符串
+     */
+    public static String str(ByteBuffer data, Charset charset)
+    {
+        if (null == charset)
+        {
+            charset = Charset.defaultCharset();
+        }
+        return charset.decode(data).toString();
+    }
+
+    // ----------------------------------------------------------------------- 全角半角转换
+    /**
+     * 半角转全角
+     *
+     * @param input String.
+     * @return 全角字符串.
+     */
+    public static String toSBC(String input)
+    {
+        return toSBC(input, null);
+    }
+
+    /**
+     * 半角转全角
+     *
+     * @param input String
+     * @param notConvertSet 不替换的字符集合
+     * @return 全角字符串.
+     */
+    public static String toSBC(String input, Set<Character> notConvertSet)
+    {
+        char[] c = input.toCharArray();
+        for (int i = 0; i < c.length; i++)
+        {
+            if (null != notConvertSet && notConvertSet.contains(c[i]))
+            {
+                // 跳过不替换的字符
+                continue;
+            }
+
+            if (c[i] == ' ')
+            {
+                c[i] = '\u3000';
+            }
+            else if (c[i] < '\177')
+            {
+                c[i] = (char) (c[i] + 65248);
+
+            }
+        }
+        return new String(c);
+    }
+
+    /**
+     * 全角转半角
+     *
+     * @param input String.
+     * @return 半角字符串
+     */
+    public static String toDBC(String input)
+    {
+        return toDBC(input, null);
+    }
+
+    /**
+     * 替换全角为半角
+     *
+     * @param text 文本
+     * @param notConvertSet 不替换的字符集合
+     * @return 替换后的字符
+     */
+    public static String toDBC(String text, Set<Character> notConvertSet)
+    {
+        char[] c = text.toCharArray();
+        for (int i = 0; i < c.length; i++)
+        {
+            if (null != notConvertSet && notConvertSet.contains(c[i]))
+            {
+                // 跳过不替换的字符
+                continue;
+            }
+
+            if (c[i] == '\u3000')
+            {
+                c[i] = ' ';
+            }
+            else if (c[i] > '\uFF00' && c[i] < '\uFF5F')
+            {
+                c[i] = (char) (c[i] - 65248);
+            }
+        }
+        String returnString = new String(c);
+
+        return returnString;
+    }
+
+    /**
+     * 数字金额大写转换 先写个完整的然后将如零拾替换成零
+     *
+     * @param n 数字
+     * @return 中文大写数字
+     */
+    public static String digitUppercase(double n)
+    {
+        String[] fraction = { "角", "分" };
+        String[] digit = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" };
+        String[][] unit = { { "元", "万", "亿" }, { "", "拾", "佰", "仟" } };
+
+        String head = n < 0 ? "负" : "";
+        n = Math.abs(n);
+
+        String s = "";
+        for (int i = 0; i < fraction.length; i++)
+        {
+            // 优化double计算精度丢失问题
+            BigDecimal nNum = new BigDecimal(n);
+            BigDecimal decimal = new BigDecimal(10);
+            BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN);
+            double d = scale.doubleValue();
+            s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
+        }
+        if (s.length() < 1)
+        {
+            s = "整";
+        }
+        int integerPart = (int) Math.floor(n);
+
+        for (int i = 0; i < unit[0].length && integerPart > 0; i++)
+        {
+            String p = "";
+            for (int j = 0; j < unit[1].length && n > 0; j++)
+            {
+                p = digit[integerPart % 10] + unit[1][j] + p;
+                integerPart = integerPart / 10;
+            }
+            s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
+        }
+        return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/StrFormatter.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/StrFormatter.java
new file mode 100644
index 00000000..473516bf
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/StrFormatter.java
@@ -0,0 +1,91 @@
+package cn.iocoder.yudao.module.knowledge.common;
+
+
+/**
+ * 字符串格式化
+ *
+ * @author ruoyi
+ */
+public class StrFormatter
+{
+    public static final String EMPTY_JSON = "{}";
+    public static final char C_BACKSLASH = '\\';
+    public static final char C_DELIM_START = '{';
+    public static final char C_DELIM_END = '}';
+
+    /**
+     * 格式化字符串<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     *
+     * @param strPattern 字符串模板
+     * @param argArray 参数列表
+     * @return 结果
+     */
+    public static String format(final String strPattern, final Object... argArray)
+    {
+        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
+        {
+            return strPattern;
+        }
+        final int strPatternLength = strPattern.length();
+
+        // 初始化定义好的长度以获得更好的性能
+        StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
+
+        int handledPosition = 0;
+        int delimIndex;// 占位符所在位置
+        for (int argIndex = 0; argIndex < argArray.length; argIndex++)
+        {
+            delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
+            if (delimIndex == -1)
+            {
+                if (handledPosition == 0)
+                {
+                    return strPattern;
+                }
+                else
+                { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
+                    sbuf.append(strPattern, handledPosition, strPatternLength);
+                    return sbuf.toString();
+                }
+            }
+            else
+            {
+                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
+                {
+                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
+                    {
+                        // 转义符之前还有一个转义符，占位符依旧有效
+                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
+                        sbuf.append(Convert.utf8Str(argArray[argIndex]));
+                        handledPosition = delimIndex + 2;
+                    }
+                    else
+                    {
+                        // 占位符被转义
+                        argIndex--;
+                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
+                        sbuf.append(C_DELIM_START);
+                        handledPosition = delimIndex + 1;
+                    }
+                }
+                else
+                {
+                    // 正常占位符
+                    sbuf.append(strPattern, handledPosition, delimIndex);
+                    sbuf.append(Convert.utf8Str(argArray[argIndex]));
+                    handledPosition = delimIndex + 2;
+                }
+            }
+        }
+        // 加入最后一个占位符后所有的字符
+        sbuf.append(strPattern, handledPosition, strPattern.length());
+
+        return sbuf.toString();
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/StringUtils.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/StringUtils.java
new file mode 100644
index 00000000..7e780767
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/common/StringUtils.java
@@ -0,0 +1,622 @@
+package cn.iocoder.yudao.module.knowledge.common;
+
+import org.springframework.util.AntPathMatcher;
+
+import java.util.*;
+
+/**
+ * 字符串工具类
+ *
+ * @author ruoyi
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils
+{
+    /** 空字符串 */
+    private static final String NULLSTR = "";
+
+    /** 下划线 */
+    private static final char SEPARATOR = '_';
+
+    /**
+     * 获取参数不为空值
+     *
+     * @param value defaultValue 要判断的value
+     * @return value 返回值
+     */
+    public static <T> T nvl(T value, T defaultValue)
+    {
+        return value != null ? value : defaultValue;
+    }
+
+    /**
+     * * 判断一个Collection是否为空， 包含List，Set，Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Collection<?> coll)
+    {
+        return isNull(coll) || coll.isEmpty();
+    }
+
+    /**
+     * * 判断一个Collection是否非空，包含List，Set，Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Collection<?> coll)
+    {
+        return !isEmpty(coll);
+    }
+
+    /**
+     * * 判断一个对象数组是否为空
+     *
+     * @param objects 要判断的对象数组
+     ** @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Object[] objects)
+    {
+        return isNull(objects) || (objects.length == 0);
+    }
+
+    /**
+     * * 判断一个对象数组是否非空
+     *
+     * @param objects 要判断的对象数组
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Object[] objects)
+    {
+        return !isEmpty(objects);
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Map<?, ?> map)
+    {
+        return isNull(map) || map.isEmpty();
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Map<?, ?> map)
+    {
+        return !isEmpty(map);
+    }
+
+    /**
+     * * 判断一个字符串是否为空串
+     *
+     * @param str String
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(String str)
+    {
+        return isNull(str) || NULLSTR.equals(str.trim());
+    }
+
+    /**
+     * * 判断一个字符串是否为非空串
+     *
+     * @param str String
+     * @return true：非空串 false：空串
+     */
+    public static boolean isNotEmpty(String str)
+    {
+        return !isEmpty(str);
+    }
+
+    /**
+     * * 判断一个对象是否为空
+     *
+     * @param object Object
+     * @return true：为空 false：非空
+     */
+    public static boolean isNull(Object object)
+    {
+        return object == null;
+    }
+
+    /**
+     * * 判断一个对象是否非空
+     *
+     * @param object Object
+     * @return true：非空 false：空
+     */
+    public static boolean isNotNull(Object object)
+    {
+        return !isNull(object);
+    }
+
+    /**
+     * * 判断一个对象是否是数组类型（Java基本型别的数组）
+     *
+     * @param object 对象
+     * @return true：是数组 false：不是数组
+     */
+    public static boolean isArray(Object object)
+    {
+        return isNotNull(object) && object.getClass().isArray();
+    }
+
+    /**
+     * 去空格
+     */
+    public static String trim(String str)
+    {
+        return (str == null ? "" : str.trim());
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str 字符串
+     * @param start 开始
+     * @return 结果
+     */
+    public static String substring(final String str, int start)
+    {
+        if (str == null)
+        {
+            return NULLSTR;
+        }
+
+        if (start < 0)
+        {
+            start = str.length() + start;
+        }
+
+        if (start < 0)
+        {
+            start = 0;
+        }
+        if (start > str.length())
+        {
+            return NULLSTR;
+        }
+
+        return str.substring(start);
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str 字符串
+     * @param start 开始
+     * @param end 结束
+     * @return 结果
+     */
+    public static String substring(final String str, int start, int end)
+    {
+        if (str == null)
+        {
+            return NULLSTR;
+        }
+
+        if (end < 0)
+        {
+            end = str.length() + end;
+        }
+        if (start < 0)
+        {
+            start = str.length() + start;
+        }
+
+        if (end > str.length())
+        {
+            end = str.length();
+        }
+
+        if (start > end)
+        {
+            return NULLSTR;
+        }
+
+        if (start < 0)
+        {
+            start = 0;
+        }
+        if (end < 0)
+        {
+            end = 0;
+        }
+
+        return str.substring(start, end);
+    }
+
+    /**
+     * 判断是否为空，并且不是空白字符
+     *
+     * @param str 要判断的value
+     * @return 结果
+     */
+    public static boolean hasText(String str)
+    {
+        return (str != null && !str.isEmpty() && containsText(str));
+    }
+
+    private static boolean containsText(CharSequence str)
+    {
+        int strLen = str.length();
+        for (int i = 0; i < strLen; i++)
+        {
+            if (!Character.isWhitespace(str.charAt(i)))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 格式化文本, {} 表示占位符<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     *
+     * @param template 文本模板，被替换的部分用 {} 表示
+     * @param params 参数值
+     * @return 格式化后的文本
+     */
+    public static String format(String template, Object... params)
+    {
+        if (isEmpty(params) || isEmpty(template))
+        {
+            return template;
+        }
+        return StrFormatter.format(template, params);
+    }
+
+
+    /**
+     * 字符串转set
+     *
+     * @param str 字符串
+     * @param sep 分隔符
+     * @return set集合
+     */
+    public static final Set<String> str2Set(String str, String sep)
+    {
+        return new HashSet<String>(str2List(str, sep, true, false));
+    }
+
+    /**
+     * 字符串转list
+     *
+     * @param str 字符串
+     * @param sep 分隔符
+     * @param filterBlank 过滤纯空白
+     * @param trim 去掉首尾空白
+     * @return list集合
+     */
+    public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim)
+    {
+        List<String> list = new ArrayList<String>();
+        if (StringUtils.isEmpty(str))
+        {
+            return list;
+        }
+
+        // 过滤空白字符串
+        if (filterBlank && StringUtils.isBlank(str))
+        {
+            return list;
+        }
+        String[] split = str.split(sep);
+        for (String string : split)
+        {
+            if (filterBlank && StringUtils.isBlank(string))
+            {
+                continue;
+            }
+            if (trim)
+            {
+                string = string.trim();
+            }
+            list.add(string);
+        }
+
+        return list;
+    }
+
+    /**
+     * 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
+     *
+     * @param collection 给定的集合
+     * @param array 给定的数组
+     * @return boolean 结果
+     */
+    public static boolean containsAny(Collection<String> collection, String... array)
+    {
+        if (isEmpty(collection) || isEmpty(array))
+        {
+            return false;
+        }
+        else
+        {
+            for (String str : array)
+            {
+                if (collection.contains(str))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
+     *
+     * @param cs 指定字符串
+     * @param searchCharSequences 需要检查的字符串数组
+     * @return 是否包含任意一个字符串
+     */
+    public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences)
+    {
+        if (isEmpty(cs) || isEmpty(searchCharSequences))
+        {
+            return false;
+        }
+        for (CharSequence testStr : searchCharSequences)
+        {
+            if (containsIgnoreCase(cs, testStr))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 驼峰转下划线命名
+     */
+    public static String toUnderScoreCase(String str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        // 前置字符是否大写
+        boolean preCharIsUpperCase = true;
+        // 当前字符是否大写
+        boolean curreCharIsUpperCase = true;
+        // 下一字符是否大写
+        boolean nexteCharIsUpperCase = true;
+        for (int i = 0; i < str.length(); i++)
+        {
+            char c = str.charAt(i);
+            if (i > 0)
+            {
+                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
+            }
+            else
+            {
+                preCharIsUpperCase = false;
+            }
+
+            curreCharIsUpperCase = Character.isUpperCase(c);
+
+            if (i < (str.length() - 1))
+            {
+                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
+            }
+
+            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase)
+            {
+                sb.append(SEPARATOR);
+            }
+            else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase)
+            {
+                sb.append(SEPARATOR);
+            }
+            sb.append(Character.toLowerCase(c));
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * 是否包含字符串
+     *
+     * @param str 验证字符串
+     * @param strs 字符串组
+     * @return 包含返回true
+     */
+    public static boolean inStringIgnoreCase(String str, String... strs)
+    {
+        if (str != null && strs != null)
+        {
+            for (String s : strs)
+            {
+                if (str.equalsIgnoreCase(trim(s)))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
+     *
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String convertToCamelCase(String name)
+    {
+        StringBuilder result = new StringBuilder();
+        // 快速检查
+        if (name == null || name.isEmpty())
+        {
+            // 没必要转换
+            return "";
+        }
+        else if (!name.contains("_"))
+        {
+            // 不含下划线，仅将首字母大写
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
+        }
+        // 用下划线将原始字符串分割
+        String[] camels = name.split("_");
+        for (String camel : camels)
+        {
+            // 跳过原始字符串中开头、结尾的下换线或双重下划线
+            if (camel.isEmpty())
+            {
+                continue;
+            }
+            // 首字母大写
+            result.append(camel.substring(0, 1).toUpperCase());
+            result.append(camel.substring(1).toLowerCase());
+        }
+        return result.toString();
+    }
+
+    /**
+     * 驼峰式命名法
+     * 例如：user_name->userName
+     */
+    public static String toCamelCase(String s)
+    {
+        if (s == null)
+        {
+            return null;
+        }
+        if (s.indexOf(SEPARATOR) == -1)
+        {
+            return s;
+        }
+        s = s.toLowerCase();
+        StringBuilder sb = new StringBuilder(s.length());
+        boolean upperCase = false;
+        for (int i = 0; i < s.length(); i++)
+        {
+            char c = s.charAt(i);
+
+            if (c == SEPARATOR)
+            {
+                upperCase = true;
+            }
+            else if (upperCase)
+            {
+                sb.append(Character.toUpperCase(c));
+                upperCase = false;
+            }
+            else
+            {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+     *
+     * @param str 指定字符串
+     * @param strs 需要检查的字符串数组
+     * @return 是否匹配
+     */
+    public static boolean matches(String str, List<String> strs)
+    {
+        if (isEmpty(str) || isEmpty(strs))
+        {
+            return false;
+        }
+        for (String pattern : strs)
+        {
+            if (isMatch(pattern, str))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断url是否与规则配置:
+     * ? 表示单个字符;
+     * * 表示一层路径内的任意字符串，不可跨层级;
+     * ** 表示任意层路径;
+     *
+     * @param pattern 匹配规则
+     * @param url 需要匹配的url
+     * @return
+     */
+    public static boolean isMatch(String pattern, String url)
+    {
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T cast(Object obj)
+    {
+        return (T) obj;
+    }
+
+    /**
+     * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。
+     *
+     * @param num 数字对象
+     * @param size 字符串指定长度
+     * @return 返回数字的字符串格式，该字符串为指定长度。
+     */
+    public static final String padl(final Number num, final int size)
+    {
+        return padl(num.toString(), size, '0');
+    }
+
+    /**
+     * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。
+     *
+     * @param s 原始字符串
+     * @param size 字符串指定长度
+     * @param c 用于补齐的字符
+     * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。
+     */
+    public static final String padl(final String s, final int size, final char c)
+    {
+        final StringBuilder sb = new StringBuilder(size);
+        if (s != null)
+        {
+            final int len = s.length();
+            if (s.length() <= size)
+            {
+                for (int i = size - len; i > 0; i--)
+                {
+                    sb.append(c);
+                }
+                sb.append(s);
+            }
+            else
+            {
+                return s.substring(len - size, len);
+            }
+        }
+        else
+        {
+            for (int i = size; i > 0; i--)
+            {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/CacheConstants.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/CacheConstants.java
new file mode 100644
index 00000000..36af4271
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/CacheConstants.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.knowledge.constants;
+
+/**
+ * 缓存的key 常量
+ *
+ * @author ruoyi
+ */
+public class CacheConstants
+{
+    /**
+     * 登录用户 redis key
+     */
+    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+
+    /**
+     * 验证码 redis key
+     */
+    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+
+    /**
+     * 参数管理 cache key
+     */
+    public static final String SYS_CONFIG_KEY = "sys_config:";
+
+    /**
+     * 字典管理 cache key
+     */
+    public static final String SYS_DICT_KEY = "sys_dict:";
+
+    /**
+     * 防重提交 redis key
+     */
+    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
+
+    /**
+     * 限流 redis key
+     */
+    public static final String RATE_LIMIT_KEY = "rate_limit:";
+
+    /**
+     * 登录账户密码错误次数 redis key
+     */
+    public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/CodeEnum.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/CodeEnum.java
new file mode 100644
index 00000000..de7376fa
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/CodeEnum.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.knowledge.constants;
+
+import lombok.Getter;
+
+/**
+ * @author 叶圣暖
+ */
+@Getter
+public enum CodeEnum {
+
+    // 成功
+    SUCCESS(200, "成功", "操作成功"),
+    AUTH_FAIL(401, "无权限", "无权限"),
+    //2500XX项目内通用错误码
+    TEST(250001, "测试，请稍后再试", "测试"),
+    //2500XX项目内通用错误码
+    PARAMETER_VERIFICATION_FAILED(250000, "系统开小差了，请稍后再试", "参数校验失败"),
+    SYSTEM_SEATA_GLOCK_ERROR(90001, "当前操作失败,可能有其他操作正在更新数据，请重新再试，如果一直失败请联系管理员", "系统异常"),
+    SYSTEM_ERROR(250099, "系统开小差了，请稍后再试", "系统异常"),
+    //档案管理
+    TARCHIVES_SELECT_FAILED(121001, "查找失败", "查找失败"),
+    TARCHIVES_SAVE_FAILED(121002, "新建文件夹||文件保存失败", "新建文件夹||文件保存失败"),
+    TARCHIVES_RENAME_FAILED(121003, "文件夹||文件名称更改失败", "文件夹||文件名称更改失败"),
+    TARCHIVES_DELETE_FAILED(121004, "文件||文件夹删除失败", "文件||文件夹删除失败"),
+    TARCHIVES_RESTORE_ERROR(121005, "还原失败", "还原失败"),
+    TARCHIVES_BINDELETE_FAILED(121006, "回收站删除失败", "回收站删除失败"),
+    TARCHIVES_SORT_FAILED(121007, "排序失败", "排序失败"),
+    TARCHIVES_FILEMOVE_FAILED(121008, "文件移动失败", "文件移动失败"),
+    TARCHIVES_FILEEXPORT_FAILED(121009, "文件导出失败", "文件导出失败"),
+    DB_FAILD(500, "数据重复", "数据异常");
+    private final int code;
+    private final String msg;
+    private final String desc;
+
+    CodeEnum(Integer code, String msg, String desc) {
+        this.code = code;
+        this.msg = msg;
+        this.desc = desc;
+    }
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/Constants.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/Constants.java
new file mode 100644
index 00000000..eadc753d
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/Constants.java
@@ -0,0 +1,173 @@
+package cn.iocoder.yudao.module.knowledge.constants;
+
+
+import java.util.Locale;
+
+/**
+ * 通用常量信息
+ *
+ * @author ruoyi
+ */
+public class Constants
+{
+    /**
+     * UTF-8 字符集
+     */
+    public static final String UTF8 = "UTF-8";
+
+    /**
+     * GBK 字符集
+     */
+    public static final String GBK = "GBK";
+
+    /**
+     * 系统语言
+     */
+    public static final Locale DEFAULT_LOCALE = Locale.SIMPLIFIED_CHINESE;
+
+    /**
+     * www主域
+     */
+    public static final String WWW = "www.";
+
+    /**
+     * http请求
+     */
+    public static final String HTTP = "http://";
+
+    /**
+     * https请求
+     */
+    public static final String HTTPS = "https://";
+
+    /**
+     * 通用成功标识
+     */
+    public static final String SUCCESS = "0";
+
+    /**
+     * 通用失败标识
+     */
+    public static final String FAIL = "1";
+
+    /**
+     * 登录成功
+     */
+    public static final String LOGIN_SUCCESS = "Success";
+
+    /**
+     * 注销
+     */
+    public static final String LOGOUT = "Logout";
+
+    /**
+     * 注册
+     */
+    public static final String REGISTER = "Register";
+
+    /**
+     * 登录失败
+     */
+    public static final String LOGIN_FAIL = "Error";
+
+    /**
+     * 所有权限标识
+     */
+    public static final String ALL_PERMISSION = "*:*:*";
+
+    /**
+     * 管理员角色权限标识
+     */
+    public static final String SUPER_ADMIN = "admin";
+
+    /**
+     * 角色权限分隔符
+     */
+    public static final String ROLE_DELIMETER = ",";
+
+    /**
+     * 权限标识分隔符
+     */
+    public static final String PERMISSION_DELIMETER = ",";
+
+    /**
+     * 验证码有效期（分钟）
+     */
+    public static final Integer CAPTCHA_EXPIRATION = 2;
+
+    /**
+     * 令牌
+     */
+    public static final String TOKEN = "token";
+
+    /**
+     * 令牌前缀
+     */
+    public static final String TOKEN_PREFIX = "Bearer ";
+
+    /**
+     * 令牌前缀
+     */
+    public static final String LOGIN_USER_KEY = "login_user_key";
+
+    /**
+     * 用户ID
+     */
+    public static final String JWT_USERID = "userid";
+
+    /**
+     * 用户名称
+     */
+    //public static final String JWT_USERNAME = Claims.SUBJECT;
+
+    /**
+     * 用户头像
+     */
+    public static final String JWT_AVATAR = "avatar";
+
+    /**
+     * 创建时间
+     */
+    public static final String JWT_CREATED = "created";
+
+    /**
+     * 用户权限
+     */
+    public static final String JWT_AUTHORITIES = "authorities";
+
+    /**
+     * 资源映射路径 前缀
+     */
+    public static final String RESOURCE_PREFIX = "/profile";
+
+    /**
+     * RMI 远程方法调用
+     */
+    public static final String LOOKUP_RMI = "rmi:";
+
+    /**
+     * LDAP 远程方法调用
+     */
+    public static final String LOOKUP_LDAP = "ldap:";
+
+    /**
+     * LDAPS 远程方法调用
+     */
+    public static final String LOOKUP_LDAPS = "ldaps:";
+
+    /**
+     * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全）
+     */
+    public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" };
+
+    /**
+     * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
+     */
+    public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.framework.task" };
+
+    /**
+     * 定时任务违规的字符
+     */
+    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
+            "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.framework.config", "com.ruoyi.project.tool" };
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/PageResult.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/PageResult.java
new file mode 100644
index 00000000..573bb280
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/PageResult.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.knowledge.constants;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Schema(
+        description = "分页结果"
+)
+@Data
+public final class PageResult<T> implements Serializable {
+    @Schema(
+            description = "数据",
+            requiredMode = RequiredMode.REQUIRED
+    )
+    private List<T> list;
+    @Schema(
+            description = "总量",
+            requiredMode = RequiredMode.REQUIRED
+    )
+    private Long total;
+    @Schema(
+            description = "当前页数据量",
+            requiredMode = RequiredMode.REQUIRED
+    )
+    private Integer currentSize;
+    @Schema(
+            description = "当前页数",
+            requiredMode = RequiredMode.REQUIRED
+    )
+    private Integer currentPage;
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/RedisKeyConstants.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/RedisKeyConstants.java
new file mode 100644
index 00000000..82b83d85
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/RedisKeyConstants.java
@@ -0,0 +1,7 @@
+package cn.iocoder.yudao.module.knowledge.constants;
+
+public class RedisKeyConstants {
+    public static final String EXAMINATION_NUMBER_KEY_PREFIX = "exNum:";
+
+    public static final String PAPER_NUMBER_KEY_SUFFIX = "paperNum:";
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/Result.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/Result.java
new file mode 100644
index 00000000..c14bc477
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/Result.java
@@ -0,0 +1,63 @@
+package cn.iocoder.yudao.module.knowledge.constants;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class Result<T> implements Serializable {
+    private Integer code;
+    private String msg;
+    private T data;
+    private static final Integer SUCCESS_CODE = 200;
+    private static final String SUCCESS_MSG = "success";
+    public Result() {
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return this.data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public String toString() {
+        return "Result{code=" + this.code + ", msg='" + this.msg + "', data=" + this.data + "}";
+    }
+    public static <T> Result<T> success(T data) {
+        Result var1 = new Result();
+        var1.setCode(SUCCESS_CODE);
+        var1.setMsg("success");
+        var1.setData(data);
+        return var1;
+    }
+
+    public static <T> Result<T> success() {
+        return success((T)null);
+    }
+
+    public static <T> Result<T> error(Integer code, String msg) {
+        Result var2 = new Result();
+        var2.setCode(code);
+        var2.setMsg(msg);
+        return var2;
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/TestPaperConstants.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/TestPaperConstants.java
new file mode 100644
index 00000000..f579cd77
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/TestPaperConstants.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.knowledge.constants;
+
+public class TestPaperConstants {
+    /**
+     * 保存
+     */
+    public static final Integer SAVE = 1;
+    /**
+     * 交卷
+     */
+    public static final Integer SUBMIT = 2;
+    /**
+     * 单选
+     */
+    public static final String RADIO = "0";
+    /**
+     * 多选
+     */
+    public static final String CHECKBOX = "1";
+    /**
+     * 判断
+     */
+    public static final String JUDGE = "2";
+    /**
+     * 填空
+     */
+    public static final String GAP_FILLING = "3";
+    /**
+     * 问答
+     */
+    public static final String SUBJECTIVE = "4";
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TArchivesController.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TArchivesController.java
new file mode 100644
index 00000000..aae90faa
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TArchivesController.java
@@ -0,0 +1,251 @@
+package cn.iocoder.yudao.module.knowledge.controller.admin;
+
+
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.UserInfoRequest;
+import cn.iocoder.yudao.module.knowledge.entity.TArchives;
+import cn.iocoder.yudao.module.knowledge.service.TArchivesService;
+import cn.iocoder.yudao.module.knowledge.utils.ExcelUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 档案表(TArchives)表控制层
+ *
+ * @author makejava
+ * @since 2024-04-11 10:25:58
+ */
+@RestController
+@RequestMapping("/system/tArchives")
+public class TArchivesController {
+
+
+    /**
+     * 错误日志
+     */
+    private static Logger errorLog = LoggerFactory.getLogger("errorLog");
+
+    /**
+     * 埋点info日志
+     */
+    private static Logger buriedLog = LoggerFactory.getLogger("buriedLog");
+
+    /**
+     * 服务对象
+     */
+    @Autowired
+    private TArchivesService tArchivesService;
+
+    /**
+     * 日常使用测试接口
+     *
+     * @param tArchives
+     * @return
+     */
+    @Operation(summary = "getTArchives", description = "查询文件信息")
+    @Parameters({
+            @Parameter(name = "id", description = "文件id"),
+    })
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "successful operation",
+                    content = {@Content(mediaType = "application/json",
+                            schema = @Schema(implementation = Result.class)
+                    )}),
+            @ApiResponse(responseCode = "250000", description = "paramter error operation",
+                    content = {@Content(mediaType = "application/json",
+                            schema = @Schema(implementation = Result.class)
+                    )})
+    })
+    @GetMapping(value = "/findAll", produces = "application/json;charset=UTF-8")
+    public Result selectAll(TArchivesRequest tArchives) {
+        Page<TArchives> page = new Page<>(tArchives.getPageNo(), tArchives.getPageSize());
+        return Result.success(this.tArchivesService.findAll(page, tArchives));
+    }
+
+    @Operation(summary = "selectOne", description = "查询文件信息")
+    @Parameters({
+            @Parameter(
+                    content = {@Content(mediaType = "application/json",
+                            schema = @Schema(implementation = UserInfoRequest.class)
+                    )})
+    })
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "successful operation",
+                    content = {@Content(mediaType = "application/json",
+                            schema = @Schema(implementation = Result.class)
+                    )}),
+            @ApiResponse(responseCode = "250000", description = "paramter error operation",
+                    content = {@Content(mediaType = "application/json",
+                            schema = @Schema(implementation = Result.class)
+                    )})
+    })
+
+
+    @GetMapping(value = "/findAllDocList", produces = "application/json;charset=UTF-8")
+    public Result findAllDocList(TArchivesRequest tArchives) {
+        Page<TArchives> page = new Page<>(tArchives.getPageNo(), tArchives.getPageSize());
+        return Result.success(this.tArchivesService.findAllDocList(page, tArchives));
+    }
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping(value = "/findOne", produces = "application/json;charset=UTF-8")
+    public Result selectOne(HttpServletRequest request, @RequestParam("id") Integer id) {
+        return Result.success(this.tArchivesService.getById(id));
+    }
+
+    /**
+     * 通过id查询父id
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping(value = "/getParentId", produces = "application/json;charset=UTF-8")
+    public Result getParentId(HttpServletRequest request, @RequestParam(value = "id",required = false) Long id) {
+        return Result.success(this.tArchivesService.getParentId(id));
+    }
+
+    /**
+     * 文件保存
+     * 新建文件夹
+     *
+     * @param tArchivesRequest 实体对象
+     * @return 新增结果
+     */
+    @PostMapping(value = "/save", produces = "application/json;charset=UTF-8")
+    public Result insert(@RequestBody TArchivesRequest tArchivesRequest) throws Exception{
+        return this.tArchivesService.add(tArchivesRequest);
+    }
+
+    /**
+     * 更改文件名以及文件夹名
+     *
+     * @param request
+     * @param id
+     * @param name
+     * @return
+     */
+    @GetMapping(value = "/update", produces = "application/json;charset=UTF-8")
+    public Result update(HttpServletRequest request, @RequestParam("id") Long id, @RequestParam("name") String name) {
+        TArchives tArchives = new TArchives();
+        tArchives.setId(id);
+        tArchives.setCurFilename(name);
+        return Result.success(this.tArchivesService.updateByTaId(tArchives));
+    }
+
+    /**
+     * 删除文件或文件夹
+     *
+     * @param ids
+     * @return
+     */
+    @PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
+    public Result delete(@RequestParam(value = "ids",required = false) List<Long> ids) throws Exception {
+        return this.tArchivesService.delete(ids);
+    }
+
+    /**
+     * 还原
+     *
+     * @param ids
+     * @return
+     */
+    @PostMapping(value = "/restore", produces = "application/json;charset=UTF-8")
+    public Result restore(@RequestParam("ids") List<Long> ids) {
+        return Result.success(this.tArchivesService.restore(ids));
+    }
+
+    /**
+     * 文件移动
+     *
+     * @param tArchivesRequest 实体对象
+     * @return 修改结果
+     */
+    @PostMapping(value = "/move", produces = "application/json;charset=UTF-8")
+    public Result move(@RequestBody TArchivesRequest tArchivesRequest) {
+        return Result.success(this.tArchivesService.move(tArchivesRequest));
+    }
+
+    /**
+     * 更改文件地址
+     *
+     * @param request
+     * @param code
+     * @param url
+     * @return
+     */
+    @GetMapping(value = "/updateUrl", produces = "application/json;charset=UTF-8")
+    public Result updateUrl(HttpServletRequest request, @RequestParam("code ") String code, @RequestParam("url ") String url) {
+        TArchives tArchives = this.tArchivesService.selectByCode(code);
+        tArchives.setFileUrl(url);
+        return Result.success(this.tArchivesService.updateByTaId(tArchives));
+    }
+
+    /**
+     * 导出
+     */
+    @PostMapping(value = "/export", produces = "application/json;charset=UTF-8")
+    public void export(HttpServletResponse response, TArchivesRequest tArchives) {
+
+        List<TArchives> tArchivesList = tArchivesService.findAllDoc(tArchives);
+
+        //导出
+        ExcelUtils.exportExcel(tArchivesList, TArchives.class, "档案文件表", response);
+    }
+
+    /**
+     * 彻底删除
+     *
+     * @param ids 主键结合
+     * @return 删除结果
+     */
+    @PostMapping(value = "ackDelete", produces = "application/json;charset=UTF-8")
+    public Result ackDelete(@RequestParam(value = "ids",required = false) List<Long> ids) {
+        return Result.success(this.tArchivesService.ackDelete(ids));
+    }
+
+    @PostMapping(value = "/app/findAll", produces = "application/json;charset=UTF-8")
+    public Result appFindAll(@RequestBody TArchivesRequest tArchives) {
+        Page<TArchives> page = new Page<>(tArchives.getPageNo(), tArchives.getPageSize());
+        return Result.success(this.tArchivesService.findAll(page, tArchives));
+    }
+
+    @GetMapping(value = "/app/findByParentId", produces = "application/json;charset=UTF-8")
+    public Result appFindByParentId(TArchivesRequest tArchives) {
+        Page<TArchives> page = new Page<>(tArchives.getPageNo(), tArchives.getPageSize());
+        return Result.success(this.tArchivesService.appFindByParentId(page, tArchives));
+    }
+
+    @GetMapping(value = "/app/getParentId", produces = "application/json;charset=UTF-8")
+    public Result appGetParentId(HttpServletRequest request, @RequestParam(value = "id",required = false) String id) {
+        if (!id.equals("null")){
+            return Result.success(this.tArchivesService.getParentId(Long.parseLong(id)));
+        }else {
+            return Result.success();
+        }
+
+    }
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TLawsController.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TLawsController.java
new file mode 100644
index 00000000..b4f2b733
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TLawsController.java
@@ -0,0 +1,275 @@
+package cn.iocoder.yudao.module.knowledge.controller.admin;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.DeleteRequest;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TLawsRequest;
+import cn.iocoder.yudao.module.knowledge.entity.TLaws;
+import cn.iocoder.yudao.module.knowledge.service.TLawsService;
+import cn.iocoder.yudao.module.knowledge.utils.ExcelUtils;
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.List;
+
+/**
+ * 法律法规表(TLaws)表控制层
+ *
+ * @author makejava
+ * @since 2024-04-12 10:31:34
+ */
+@RestController
+@RequestMapping("tLaws")
+public class TLawsController {
+
+    /**
+     * 错误日志
+     */
+    private static Logger errorLog= LoggerFactory.getLogger("errorLog");
+
+    /**
+     * 埋点info日志
+     */
+    private static Logger buriedLog=LoggerFactory.getLogger("buriedLog");
+
+    /**
+     * 服务对象
+     */
+    @Autowired
+    private TLawsService tLawsService;
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param tLaws 查询实体
+     * @return 所有数据
+     */
+    @PostMapping(value = "/findAll",produces = "application/json;charset=UTF-8")
+    public Result findAll(@RequestBody TLawsRequest tLaws) {
+        Page<TLaws> page = new Page<>(tLaws.getPageNo(),tLaws.getPageSize());
+        return Result.success(tLawsService.select(page, tLaws));
+    }
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping(value = "/findOne",produces = "application/json;charset=UTF-8")
+    public Result findOne(@RequestParam(value = "id") String id ) {
+        return Result.success(tLawsService.getById(id));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param tLaws 实体对象
+     * @return 新增结果
+     */
+    @PostMapping(value = "/insert",produces = "application/json;charset=UTF-8")
+    public Result insert(@RequestBody TLawsRequest tLaws) throws Exception {
+        return Result.success(tLawsService.add(tLaws));
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param tLaws 实体对象
+     * @return 修改结果
+     */
+    @PostMapping (value = "/update",produces = "application/json;charset=UTF-8")
+    public Result update(@RequestBody TLawsRequest tLaws) throws Exception {
+        return Result.success(tLawsService.updateByTLId(tLaws));
+    }
+
+    /**
+     * 历史记录
+     *
+     * @return
+     */
+    @GetMapping(value = "/history",produces = "application/json;charset=UTF-8")
+    public Result history(TLawsRequest tLaws) {
+
+        return Result.success(tLawsService.history(tLaws));
+    }
+
+    /**
+     * 归档
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/filing",produces = "application/json;charset=UTF-8")
+    public Result filing(@RequestParam("id") long id ) throws Exception {
+        tLawsService.filing(id);
+        return Result.success();
+    }
+
+    /**
+     * 导出表格
+     * @param response
+     * @param tLaws
+     */
+    @PostMapping(value = "/export",produces = "application/json;charset=UTF-8")
+    public void export(HttpServletResponse response, TLawsRequest tLaws) {
+        //此处调用service查询需要导出的数据
+        List<TLaws> tlawsList = tLawsService.selectForExport(tLaws);
+        //导出
+        ExcelUtils.exportExcel(tlawsList, TLaws.class, "法律法规文件表", response);
+    }
+
+    /**
+     * 归档文件夹
+     * @return
+     */
+    @GetMapping(value = "/archiveFolder",produces = "application/json;charset=UTF-8")
+    public Result archiveFolder() {
+        tLawsService.archiveFolder();
+        return Result.success();
+    }
+
+    /**
+     * 记录查询
+     * @param tLawsRequest
+     * @return
+     */
+    @GetMapping(value = "/recordsQuery",produces = "application/json;charset=UTF-8")
+    public Result recordsQuery(TLawsRequest tLawsRequest) {
+
+        return Result.success(tLawsService.recordsQuery(tLawsRequest));
+    }
+
+
+    /**
+     * 删除数据
+     * @param ids
+     * @return
+     */
+
+    @PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
+    public Result delete(@RequestParam("ids") List<Long> ids) {
+        return Result.success(this.tLawsService.delete(ids));
+    }
+
+    //========app
+    /**
+     * 分页查询所有数据
+     *
+     * @param tLaws 查询实体
+     * @return 所有数据
+     */
+    @PostMapping(value = "/app/findAll",produces = "application/json;charset=UTF-8")
+    public Result findAllForApp(@RequestBody TLawsRequest tLaws) throws ParseException {
+        Page<TLaws> page = new Page<>(tLaws.getPageNo(),tLaws.getPageSize());
+        return Result.success(tLawsService.selectForApp(page, tLaws));
+    }
+
+    /**
+     * app首页文档
+     * @param tLaws
+     * @return
+     */
+    @PostMapping(value = "/app/findAllDocuments",produces = "application/json;charset=UTF-8")
+    public Result findAllDocuments(@RequestBody TLawsRequest tLaws) {
+        Page<TLaws> page = new Page<>(tLaws.getPageNo(),tLaws.getPageSize());
+        return Result.success(tLawsService.findAllDocuments(page, tLaws));
+    }
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping(value = "/app/findOne",produces = "application/json;charset=UTF-8")
+    public Result findOneForApp(@RequestParam(value = "id") String id ) {
+        return Result.success(tLawsService.getById(id));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param tLaws 实体对象
+     * @return 新增结果
+     */
+    @PostMapping(value = "/app/insert",produces = "application/json;charset=UTF-8")
+    public Result insertForApp(@RequestBody TLawsRequest tLaws) throws Exception {
+        return Result.success(tLawsService.addForApp(tLaws));
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param tLaws 实体对象
+     * @return 修改结果
+     */
+    @PostMapping (value = "/app/update",produces = "application/json;charset=UTF-8")
+    public Result updateForApp(@RequestBody TLawsRequest tLaws) throws Exception {
+        return Result.success(tLawsService.updateByTLIdForApp(tLaws));
+    }
+
+    /**
+     * 历史记录
+     *
+     * @return
+     */
+    @GetMapping(value = "/app/history",produces = "application/json;charset=UTF-8")
+    public Result historyForApp(TLawsRequest tLaws) {
+
+        return Result.success(tLawsService.historyForApp(tLaws));
+    }
+
+    /**
+     * 归档
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/app/filing",produces = "application/json;charset=UTF-8")
+    public Result filingForApp(@RequestParam("id") long id ) throws Exception {
+        tLawsService.filingForApp(id);
+        return Result.success();
+    }
+
+    /**
+     * 归档文件夹
+     * @return
+     */
+    @GetMapping(value = "/app/archiveFolder",produces = "application/json;charset=UTF-8")
+    public Result archiveFolderForApp() {
+        tLawsService.archiveFolderForApp();
+        return Result.success();
+    }
+
+    /**
+     * 记录查询
+     * @param tLawsRequest
+     * @return
+     */
+    @GetMapping(value = "/app/recordsQuery",produces = "application/json;charset=UTF-8")
+    public Result recordsQueryForApp(TLawsRequest tLawsRequest) {
+
+        return Result.success(tLawsService.recordsQueryForApp(tLawsRequest));
+    }
+
+
+    /**
+     * 删除数据
+     * @param ids
+     * @return
+     */
+
+    @PostMapping(value = "/app/delete", produces = "application/json;charset=UTF-8")
+    public Result deleteForApp(@RequestParam("ids") List<Long> ids) {
+        return Result.success(tLawsService.deleteForApp(ids));
+    }
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TRegulatoryFrameworkController.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TRegulatoryFrameworkController.java
new file mode 100644
index 00000000..43e3b33d
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TRegulatoryFrameworkController.java
@@ -0,0 +1,263 @@
+package cn.iocoder.yudao.module.knowledge.controller.admin;
+
+
+import cn.iocoder.yudao.module.knowledge.service.TRegulatoryFrameworkService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TRegulatoryFrameworkRequest;
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework;
+import cn.iocoder.yudao.module.knowledge.utils.ExcelUtils;
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.List;
+
+/**
+ * 规章制度表(TRegulatoryFramework)表控制层
+ *
+ * @author makejava
+ * @since 2024-04-12 17:36:32
+ */
+@RestController
+@RequestMapping("tRegulatoryFramework")
+public class TRegulatoryFrameworkController {
+
+    /**
+     * 错误日志
+     */
+    private static Logger errorLog= LoggerFactory.getLogger("errorLog");
+
+    /**
+     * 埋点info日志
+     */
+    private static Logger buriedLog=LoggerFactory.getLogger("buriedLog");
+
+    /**
+     * 服务对象
+     */
+    @Autowired
+    private TRegulatoryFrameworkService regulatoryService;
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param regulatoryFrameworkRequest 查询实体
+     * @return 所有数据
+     */
+    @PostMapping(value = "/findAll",produces = "application/json;charset=UTF-8")
+    public Result findAll(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
+        Page<TRegulatoryFramework> page = new Page<>(regulatoryFrameworkRequest.getPageNo(),regulatoryFrameworkRequest.getPageSize());
+
+        return Result.success(regulatoryService.select(page, regulatoryFrameworkRequest));
+    }
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping(value = "/findOne",produces = "application/json;charset=UTF-8")
+    public Result findOne(@RequestParam(value = "id") String id ) {
+        return Result.success(regulatoryService.getById(id));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param regulatoryFrameworkRequest 实体对象
+     * @return 新增结果
+     */
+    @PostMapping(value = "/insert",produces = "application/json;charset=UTF-8")
+    public Result insert(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest)throws Exception {
+        return Result.success(regulatoryService.add(regulatoryFrameworkRequest));
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param regulatoryFrameworkRequest 实体对象
+     * @return 修改结果
+     */
+    @PostMapping (value = "/update",produces = "application/json;charset=UTF-8")
+    public Result update(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest) throws Exception {
+        return Result.success(regulatoryService.updateByTLId(regulatoryFrameworkRequest));
+    }
+
+    /**
+     * 历史记录
+     *
+     * @return
+     */
+    @GetMapping(value = "/history",produces = "application/json;charset=UTF-8")
+    public Result history(TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
+
+        return Result.success(regulatoryService.history(regulatoryFrameworkRequest));
+    }
+
+    /**
+     * 归档
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/filing",produces = "application/json;charset=UTF-8")
+    public Result filing(@RequestParam("id") long id ) throws Exception {
+        regulatoryService.filing(id);
+        return Result.success();
+    }
+
+    /**
+     * 导出表格
+     * @param response
+     */
+    @PostMapping(value = "/export",produces = "application/json;charset=UTF-8")
+    public void export(HttpServletResponse response, TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
+        //此处调用service查询需要导出的数据
+        List<TRegulatoryFramework> tlawsList = regulatoryService.selectForExport(regulatoryFrameworkRequest);
+        //导出
+        ExcelUtils.exportExcel(tlawsList, TRegulatoryFramework.class, "规章制度文件表", response);
+
+    }
+
+    /**
+     * 归档文件夹
+     * @return
+     */
+    @GetMapping(value = "/archiveFolder",produces = "application/json;charset=UTF-8")
+    public Result archiveFolder() {
+        regulatoryService.archiveFolder();
+        return Result.success();
+    }
+
+    /**
+     * 记录查询
+     * @param tLawsRequest
+     * @return
+     */
+    @GetMapping(value = "/recordsQuery",produces = "application/json;charset=UTF-8")
+    public Result recordsQuery(TRegulatoryFrameworkRequest tLawsRequest) {
+
+        return Result.success(regulatoryService.recordsQuery(tLawsRequest));
+    }
+
+
+    /**
+     * 删除数据
+     * @param ids
+     * @return
+     */
+
+    @PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
+    public Result delete(@RequestParam("ids") List<Long> ids) {
+        return Result.success(regulatoryService.delete(ids));
+    }
+
+    //======app
+    /**
+     * 分页查询所有数据
+     *
+     * @param regulatoryFrameworkRequest 查询实体
+     * @return 所有数据
+     */
+    @PostMapping(value = "/app/findAll",produces = "application/json;charset=UTF-8")
+    public Result findAllForApp(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest) throws ParseException {
+        Page<TRegulatoryFramework> page = new Page<>(regulatoryFrameworkRequest.getPageNo(),regulatoryFrameworkRequest.getPageSize());
+
+        return Result.success(regulatoryService.selectForApp(page, regulatoryFrameworkRequest));
+    }
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping(value = "/app/findOne",produces = "application/json;charset=UTF-8")
+    public Result findOneForApp(@RequestParam(value = "id") String id ) {
+        return Result.success(regulatoryService.getById(id));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param regulatoryFrameworkRequest 实体对象
+     * @return 新增结果
+     */
+    @PostMapping(value = "/app/insert",produces = "application/json;charset=UTF-8")
+    public Result insertForApp(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest)throws Exception {
+        return Result.success(regulatoryService.addForApp(regulatoryFrameworkRequest));
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param regulatoryFrameworkRequest 实体对象
+     * @return 修改结果
+     */
+    @PostMapping (value = "/app/update",produces = "application/json;charset=UTF-8")
+    public Result updateForApp(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest) throws Exception {
+        return Result.success(regulatoryService.updateByTLIdForApp(regulatoryFrameworkRequest));
+    }
+
+    /**
+     * 历史记录
+     *
+     * @return
+     */
+    @GetMapping(value = "/app/history",produces = "application/json;charset=UTF-8")
+    public Result historyForApp(TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
+
+        return Result.success(regulatoryService.historyForApp(regulatoryFrameworkRequest));
+    }
+
+    /**
+     * 归档
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/app/filing",produces = "application/json;charset=UTF-8")
+    public Result filingForApp(@RequestParam("id") long id ) throws Exception {
+        regulatoryService.filingForApp(id);
+        return Result.success();
+    }
+
+    /**
+     * 归档文件夹
+     * @return
+     */
+    @GetMapping(value = "/app/archiveFolder",produces = "application/json;charset=UTF-8")
+    public Result archiveFolderForApp() {
+        regulatoryService.archiveFolderForApp();
+        return Result.success();
+    }
+
+    /**
+     * 记录查询
+     * @param tLawsRequest
+     * @return
+     */
+    @GetMapping(value = "/app/recordsQuery",produces = "application/json;charset=UTF-8")
+    public Result recordsQueryForApp(TRegulatoryFrameworkRequest tLawsRequest) {
+
+        return Result.success(regulatoryService.recordsQueryForApp(tLawsRequest));
+    }
+
+
+    /**
+     * 删除数据
+     * @param ids
+     * @return
+     */
+
+    @PostMapping(value = "/app/delete", produces = "application/json;charset=UTF-8")
+    public Result deleteForApp(@RequestParam("ids") List<Long> ids) {
+        return Result.success(regulatoryService.deleteForApp(ids));
+    }
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TViolationController.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TViolationController.java
new file mode 100644
index 00000000..5bf2579f
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TViolationController.java
@@ -0,0 +1,178 @@
+package cn.iocoder.yudao.module.knowledge.controller.admin;
+
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.BidManagementRequest;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TViolationRequest;
+import cn.iocoder.yudao.module.knowledge.entity.TViolation;
+import cn.iocoder.yudao.module.knowledge.service.TViolationService;
+import cn.iocoder.yudao.module.knowledge.utils.ExcelUtils;
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 违章表(TViolation)表控制层
+ *
+ * @author makejava
+ * @since 2024-04-13 14:58:19
+ */
+@RestController
+@RequestMapping("tViolation")
+public class TViolationController  {
+
+    /**
+     * 错误日志
+     */
+    private static Logger errorLog= LoggerFactory.getLogger("errorLog");
+
+    /**
+     * 埋点info日志
+     */
+    private static Logger buriedLog=LoggerFactory.getLogger("buriedLog");
+
+    /**
+     * 服务对象
+     */
+    @Autowired
+    private TViolationService violationService;
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param tViolation 查询实体
+     * @return 所有数据
+     */
+    @PostMapping(value = "/findAll",produces = "application/json;charset=UTF-8")
+    public Result findAll(@RequestBody TViolationRequest tViolation) {
+        Page<TViolation> page = new Page<>(tViolation.getPageNo(),tViolation.getPageSize());
+        return Result.success(violationService.select(page, tViolation));
+    }
+
+    /**
+     * 导出表格
+     * @param response
+     * @param tViolation
+     */
+    @PostMapping(value = "/export",produces = "application/json;charset=UTF-8")
+    public void export(HttpServletResponse response, TViolationRequest tViolation) {
+        //此处调用service查询需要导出的数据
+
+        List<TViolation> exportList = violationService.selectForExport(tViolation);
+        //导出
+        ExcelUtils.exportExcel(exportList, TViolation.class, "违章管理文件表", response);
+    }
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping(value = "/findOne",produces = "application/json;charset=UTF-8")
+    public Result findOne(@RequestParam(value = "id") Long id ) {
+        return Result.success(violationService.getTVById(id));
+    }
+
+
+    /**
+     * 新增数据
+     * @param request
+     * @return
+     */
+    @PostMapping(value = "/insert",produces = "application/json;charset=UTF-8")
+    public Result insert(@RequestBody TViolationRequest request) {
+        return Result.success(violationService.add(request));
+    }
+
+    /**
+     * 修改数据
+     * @return 修改结果
+     */
+    @PostMapping (value = "/update",produces = "application/json;charset=UTF-8")
+    public Result update(@RequestBody TViolationRequest request) {
+        violationService.updateByIdVo(request);
+        return Result.success();
+    }
+
+
+    /**
+     * 删除数据
+     * @param ids
+     * @return
+     */
+    @PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
+    public Result delete(@RequestParam("ids") List<Long> ids) {
+        return Result.success(violationService.delete(ids));
+    }
+
+
+    //======app
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping(value = "/app/findOne",produces = "application/json;charset=UTF-8")
+    public Result findOneForApp(@RequestParam(value = "id") Long id ) {
+        return Result.success(violationService.findOneForApp(id));
+    }
+
+
+    /**
+     * 新增数据
+     * @param request
+     * @return
+     */
+    @PostMapping(value = "/app/insert",produces = "application/json;charset=UTF-8")
+    public Result insertForApp(@RequestBody TViolationRequest request) {
+        return Result.success(violationService.addForApp(request));
+    }
+
+    /**
+     * 修改数据
+     * @return 修改结果
+     */
+    @PostMapping (value = "/app/update",produces = "application/json;charset=UTF-8")
+    public Result updateForApp(@RequestBody TViolationRequest request) {
+        violationService.updateByIdVoForApp(request);
+        return Result.success();
+    }
+
+
+    /**
+     * 删除数据
+     * @param ids
+     * @return
+     */
+    @PostMapping(value = "/app/delete", produces = "application/json;charset=UTF-8")
+    public Result deleteForApp(@RequestParam("ids") List<Long> ids) {
+        return Result.success(violationService.deleteForApp(ids));
+    }
+    /**
+     * 推送
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/app/push",produces = "application/json;charset=UTF-8")
+    public Result pushForApp(@RequestParam(value = "id") Long id) {
+        violationService.pushForApp(id);
+        return Result.success();
+    }
+
+    @PostMapping(value = "/app/findAll",produces = "application/json;charset=UTF-8")
+    public Result appFindAll(@RequestBody TViolationRequest tViolation) {
+        Page<TViolation> page = new Page<>(tViolation.getPageNo(),tViolation.getPageSize());
+        return Result.success(violationService.appFindAll(page, tViolation));
+    }
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/api/CommonApi.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/api/CommonApi.java
new file mode 100644
index 00000000..86f3c0fe
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/api/CommonApi.java
@@ -0,0 +1,101 @@
+//package cn.iocoder.yudao.module.knowledge.controller.api;
+//
+//import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+//import cn.iocoder.yudao.module.knowledge.constants.Result;
+//import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+//import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+//import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+//import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+//import cn.iocoder.yudao.module.knowledge.common.StringUtils;
+//import cn.iocoder.yudao.module.knowledge.entity.DeptTree;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.*;
+//
+//@RestController
+//@RequestMapping("/commonApi")
+//public class CommonApi {
+//    @Autowired
+//    private DeptApi deptApi;
+//    @Autowired
+//    private AdminUserApi userApi;
+//    @GetMapping("/getDeptData")
+//    public Result getDeptData(){
+//        List<DeptRespDTO> deptList = deptApi.getDeptList(null);
+//        List<DeptTree> tempList =new ArrayList<>();
+//        for (DeptRespDTO deptRespDTO : deptList) {
+//            DeptTree deptTree =new DeptTree();
+//            deptTree.setId(deptRespDTO.getId());
+//            deptTree.setParentId(deptRespDTO.getParentId());
+//            deptTree.setLabel(deptRespDTO.getName());
+//            tempList.add(deptTree);
+//        }
+//        //循环递归处理返回树结构
+//        List<DeptTree> deptTrees = buildTree(tempList);
+//        return Result.success(deptTrees);
+//    }
+////    @GetMapping("/getUserData")
+////    public Result getUserData(@RequestParam(value = "deptIds") Collection<Long> deptIds,
+////                              @RequestParam(value = "nickName",required = false) String nickName){
+////        CommonResult<List<AdminUserRespDTO>> userListByDeptIds = userApi.getUserByUsername(deptIds,false,nickName);
+////        return Result.success(userListByDeptIds.getData());
+////    }
+//
+////    public List<DeptTree> buildTree(List<DeptTree> depts)
+////    {
+////        List<DeptTree> returnList = new ArrayList<DeptTree>();
+////        List<Long> tempList = depts.stream().map(DeptTree::getId).toList();
+////        for (DeptTree dept : depts)
+////        {
+////            // 如果是顶级节点, 遍历该父节点的所有子节点
+////            if (!tempList.contains(dept.getParentId()))
+////            {
+////                recursionFn(depts, dept);
+////                returnList.add(dept);
+////            }
+////        }
+////        if (returnList.isEmpty())
+////        {
+////            returnList = depts;
+////        }
+////        return returnList;
+////    }
+//
+//    private void recursionFn(List<DeptTree> list, DeptTree t)
+//    {
+//        // 得到子节点列表
+//        List<DeptTree> childList = getChildList(list, t);
+//        t.setChildren(childList);
+//        for (DeptTree tChild : childList)
+//        {
+//            if (hasChild(list, tChild))
+//            {
+//                recursionFn(list, tChild);
+//            }
+//        }
+//    }
+//    private List<DeptTree> getChildList(List<DeptTree> list, DeptTree t)
+//    {
+//        List<DeptTree> tlist = new ArrayList<DeptTree>();
+//        Iterator<DeptTree> it = list.iterator();
+//        while (it.hasNext())
+//        {
+//            DeptTree n = (DeptTree) it.next();
+//            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getId().longValue())
+//            {
+//                tlist.add(n);
+//            }
+//        }
+//        return tlist;
+//    }
+//
+//    /**
+//     * 判断是否有子节点
+//     */
+//    private boolean hasChild(List<DeptTree> list, DeptTree t)
+//    {
+//        return !getChildList(list, t).isEmpty();
+//    }
+//
+//}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/BidManagementRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/BidManagementRequest.java
new file mode 100644
index 00000000..b1d0f475
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/BidManagementRequest.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class BidManagementRequest extends PageParam {
+
+    private String id;
+
+    private String tag;
+
+    private String title;
+
+    private String fileName;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String createTime;
+
+    private String fileSize;
+    private String fileUrl;
+
+    private String des;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/DeleteRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/DeleteRequest.java
new file mode 100644
index 00000000..a49f9b2e
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/DeleteRequest.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DeleteRequest {
+    List<String> idList;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/ExpertRequestPage.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/ExpertRequestPage.java
new file mode 100644
index 00000000..d92bdefa
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/ExpertRequestPage.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import lombok.Data;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.controller.requestdto
+ * @className:TOperaDocPage
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/24 20:10
+ **/
+@Data
+public class ExpertRequestPage extends PageParam {
+
+    private String searchKey;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/KnowledgeStatisticsRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/KnowledgeStatisticsRequest.java
new file mode 100644
index 00000000..d5bbc24b
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/KnowledgeStatisticsRequest.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class KnowledgeStatisticsRequest extends PageParam {
+
+    private Long id;
+    //文件的唯一编码
+    private String code;
+    //名称
+    private String name;
+    //版本
+    private String version;
+    //文件真实存在的地方
+    private String fileUrl;
+    //文件大小
+    private Long fileSize;
+    //文件原名称
+    private String fileName;
+    //归档时间
+    private Date filingTime;
+    //是否归档
+    private Integer isFiling;
+    //是否删除
+    
+    //预留字段
+    private String lawsA;
+    //预留字段
+    private String lawsB;
+    //创建者
+    private String creator;
+    //创建者id
+    private String creatorId;
+    //创建时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+    //更改时间
+    private Date updateTime;
+    //说明
+    private String describeInfo;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/MonitorRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/MonitorRequest.java
new file mode 100644
index 00000000..634d5a85
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/MonitorRequest.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.module.knowledge.entity.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.controller.requestdto
+ * @className:MonitorRquest
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/27 11:38
+ **/
+@Data
+public class MonitorRequest extends TRegulatoryFrameworkExecution {
+
+    @Schema(description = "",example = "")
+    private TFileInfo fileContent;
+
+
+    @Schema(description = "",example = "")
+    private List<TRfeContent> rfeContents;
+    @Schema(description = "",example = "")
+    private List<TRfeUser> users;
+
+//    ==========================================
+
+
+    @Schema(description = "",example = "")
+    private Long rfecId;
+
+    @Schema(description = "",example = "")
+    private String countent;
+
+    @Schema(description = "",example = "")
+    private String descr;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/MonitorRequestPage.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/MonitorRequestPage.java
new file mode 100644
index 00000000..7c4b4dd4
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/MonitorRequestPage.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import lombok.Data;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.controller.requestdto
+ * @className:TOperaDocPage
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/24 20:10
+ **/
+@Data
+public class MonitorRequestPage extends PageParam {
+
+    private String bgnTime;
+    private String endTime;
+    private String searchKey;
+    private String state;
+    private Long userId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/RRfeuTaskFileRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/RRfeuTaskFileRequest.java
new file mode 100644
index 00000000..4fc4cdec
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/RRfeuTaskFileRequest.java
@@ -0,0 +1,78 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 监督内容文件表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-06-23
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "监督内容文件表查询")
+public class RRfeuTaskFileRequest extends PageParam {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 监督任务内容id
+     */
+    private Long rRfeuTaskContentId;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 文件路径
+     */
+    private String fileUrl;
+
+    /**
+     * 租户id
+     */
+    private Long tenantId;
+
+    /**
+     * 创建者
+     */
+    private String creator;
+
+    /**
+     * 创建者id
+     */
+    private String creatorId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更改时间
+     */
+    private Date updateTime;
+
+    private String deptId;
+
+    private String identityId;
+
+    /**
+     * 文件大小
+     */
+    private Long fileSize;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/Stemdto.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/Stemdto.java
new file mode 100644
index 00000000..c7b0e1c7
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/Stemdto.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "生成试卷题目类型dto" )
+@Data
+public class Stemdto {
+
+    @Schema(description = "题目类型")
+    private String type;
+
+    @Schema(description = "题数")
+    private Integer questionSum;
+
+    @Schema(description = "单个分数")
+    private double score;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TArchivesRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TArchivesRequest.java
new file mode 100644
index 00000000..ae458f32
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TArchivesRequest.java
@@ -0,0 +1,68 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.controller.responsevo.FileInfo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 档案表(TArchives)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-11 10:25:58
+ */
+@Data
+public class TArchivesRequest extends PageParam {
+
+    //父id
+    private Long parentId;
+    //主键id
+    private Long id;
+
+    //归档文件id
+    private Long pigeonholeId;
+
+    //类型 1 ：图片 2：视频 3：文档 4 ：音频
+    private String type;
+
+    //文件现名称
+    private String curFilename;
+    private String originalFilename;
+
+    //是否是文件夹 0：文件夹 1:文件
+    private Integer isDir;
+    //是否删除 0：已删除，1：未删除
+    
+    //是否移到回收站 0：是 1：否
+    private Integer isRecycled;
+    //ids
+    private List<Long> ids;
+    private List<Long> idlsit;
+
+    //文件的唯一编码
+    private String code;
+
+    //文件真实存在的地方
+    private String fileUrl;
+    //文件大小
+    private Long fileSize;
+    //创建者
+    private String creator;
+    //创建者id
+    private String creatorId;
+
+    @TableField(exist = false)
+    private FileInfo fileInfo;
+    //创建时间
+    private Date createTime;
+    //更改时间
+    private Date updateTime;
+    //  0：未归档 1 ：归档
+    private String archiveType;
+    private String year;
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TBidConfirmationCandidateRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TBidConfirmationCandidateRequest.java
new file mode 100644
index 00000000..56ee4e01
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TBidConfirmationCandidateRequest.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+* 招标确认函候选人表查询
+*
+* @author admin 
+* @since 1.0.0 2024-04-15
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "招标确认函候选人表查询")
+public class TBidConfirmationCandidateRequest extends PageParam {
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TBidConfirmationRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TBidConfirmationRequest.java
new file mode 100644
index 00000000..32e86748
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TBidConfirmationRequest.java
@@ -0,0 +1,117 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.module.knowledge.entity.TBidConfirmationCandidate;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* 招标确认函查询
+*
+* @author admin
+* @since 1.0.0 2024-04-18
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "招标确认函查询")
+public class TBidConfirmationRequest extends PageParam {
+    @Schema(description = "主键")
+    @TableId
+    private Long id;
+
+    @Schema(
+            description = "标签",
+            example = "1"
+    )
+    private String tag;
+
+    @Schema(
+            description = "公司名",
+            example = "科技公司"
+    )
+    private String companyName;
+
+    @Schema(
+            description = "中标标题",
+            example = "标题"
+    )
+    private String title;
+
+    @Schema(
+            description = "招标编号",
+            example = "a01"
+    )
+    private String bigCode;
+
+    @Schema(
+            description = "项目名称",
+            example = "zhaobiao"
+    )
+    private String projectName;
+
+    @Schema(
+            description = "招标人",
+            example = "xaomin"
+    )
+    private String tenderee;
+
+    @Schema(
+            description = "发函时间",
+            example = "2024"
+    )
+    private Integer letterDateYear;
+
+    @Schema(
+            description = "发函时间",
+            example = "1"
+    )
+    private Integer letterDateMonth;
+
+    @Schema(
+            description = "中标时间",
+            example = "1"
+    )
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date winBidTime;
+
+    @Schema(
+            description = "发函时间",
+            example = "2024:04:15 08:23:56"
+    )
+    private Integer letterDateDay;
+
+    @Schema(
+            description = "中标说明",
+            example = "中标了"
+    )
+    private String winBidDes;
+
+    @Schema(description = "文件真实存在的地方", example = "/path/to/file/example.jpg")
+    private String fileUrl;
+
+    @Schema(description = "文件大小", example = "1024KB")
+    private Long fileSize;
+
+    @Schema(description = "文件原名称", example = "example.jpg")
+    private String fileName;
+
+    @Schema(description = "归档时间", example = "2024-04-15T12:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date filingTime;
+
+    @Schema(description = "是否归档", allowableValues = {"0", "1"}, example = "0")
+    private Integer isFiling;
+
+    @Schema(
+            description = "候选人列表")
+    private List<TBidConfirmationCandidate> bidConfirmationCandidateList;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TBidPlanRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TBidPlanRequest.java
new file mode 100644
index 00000000..786814cb
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TBidPlanRequest.java
@@ -0,0 +1,181 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.module.knowledge.entity.TFileInfo;
+import cn.iocoder.yudao.module.knowledge.entity.TNotProcurementBid;
+import cn.iocoder.yudao.module.knowledge.entity.TProcurementBid;
+import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* 招标计划表查询
+*
+* @author admin 
+* @since 1.0.0 2024-04-15
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "招标计划表查询")
+public class TBidPlanRequest extends PageParam {
+    @Schema(description = "主键")
+    @TableId
+    private Long id;
+
+    @Schema(
+            description = "标签",
+            example = "123"
+    )
+    private String tag;
+
+    @Schema(
+            description = "项目名称",
+            example = "项目"
+    )
+    private String projectName;
+
+    @Schema(
+            description = "委员会",
+            example = "sdas"
+    )
+    private String committee;
+
+    @Schema(
+            description = "编制",
+            example = "wes"
+    )
+    private String authorizedStrength;
+
+    @Schema(
+            description = "审核",
+            example = "dfd"
+    )
+    private String audit;
+
+    @Schema(
+            description = "审批",
+            example = "ddf"
+    )
+    private String approval;
+
+    @Schema(
+            description = "项目日期",
+            example = "2024-04-14 15:13:42"
+    )
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date projectDate;
+
+    @Schema(
+            description = "审议日期",
+            example = "2024-04-14 15:13:42"
+    )
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date auditDate;
+
+    @Schema(
+            description = "盖章日期",
+            example = "2024-04-14 15:13:42"
+    )
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date stampDate;
+
+    @Schema(
+            description = "招标团队",
+            example = "erdf"
+    )
+    private String bidTeam;
+
+    @Schema(
+            description = "分工与职责",
+            example = "ere"
+    )
+    private String responsibility;
+
+    @Schema(
+            description = "项目概述",
+            example = "dfewfew"
+    )
+    private String overview;
+
+    @Schema(
+            description = "调研与对标情况",
+            example = "ddsdff"
+    )
+    private String researchSituation;
+
+    @Schema(
+            description = "工程类（起草人）",
+            example = "小明"
+    )
+    private String engineering;
+
+    @Schema(
+            description = "设备类（批准人）",
+            example = "小青"
+    )
+    private String equipment;
+
+    @Schema(
+            description = "材料类（首次发布时间）",
+            example = "2024-04-14 15:13:42"
+    )
+    private String materials;
+
+    @Schema(
+            description = "服务类(目的)",
+            example = "招标"
+    )
+    private String service;
+
+    @Schema(
+            description = "其他(适用范围)",
+            example = "0"
+    )
+    private String rests;
+
+    @Schema(description = "文件真实存在的地方", example = "/path/to/file/example.jpg")
+    private String fileUrl;
+
+    @Schema(description = "文件大小", example = "1024KB")
+    private Long fileSize;
+
+    @Schema(description = "文件原名称", example = "example.jpg")
+    private String fileName;
+
+    @Schema(description = "归档时间", example = "2024-04-15T12:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date filingTime;
+
+    @Schema(description = "是否归档", allowableValues = {"0", "1"}, example = "0")
+    private Integer isFiling;
+
+    @Schema(
+            description = "非招标采购方式",
+            example = "list"
+    )
+    private List<TNotProcurementBid> notProcurementBids;
+
+    @Schema(
+            description = "招标采购方式",
+            example = "list"
+    )
+    private List<TProcurementBid> procurementBids;
+
+    @Schema(
+            description = "上传的文件",
+            example = "file"
+    )
+    private TFileInfo uploadFileInfo;
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseDirectoryRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseDirectoryRequest.java
new file mode 100644
index 00000000..613e6b9e
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseDirectoryRequest.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 课程目录表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "课程目录表查询")
+public class TCourseDirectoryRequest extends PageParam {
+    @Schema(description = "主键")
+    @NotNull(groups = EditGroup.class, message = "id不能为空")
+    private Long id;
+
+    @NotNull(message = "父id不能为空")
+    @Schema(description = "父id", example = "1")
+    private Long parentId;
+
+    @NotBlank(message = "目录名称不能为空")
+    @Schema(description = "目录名称", example = "数学")
+    private String name;
+
+    @Schema(description = "序号", example = "1")
+    private Integer sequence;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCoursePushRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCoursePushRequest.java
new file mode 100644
index 00000000..fd630557
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCoursePushRequest.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 课程推送查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-05-12
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "课程推送查询")
+public class TCoursePushRequest extends PageParam {
+    @Schema(description = "主键")
+    @NotNull(message = "id不能为空", groups = EditGroup.class)
+    private Long id;
+
+    @Schema(description = "视频名称")
+    @NotBlank(message = "视频名称不能为空")
+    private String name;
+
+    @Schema(description = "视频路径")
+    @NotBlank(message = "视频路径不能为空")
+    private String fileUrl;
+
+    private Boolean status;
+
+    private Date dateTime;
+
+    @Schema(description = "推送时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    private Date pushTime;
+    private Date pushTimeStart;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRecordsRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRecordsRequest.java
new file mode 100644
index 00000000..6d77bd8b
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRecordsRequest.java
@@ -0,0 +1,76 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import javax.validation.constraints.NotNull;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+
+import java.util.Date;
+
+/**
+ * 学习记录表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-06-17
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "学习记录表查询")
+public class TCourseRecordsRequest extends PageParam {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 用户主键
+     */
+    private Long userId;
+
+    /**
+     * 课程id
+     */
+    private Long courseId;
+
+    /**
+     * 持续时长
+     */
+    private Double continueTime;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private String creator;
+
+    /**
+     * 更改时间
+     */
+    private Date updateTime;
+
+    private String deptId;
+
+    private String identityId;
+
+    /**
+     * 是否删除 1：已删除，0：未删除
+     */
+    
+
+    /**
+     * 租户id
+     */
+    private Long tenantId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRequest.java
new file mode 100644
index 00000000..00c26a23
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRequest.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+
+/**
+ * 课程表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "课程表查询")
+public class TCourseRequest extends PageParam {
+    @Schema(description = "主键")
+    @NotNull(message = "id不能为空", groups = EditGroup.class)
+    private Long id;
+
+    @NotNull(message = "courseDirectoryId不能为空")
+    @Schema(description = "课程目录表主键", example = "1")
+    private Long courseDirectoryId;
+
+    @Schema(description = "课程目录名称", example = "数学")
+    private String courseDirectoryName;
+
+    @NotBlank(message = "课程名称不能为空")
+    @NotBlank(message = "课程名称不能为空")
+    @Schema(description = "课程名称", example = "数学")
+    private String name;
+
+    @Schema(description = "课程说明", example = "erwef")
+    private String desrc;
+
+    @Valid
+    @Schema(description = "课件, 新增修改时需要", example = "1")
+    private List<TCoursewareRequest> coursewares;
+
+    private List<Long> courseDirectoryIdList;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCoursewareRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCoursewareRequest.java
new file mode 100644
index 00000000..831dabcc
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCoursewareRequest.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+
+/**
+ * 课件表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "课件表查询")
+public class TCoursewareRequest extends PageParam {
+    @Schema(description = "主键")
+    @TableId
+    private Long id;
+
+    @Schema(description = "课程表主键", example = "1")
+    private Long courseId;
+
+    @Schema(description = "课件名称", example = "数学课件")
+    private String name;
+
+    @Schema(description = "课程说明", example = "dsds")
+    private String desrc;
+
+    @Schema(description = "编码 （用于在文件表中获取附件信息）", example = "a01")
+    private String code;
+
+    @Schema(description = "排序", example = "1")
+    private Integer order;
+
+    @Schema(description = "文件地址", example = "http://www.baidu.com")
+    private String fileUrl;
+
+    @Schema(description = "文件名称")
+    private String fileName;
+
+    @Schema(description = "文件大小 单位M")
+    private Integer fileSize;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertMaintenanceRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertMaintenanceRequest.java
new file mode 100644
index 00000000..b07ed2e1
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertMaintenanceRequest.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import javax.validation.constraints.NotNull;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+
+import java.util.Date;
+
+/**
+ * 专家维护信息表查询
+ *
+ * @author admin 
+ * @since 1.0.0 2024-05-02
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "专家维护信息表查询")
+public class TExpertMaintenanceRequest extends PageParam {
+
+    /**
+     * 标签编号
+     */
+    private String tagNum;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+    /**
+     * 专家人数
+     */
+    private Integer expertNum;
+
+    /**
+     * 专家汇总（专家id 以,隔开）
+     */
+    private String expertIds;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertRequest.java
new file mode 100644
index 00000000..16f91649
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertRequest.java
@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import javax.validation.constraints.NotNull;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+
+import java.util.Date;
+
+/**
+ * 专家表查询
+ *
+ * @author admin 
+ * @since 1.0.0 2024-05-02
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "专家表查询")
+public class TExpertRequest extends PageParam {
+
+    /**
+     * 人员姓名
+     */
+    private String username;
+
+    /**
+     * 人员编码
+     */
+    private String usercode;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 头像
+     */
+    private String headPortrait;
+
+    /**
+     * 学历
+     */
+    private String educationBackground;
+
+    /**
+     * 介绍
+     */
+    private String introduce;
+
+    /**
+     * 领域专家
+     */
+    private String domainExpert;
+
+    /**
+     * 职位
+     */
+    private String post;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更改时间
+     */
+    private Date updateTime;
+
+    private String deptId;
+
+    private String identityId;
+
+    /**
+     * 是否删除 1：已删除，0：未删除
+     */
+    
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCollectionRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCollectionRequest.java
new file mode 100644
index 00000000..69f82a00
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCollectionRequest.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import javax.validation.constraints.NotNull;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 专家专区收藏信息表查询
+ *
+ * @author admin 
+ * @since 1.0.0 2024-05-05
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "专家专区收藏信息表查询")
+public class TExpertZoneCollectionRequest extends PageParam {
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCommentRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCommentRequest.java
new file mode 100644
index 00000000..27b7075f
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCommentRequest.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import javax.validation.constraints.NotNull;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+
+import java.util.Date;
+
+/**
+ * 专家专区评论信息表查询
+ *
+ * @author admin 
+ * @since 1.0.0 2024-05-05
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "专家专区评论信息表查询")
+public class TExpertZoneCommentRequest extends PageParam {
+    /**
+     * 专家专区id
+     */
+    private Long expertZoneId;
+
+    /**
+     * 评论级别：1一级评论，2二级评论
+     */
+    private String commentLevel;
+
+    /**
+     * 一级评论id
+     */
+    private Long pid;
+
+    /**
+     * 评论内容
+     */
+    private String commentContent;
+
+    /**
+     * 创建用户id
+     */
+    private Long userId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneRequest.java
new file mode 100644
index 00000000..3a75b881
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneRequest.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import javax.validation.constraints.NotNull;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+
+import java.util.Date;
+
+/**
+ * 专家专区查询
+ *
+ * @author admin 
+ * @since 1.0.0 2024-05-04
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "专家专区查询")
+public class TExpertZoneRequest extends PageParam {
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 专家id
+     */
+    private Long specialistId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TLawsRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TLawsRequest.java
new file mode 100644
index 00000000..3f0b458e
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TLawsRequest.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class TLawsRequest extends PageParam {
+
+    private Long id;
+    //文件的唯一编码
+    private String code;
+    //名称
+    private String name;
+    //版本
+    private String version;
+    //文件真实存在的地方
+    private String fileUrl;
+    //文件大小
+    private Long fileSize;
+    //文件原名称
+    private String fileName;
+    //归档时间
+    private Date filingTime;
+    //是否归档
+    private Integer isFiling;
+    //是否删除
+    
+    //预留字段
+    private String lawsA;
+    //1:法律2:行政法规3:部门规章4:地方法规5:地方规章
+    private String type;
+    //预留字段
+    private String lawsB;
+    //创建者
+    private String creator;
+    //创建者id
+    private String creatorId;
+    //创建时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+    //更改时间
+    private Date updateTime;
+    //说明
+    private String describeInfo;
+    @TableField(exist = false)
+    private String createTimeStr;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TMapRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TMapRequest.java
new file mode 100644
index 00000000..16f6d449
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TMapRequest.java
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import cn.iocoder.yudao.module.knowledge.entity.TMapImage;
+import cn.iocoder.yudao.module.knowledge.entity.TMapNode;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class TMapRequest extends PageParam {
+
+
+    @Schema(description = "主键", example = "1")
+    private Long id;
+
+    @Schema(description = "文件的唯一编码", example = "ABC123")
+    private String name;
+
+    @Schema(description = "名称", example = "文件名称")
+    private String modelTag;
+
+    @Schema(description = "创建者", example = "John Doe")
+    private String creator;
+
+    @Schema(description = "创建者id", example = "1001")
+    private String creatorId;
+
+    @TableField(
+            fill = FieldFill.INSERT
+    )
+    @ExcelOut(name = "创建时间", sort = 6 ,width = 25,dateFormat = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date createTime;
+
+    @Schema(description = "地图节点集合", example = "list")
+    private List<TMapNode> node;
+
+    @Schema(description = "父级地图节点id", example = "list")
+    private Long parentId;
+
+    @Schema(description = "地图id", example = "list")
+    private Long mapId;
+
+    @Schema(
+            description = "图片",
+            example = "jpg"
+    )
+    private List<TMapImage> imgList;
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TMonthlyProjectPurchaseRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TMonthlyProjectPurchaseRequest.java
new file mode 100644
index 00000000..457f4503
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TMonthlyProjectPurchaseRequest.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * (TMonthlyProjectPurchase)表实体类
+ *
+ */
+@Data
+public class TMonthlyProjectPurchaseRequest extends PageParam {
+
+    private Long id;
+    //所在项目名称
+    private String projectName;
+    //采购事项名称
+    private String procurementMatters;
+    //采购内容
+    private String procurementContent;
+    //事项类型
+    private String matterType;
+    //采购方式
+    private String purchasingMethod;
+    //招标代理机构
+    private String tenderingAgency;
+    //预估合同价
+    private String contractPriceEstimated;
+    //合同价
+    private String contractPrice;
+    //中标价
+    private String bidPrice;
+    //采购时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date purchaseTime;
+    //合同签订时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date contractSigningTime;
+    //合同相对方
+    private String contractCounterparty;
+    //备注
+    private String remark;
+    //创建人
+    private String creator;
+    
+    private String deptId;
+    
+    private String identityId;
+    //是否删除
+    
+    //创建时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+    //更改时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+    //租户id
+    private Long tenantId;
+
+    private String bgnTime;
+    private String endTime;
+
+
+
+    }
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOperaDocPage.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOperaDocPage.java
new file mode 100644
index 00000000..cf9f2f7a
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOperaDocPage.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import lombok.Data;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.controller.requestdto
+ * @className:TOperaDocPage
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/24 20:10
+ **/
+@Data
+public class TOperaDocPage extends PageParam {
+
+    private String createTime;
+    private String cnName;
+    private String name;
+    private String selTagValue;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOperationDocRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOperationDocRequest.java
new file mode 100644
index 00000000..60fad9b2
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOperationDocRequest.java
@@ -0,0 +1,158 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.module.knowledge.entity.TOperationProcedure;
+import cn.iocoder.yudao.module.knowledge.entity.TOperationProcedureCore;
+import cn.iocoder.yudao.module.knowledge.entity.TProductRawMaterials;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TOperationDocument
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/19 15:30
+ **/
+@Data
+public class TOperationDocRequest extends TProductRawMaterials {
+
+    @Schema(description = "操作文件中文名称",example = "2024某某公司")
+    private String cnName;
+
+    @Schema(description = "文件类型标识",example = "0；,1：,2：")
+    private String tag;
+
+    @Schema(description = "操作步骤",example = "[{xx:'',xx:''},{xx:'',xx:''}]")
+    private ArrayList<TOperationProcedureCore> czTableDatas;
+
+
+    @Schema(description = "操作文件编码",example = "")
+    private String operationDocumentCode;
+
+    @Schema(description = "单位名称",example = "")
+    private String unitName;
+
+    @Schema(description = "作业名称/人数",example = "")
+    private String jobName;
+
+    @Schema(description = "编号",example = "")
+    private String code;
+
+    @Schema(description = "劳保用品",example = "")
+    private String labour;
+
+    @Schema(description = "使用工具/材料",example = "")
+    private String tool;
+
+    @Schema(description = "作业环境",example = "")
+    private String environment;
+
+    @Schema(description = "编制人/日期",example = "")
+    private String organizer;
+
+    @Schema(description = "审核人/日期",example = "")
+    private String auditor;
+
+    @Schema(description = "批准人/日期",example = "")
+    private String approver;
+    private String version;
+
+    @Schema(description = "内容",example = "")
+    private List<String> content;
+
+    @Schema(description = "英文名称",example = "")
+    private String setx;
+
+    @Schema(description = "原编码")
+    private String originalCode;
+
+    @Schema(description = "受控状态")
+    private String controlledState;
+
+    @Schema(description = "发布时间", example = "2024-04-23T12:00:00")
+    private Date releaseTime;
+
+    @Schema(description = "实施时间", example = "2024-04-23T12:00:00")
+    private Date implementationTime;
+
+    @Schema(description = "顺序号")
+    private String sn;
+
+    @Schema(description = "系列")
+    private String series;
+
+    @Schema(description = "具体操作")
+    private String concreteOperations;
+
+    @Schema(description = "变化内容")
+    private String changeContent;
+
+    @Schema(description = "标准归口")
+    private String attribute;
+
+    @Schema(description = "起草单位")
+    private String draftingUnit;
+
+    @Schema(description = "起草人")
+    private String rapporteur;
+
+    @Schema(description = "第一次发布时间", example = "2024-04-23T12:00:00")
+    private Date firstReleaseTime;
+
+    @Schema(description = "目的")
+    private String purpose;
+
+    @Schema(description = "适用范围")
+    private String scopeOfApplication;
+
+    @Schema(description = "术语")
+    private String term;
+
+    @Schema(description = "引用文件")
+    private String referenceFile;
+
+    @Schema(description = "要求")
+    private String requires;
+
+    @Schema(description = "相关文件")
+    private String relevantFile;
+
+    @Schema(description = "相关记录")
+    private String relevantRecord;
+
+    @Schema(description = "发放范围")
+    private String distributionScope;
+
+
+
+    @Schema(description = "符号",example = "")
+    private String symbol;
+
+    @Schema(description = "实验方法",example = "")
+    private String experimentalMethod;
+
+    @Schema(description = "组批",example = "")
+    private String lotGrouping;
+
+    @Schema(description = "取样",example = "")
+    private String sampling;
+
+    @Schema(description = "质量结果判定",example = "")
+    private String resultDetermination;
+
+    @Schema(description = "不合格处置方式",example = "")
+    private String disposalMethod;
+
+    @Schema(description = "称重",example = "")
+    private String weigh;
+    //具体内容
+    private String specificContent;
+    private String type;
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOtherArchivesRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOtherArchivesRequest.java
new file mode 100644
index 00000000..4262b48b
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOtherArchivesRequest.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import cn.iocoder.yudao.module.knowledge.controller.responsevo.FileInfo;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @author makejava
+ * @since 2024-04-11 10:25:58
+ */
+@Data
+public class TOtherArchivesRequest extends PageParam {
+
+    //父id
+    private Long parentId;
+    //主键id
+    private Long id;
+
+    //归档文件id
+    private Long pigeonholeId;
+
+    //类型 1 ：图片 2：视频 3：文档 4 ：音频
+    private String type;
+
+    //文件现名称
+    @ExcelOut(name = "文件名称", sort = 1, width = 20)
+    private String curFilename;
+    private String originalFilename;
+
+    //是否是文件夹 0：文件夹 1:文件
+    private Integer isDir;
+    //是否删除 0：已删除，1：未删除
+    
+    //是否移到回收站 0：是 1：否
+    private Integer isRecycled;
+    //ids
+    private List<Long> ids;
+    private List<Long> idlsit;
+
+    //文件的唯一编码
+    private String code;
+
+    //文件真实存在的地方
+    private String fileUrl;
+    //文件大小
+    @ExcelOut(name = "文件大小", sort = 1, width = 20)
+    private Long fileSize;
+    //创建者
+    private String creator;
+    //创建者id
+    private String creatorId;
+
+    @TableField(exist = false)
+    private FileInfo fileInfo;
+    //创建时间
+    @ExcelOut(name = "文件创建时间", sort = 1, width = 20)
+    private Date createTime;
+    //更改时间
+    private Date updateTime;
+    //  0：未归档 1 ：归档
+    private String archiveType;
+    private String year;
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TProductRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TProductRequest.java
new file mode 100644
index 00000000..8b719285
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TProductRequest.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.module.knowledge.entity.TOperationProcedure;
+import cn.iocoder.yudao.module.knowledge.entity.TOperationProcedureCore;
+import cn.iocoder.yudao.module.knowledge.entity.TProductRawMaterials;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TOperationDocument
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/19 15:30
+ **/
+@Data
+public class TProductRequest extends TProductRawMaterials {
+
+    @Schema(description = "标准名称",example = "2024某某公司")
+    private String cpName;
+
+    @Schema(description = "文件类型标识",example = "0；,1：,2：")
+    private String tag;
+
+    @Schema(description = "文件类型标识",example = "0；,1：,2：")
+    private String content;
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TQuestionAnswersRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TQuestionAnswersRequest.java
new file mode 100644
index 00000000..57b1f30d
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TQuestionAnswersRequest.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+
+/**
+ * 题答案表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "题答案表类")
+public class TQuestionAnswersRequest extends PageParam {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    @Schema(description = "主键")
+    private Long id;
+
+    @Schema(description = "题干表id", example = "1")
+    private Long questionStemId;
+
+    @Schema(description = "内容", example = "dsfs")
+    private String content;
+
+    @Schema(description = "文件地址", example = "/d/ddw")
+    private String fileUrl;
+
+    @Schema(description = "选项", example = "A")
+    private String options;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TQuestionBankRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TQuestionBankRequest.java
new file mode 100644
index 00000000..bb11081d
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TQuestionBankRequest.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+
+/**
+ * 题库表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "题库表查询")
+public class TQuestionBankRequest extends PageParam {
+    @Schema(description = "主键")
+    @TableId
+    private Long id;
+
+    @Schema(description = "父id", example = "1")
+    private Long parentId;
+
+    @Schema(description = "目录名称", example = "dwd")
+    private String name;
+    @Schema(description = "序号", example = "1")
+    private Integer sequence;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TQuestionStemRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TQuestionStemRequest.java
new file mode 100644
index 00000000..687ec173
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TQuestionStemRequest.java
@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+import java.util.List;
+
+
+/**
+ * 题干表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "题干表查询")
+public class TQuestionStemRequest extends PageParam {
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "题库id", example = "1")
+    private Long questionBankId;
+
+    @Schema(description = "题库名字", example = "题库1")
+    private String questionBankName;
+
+    @Schema(description = "内容", example = "def")
+    private String content;
+    //关键字
+    private String keyContent;
+
+    @Schema(description = "类型 0:单选题 1:多选题 2:判断题 3:填空题 4:简答题", example = "1")
+    private String type;
+
+    @Schema(description = "级别 0:容易 1:较易 2:普通 3:较难 4:困难", example = "1")
+    private String level;
+
+    @Schema(description = "文件地址", example = "/d/kdl")
+    private String fileUrl;
+
+    @Schema(description = "解析", example = "答案")
+    private String analysis;
+
+    @Schema(description = "解析url", example = "解析")
+    private String analysisFileUrl;
+
+    @Schema(description = "正确答案", example = "A")
+    private String rightAnswers;
+
+    @Schema(description = "题干编码", example = "A02")
+    private String code;
+
+    @Schema(description = "题答案List")
+    private List<TQuestionAnswersRequest> answersRequestList;
+
+    private List<Long> bankIdList;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TRegulatoryFrameworkRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TRegulatoryFrameworkRequest.java
new file mode 100644
index 00000000..686114be
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TRegulatoryFrameworkRequest.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class TRegulatoryFrameworkRequest extends PageParam {
+
+    private Long id;
+    //文件的唯一编码
+    private String code;
+    //名称
+    private String name;
+    //版本
+    private String version;
+    //文件真实存在的地方
+    private String fileUrl;
+    private String type;
+    //文件大小
+    private Long fileSize;
+    //文件原名称
+    private String fileName;
+    //归档时间
+    private Date filingTime;
+    //是否归档
+    private Integer isFiling;
+    //预留字段
+    private String lawsA;
+    //预留字段
+    private String lawsB;
+    //创建者
+    private String creator;
+    //创建者id
+    private String creatorId;
+    //创建时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+    //更改时间
+    private Date updateTime;
+    //说明
+    private String describeInfo;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperAnswerSheetRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperAnswerSheetRequest.java
new file mode 100644
index 00000000..d161eeb6
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperAnswerSheetRequest.java
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.entity.SubmitAnswer;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 试卷答题卡表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "试卷答题卡表查询")
+public class TTestPaperAnswerSheetRequest extends PageParam {
+    @Schema(description = "主键")
+   /* @NotNull(message = "id不能为空", groups = EditGroup.class)*/
+    private Long id;
+
+    @Schema(description = "试卷信息id")
+    private Long testPaperInfoId;
+
+    @Schema(description = "得分")
+    private Double score;
+
+    @Schema(description = "考生姓名")
+    private String examinationName;
+
+    @Schema(description = "考生编号")
+    private String examinationNumber;
+
+    @Schema(description = "用户id")
+    private Long userId;
+    @Schema(description = "提交的答案")
+    private SubmitAnswer submitAnswer;
+
+    @Schema(description = "1保存 2交卷")
+    private Integer event;
+
+    @Schema(description = "部门id")
+    private String deptId;
+
+    @Schema(description = "用户ids")
+    private List<String> identityIdList;
+    @Schema(description = "培训id")
+    private Long trainId;
+
+    @Schema(description = "是否是纠错")
+    @TableField(exist = false)
+    private String isErrorCorrection;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperInfoRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperInfoRequest.java
new file mode 100644
index 00000000..831c1bb7
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperInfoRequest.java
@@ -0,0 +1,101 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.entity.TTrainUser;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.util.List;
+
+
+/**
+ * 试卷信息表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "试卷信息表查询")
+@TableName(autoResultMap = true)
+public class TTestPaperInfoRequest extends PageParam {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "试卷id")
+    private Long paperId;
+
+    @Schema(description = "培训id")
+    private Long trainId;
+
+    @Schema(description = "试卷名称", example = "数学试卷")
+    private String name;
+
+    @Schema(description = "题库名称", example = "一号题库")
+    private String questionBankName;
+
+    @Schema(description = "题库id", example = "1")
+    private Long questionBankId;
+
+    @Schema(description = "试卷类型 0:统一试卷 1:千人千份", example = "0")
+    private String type;
+    @Schema(description = "考试时长", example = "123")
+    private Integer duration;
+    @Schema(description = "总分", example = "100")
+    private Double allScore;
+
+    @Schema(description = "及格分", example = "20")
+    private Double passScore;
+
+    @Schema(description = "补考次数", example = "1")
+    private Integer makeUp;
+
+    @Schema(description = "纠错次数", example = "2")
+    private Integer errorCorrection;
+
+    @Schema(description = "总题数", example = "10")
+    private Integer allQuestionSum;
+
+    @Schema(description = "培训编码", example = "dsdssKDSDFDS0DSC2")
+    private String teachCode;
+
+    @Schema(description = "题目内容", example = "1515")
+    private String content;
+
+    /*@Schema(
+            description = "各题字段(题设置)",
+            example = "de"
+    )
+    private String setting;*/
+
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Stemdto> setting;
+
+    @Schema(description = "培训人员列表")
+    private List<TTrainUser> trainUser;
+
+    @Schema(description = "考试开始时间", example = "123")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate startDate;
+
+    @Schema(description = "考试截止时间", example = "123")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate endDate;
+
+    private List<Long> trainIdList;
+    private String identityId;
+    private String canEdit;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperQuestionStemRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperQuestionStemRequest.java
new file mode 100644
index 00000000..d7261b7f
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperQuestionStemRequest.java
@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import javax.validation.constraints.NotNull;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+
+
+/**
+ * 试卷题干表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-24
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "试卷题干表查询")
+public class TTestPaperQuestionStemRequest extends PageParam {
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(
+            description = "试卷id",
+            example = "1"
+    )
+    private Long testPaperId;
+
+    @Schema(
+            description = "文件地址",
+            example = "/dev/dsdhsd.doc"
+    )
+    private String fileUrl;
+
+    @Schema(
+            description = "内容",
+            example = "123"
+    )
+    private String content;
+
+    @Schema(
+            description = "类型 0:单选题1:多选题 2:判断题3:填空题4:简答题",
+            example = "1"
+    )
+    private String type;
+
+    @Schema(
+            description = "级别 0:容易1:较易2:普通3:较难4:困难",
+            example = "1"
+    )
+    private String level;
+
+    @Schema(
+            description = "解析",
+            example = "fdjasdnfj"
+    )
+    private String analysis;
+
+    @Schema(
+            description = "正确答案",
+            example = "A"
+    )
+    private String rightAnswers;
+
+    @Schema(
+            description = "题干编码",
+            example = "a01"
+    )
+    private String code;
+
+    @Schema(
+            description = "分值",
+            example = "5"
+    )
+    private Double score;
+
+    @Schema(
+            description = "序号",
+            example = "1"
+    )
+    private String order;
+
+    @Schema(
+            description = "用户标识",
+            example = "1"
+    )
+    private String usercode;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainMaterialRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainMaterialRequest.java
new file mode 100644
index 00000000..bbf42915
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainMaterialRequest.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+
+/**
+ * 培训教材表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-22
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "培训教材表查询")
+public class TTrainMaterialRequest extends PageParam {
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(
+            description = "排序",
+            example = "1"
+    )
+    private Integer order;
+
+    @Schema(
+            description = "课件id",
+            example = "1"
+    )
+    private Long coursewareId;
+
+    @Schema(
+            description = "培训编码",
+            example = "dsdssKDSDFDS0DSC2"
+    )
+    private String teachCode;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainRecordRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainRecordRequest.java
new file mode 100644
index 00000000..6f073364
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainRecordRequest.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import java.util.Date;
+
+/**
+ * 培训记录表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-05-03
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "培训记录表查询")
+public class TTrainRecordRequest extends PageParam {
+    private String name;
+    private String userName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date startTime;
+
+    private String startTimeStr;
+    private Long userId;
+    @Schema(description = "试卷id)")
+    @TableField(exist = false)
+    private Long paperInfoId;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainReportRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainReportRequest.java
new file mode 100644
index 00000000..7dec99da
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainReportRequest.java
@@ -0,0 +1,112 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 培训报告表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "培训报告表查询")
+public class TTrainReportRequest extends PageParam {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "培训表主键", example = "1")
+    private Long trainId;
+
+    @Schema(description = "培训班名称", example = "ddd")
+    private String name;
+
+    @Schema(description = "编码", example = "ddd")
+    private String code;
+
+    @Schema(description = "标题", example = "ddd")
+    private String title;
+
+    @Schema(description = "培训单位", example = "dfd")
+    private String holdUnit;
+
+    @Schema(description = "培训要求及达到的目的", example = "fdsd")
+    private String purpose;
+
+    @Schema(description = "培训内容", example = "fdf")
+    private String content;
+    private String fileUrl;
+
+    @Schema(description = "学习人数", example = "1")
+    private Integer studentsum;
+
+    @Schema(description = "出勤率", example = "1")
+    private String attendance;
+
+    @Schema(description = "办班形式 0:脱产  1：半脱产 2：业余", example = "1")
+    private Integer holdForm;
+
+    @Schema(description = "考核形式 0:笔试1:口试2:现场考核3：线上考核", example = "1")
+    private Integer examForm;
+
+    @Schema(description = "及格人数", example = "1")
+    private Integer passSum;
+
+    @Schema(description = "不及格人数", example = "1")
+    private Integer failSum;
+
+    @Schema(description = "受训人员工作胜任率", example = "1")
+    private String competencyRate;
+
+    @Schema(description = "受训人员工作聘任率", example = "1")
+    private String appointmentRate;
+
+    @Schema(description = "教师名称", example = "dds")
+    private String teacherName;
+
+    @Schema(description = "教师学历", example = "xhue")
+    private String teacherEducation;
+
+    @Schema(description = "教师职称", example = "dsh")
+    private String jobTitle;
+
+    @Schema(description = "教师是否有备课笔记 0:有1:没有", example = "1")
+    private String isNote;
+
+    @Schema(description = "教学是否按计划完成 0:完成1:未完成", example = "1")
+    private String isFinishPlan;
+
+    @Schema(description = "教学水平 0:良好 1:差劲", example = "1")
+    private String teachLevel;
+
+    @Schema(description = "教学方法", example = "dfd")
+    private String teachMethod;
+
+    @Schema(description = "培训班效果评价1", example = "cdv")
+    private String evaluateOne;
+
+    @Schema(description = "培训班效果评价2", example = "dsd")
+    private String evaluateTwo;
+
+    @Schema(description = "培训班效果评价3", example = "dds")
+    private String evaluateThree;
+
+    @Schema(description = "是否达成目的 0:是1:否", example = "1")
+    private String isAchievePurpose;
+    private String writeAuthor;
+    @TableField(exist = false)
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String startTime;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainRequest.java
new file mode 100644
index 00000000..d7c16fe7
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainRequest.java
@@ -0,0 +1,97 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.controller.responsevo.TPaperQuestionStemvo;
+import cn.iocoder.yudao.module.knowledge.entity.TCourseware;
+import cn.iocoder.yudao.module.knowledge.entity.TTrainUser;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 培训表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "培训类")
+public class TTrainRequest extends PageParam implements Serializable {
+    @Schema(description = "主键")
+    private Long id;
+
+    @Schema(description = "培训编码", example = "dsdssKDSDFDS0DSC2")
+    private String code;
+
+    @Schema(description = "培训班名称（内容）", example = "起航班")
+    private String name;
+
+    @Schema(description = "办班单位", example = "起航")
+    private String holdUnit;
+
+    @Schema(description = "办班形式 0:脱产 1：半脱产 2：业余", example = "0")
+    private String holdForm;
+
+    @Schema(description = "教学计划", example = "计划")
+    private String plan;
+
+    @Schema(description = "教师名称", example = "李某某")
+    private String teacherName;
+
+    @Schema(description = "教师学历", example = "大专")
+    private String teacherEducation;
+
+    @Schema(description = "教师职称", example = "高级")
+    private String jobTitle;
+
+    @Schema(description = "授课时长", example = "1.5")
+    private Double teachTime;
+
+    @Schema(description = "办班地址", example = "济南")
+    private String handAddress;
+
+    @Schema(description = "开班时间", example = "2024-04-22 12:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date startTime;
+
+    @Schema(description = "结束时间", example = "2024-04-22 12:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date stopTime;
+
+    @Schema(description = "办班单位审批意见", example = "没意见")
+    private String holdApprovalOpinion;
+
+    @Schema(description = "主管单位审批意见", example = "没意见")
+    private String coApprovalOpinion;
+
+    @Schema(description = "备注", example = "备注")
+    private String desrc;
+
+    @Schema(description = "培训人员列表")
+    private List<TTrainUser> trainUser;
+
+    @Schema(description = "课件ids")
+    private List<TCourseware> trainMaterialr;
+
+    @Schema(description = "试卷信息)")
+    private TTestPaperInfoRequest testPaperInfo;
+
+    @Schema(description = "题干列表")
+    private List<TPaperQuestionStemvo> questionStemvoList;
+    @Schema(description = "考试时间")
+    private LocalDate startDate;
+
+    @Schema(description = "考试时间")
+    private LocalDate endDate;
+    private String usercode;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainTeacherRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainTeacherRequest.java
new file mode 100644
index 00000000..935650e0
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainTeacherRequest.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * 培训教师表查询
+ *
+ * @author admin 
+ * @since 1.0.0 2024-05-01
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "培训教师表查询")
+public class TTrainTeacherRequest extends PageParam {
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainUserRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainUserRequest.java
new file mode 100644
index 00000000..fdcfd570
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainUserRequest.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "培训人员类")
+public class TTrainUserRequest extends PageParam {
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "用户名称", example = "admin")
+    private String username;
+
+    @Schema(description = "用户编码", example = "dufdufd0222")
+    private String usercode;
+
+    @Schema(description = "培训编码", example = "dfdsf02")
+    private String teachCode;
+
+    @Schema(description = "计划id列表")
+    private List<Long> trainIdList;
+
+    @Schema(description = "计划id")
+    private Long trainId;
+
+    @TableField(exist = false)
+    private Long paperInfoId;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TViolationRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TViolationRequest.java
new file mode 100644
index 00000000..86afb4d4
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TViolationRequest.java
@@ -0,0 +1,90 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class TViolationRequest extends PageParam {
+    @Schema(description = "主键")
+    @TableId
+    private Long id;
+
+    @Schema(
+            description = "违章标题",
+            example = "违章了"
+    )
+    private String title;
+
+    @Schema(
+            description = "违章类别",
+            example = "1"
+    )
+    private String type;
+
+    @Schema(
+            description = "违章人员",
+            example = "小明"
+    )
+    private String violator;
+
+    @Schema(
+            description = "备注说明",
+            example = "备注"
+    )
+    private String descr;
+
+    @Schema(
+            description = "违章编码",
+            example = "A02"
+    )
+    private String code;
+
+    @Schema(
+            description = "违章时间",
+            example = "2024-04-14 15:13:42"
+    )
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date violationTime;
+
+    @Schema(
+            description = "最后推送时间",
+            example = "2024-04-14 15:13:42"
+    )
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lastPushTime;
+
+    @Schema(
+            description = "预留字段",
+            example = "预留字段"
+    )
+    private String violationB;
+
+    @Schema(
+            description = "创建人",
+            example = "人员"
+    )
+    private String creator;
+
+
+    @Schema(
+            description = "图片",
+            example = "jpg"
+    )
+    private List<TViolationImage> imgList;
+
+    private String bgnTime;
+    private String endTime;
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/UserInfoRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/UserInfoRequest.java
new file mode 100644
index 00000000..16788e58
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/UserInfoRequest.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.knowledge.controller.requestdto;
+
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+@Schema(description = "用户请求类")
+public class UserInfoRequest extends PageParam {
+
+    @Schema(description = "主键")
+    private Integer id;
+
+    @Schema(name = "username", description = "用户名描述", example = "ysnnuan")
+    private String username;
+
+    @Schema( type = "password", minLength =6, maxLength = 20)
+    private String password;
+
+    @Schema(
+            description = "密码",
+            example = "18"
+    )
+    private Integer age;
+
+    @Schema(
+            description = "密码",
+            example = "13057910639"
+    )
+    private String mobile;
+
+    @Schema(
+            description = "性别",
+            example = "1"
+    )
+    private Byte sex;
+
+    @Schema(
+            description = "生日",
+            example = "2024-03-05"
+    )
+    private Date birthday;
+
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/ExpertTags.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/ExpertTags.java
new file mode 100644
index 00000000..fe1f86db
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/ExpertTags.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import lombok.Data;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.controller.responsevo
+ * @className:ExpertTags
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/5/6 17:00
+ **/
+@Data
+public class ExpertTags {
+
+    private Long id;
+    private String tagName;
+    private String expertTagNum;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/FileInfo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/FileInfo.java
new file mode 100644
index 00000000..4f6a9bc9
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/FileInfo.java
@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "文件返回vo")
+public class FileInfo {
+    //文件名称
+    private String fileName;
+    //文件存储位置
+    private String fileUrl;
+    private String url;
+    //文件大小
+    private String fileSize;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/KnowledgeChartsStatisticsvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/KnowledgeChartsStatisticsvo.java
new file mode 100644
index 00000000..0f63d968
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/KnowledgeChartsStatisticsvo.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import lombok.Data;
+
+@Data
+public class KnowledgeChartsStatisticsvo {
+
+
+    /**
+     * 数据名
+     */
+    private String name;
+
+    /**
+     * 数据值
+     */
+    private int value;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/KnowledgeHeadCardListStatisticsvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/KnowledgeHeadCardListStatisticsvo.java
new file mode 100644
index 00000000..2e4e16d2
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/KnowledgeHeadCardListStatisticsvo.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.module.knowledge.entity.TLaws;
+import lombok.Data;
+
+@Data
+public class KnowledgeHeadCardListStatisticsvo {
+
+    /**
+     * 课程数量
+     */
+    private Integer numberOfCourses;
+
+    /**
+     * 学员人数
+     */
+    private Integer numberOfStudents;
+
+    /**
+     *
+     * 招标总量
+     */
+    private Integer numberOfBids;
+
+    /**
+     * 考试次数
+     */
+    private Integer numberOfExams;
+
+    /**
+     * 培训次数
+     */
+    private Integer numberOfTrainings;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/KnowledgeStatisticsvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/KnowledgeStatisticsvo.java
new file mode 100644
index 00000000..012646c4
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/KnowledgeStatisticsvo.java
@@ -0,0 +1,105 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.module.knowledge.entity.TLaws;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class KnowledgeStatisticsvo extends TLaws {
+
+
+    /**
+     * 操作文件总数量
+     */
+    private Integer operationSum;
+
+    /**
+     * 违章文件总数量
+     */
+    private Integer violationSum;
+
+    /**
+     * 法律法规文件总数量
+     */
+    private Integer lawsSum;
+
+    /**
+     * 规章制度文件总数量
+     */
+    private Integer rulesSum;
+
+
+
+    /**
+     * 上月操作文件总数量
+     */
+    private Integer lastMonthOperationSum;
+
+    /**
+     * 本月操作文件总数量
+     */
+    private Integer curMonthOperationSum;
+
+    /**
+     * 上月违章总数量
+     */
+    private Integer lastMonthViolationSum;
+
+    /**
+     * 本月违章总数量
+     */
+    private Integer curMonthViolationSum;
+
+    /**
+     * 上月法律法规总数量
+     */
+    private Integer lastMonthLawsSum;
+
+    /**
+     * 本月法律法规总数量
+     */
+    private Integer curMonthLawsSum;
+
+    /**
+     * 上月规章制度总数量
+     */
+    private Integer lastMonthRulesSum;
+
+    /**
+     * 本月规章制度总数量
+     */
+    private Integer curMonthRulesSum;
+
+
+
+    /**
+     * 每日学习情况日期
+     */
+    private Date date;
+
+    /**
+     * 每日学习情况已完成
+     */
+    private Integer completed;
+
+    /**
+     * 每日学习情况未完成
+     */
+    private Integer notCompleted;
+
+
+
+    /**
+     * 培训次数
+     */
+    private Integer num;
+
+    /**
+     * 培训合格率
+     */
+    private Integer percentOfPass;
+
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/PaperInfovo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/PaperInfovo.java
new file mode 100644
index 00000000..462c046c
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/PaperInfovo.java
@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.Stemdto;
+import cn.iocoder.yudao.module.knowledge.entity.SubmitAnswer;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class PaperInfovo {
+    @Schema(description = "考生编号")
+    private String examinationNumber;
+
+    @Schema(description = "考生姓名")
+    private String examinationName;
+
+    @Schema(description = "主键")
+    private Long paperInfoId;
+
+    @Schema(description = "试卷名称", example = "数学试卷")
+    private String name;
+
+    @Schema(description = "总分", example = "100")
+    private Double allScore;
+
+    @Schema(description = "总题数", example = "10")
+    private Integer allQuestionSum;
+
+    @Schema(description = "培训编码", example = "dsdssKDSDFDS0DSC2")
+    private String teachCode;
+
+    @Schema(description = "各题字段(题设置)", example = "de")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Stemdto> setting;
+
+    @Schema(description = "考生答题卡id")
+    private Long testPaperAnswerSheetId;
+
+    @Schema(description = "考试编号", example = "123")
+    private String testNum;
+
+    @Schema(description = "考试时长", example = "123")
+    private Integer duration = 100;
+
+    @Schema(description = "试题列表", example = "123")
+    private List<TPaperQuestionStemvo> tPaperQuestionStemvoList;
+
+    @Schema(description = "答卷开始时间")
+    private Long startTime;
+
+    @Schema(description = "已答记录")
+    private SubmitAnswer answered;
+
+    @Schema(description = "及格分", example = "20")
+    private Double passScore;
+
+    @Schema(description = "是不是补考")
+    private Boolean isAgainTest;
+
+    @Schema(description = "目标用户得分")
+    private Double score;
+
+    @Schema(description = "目标用户答题详细")
+    private SubmitAnswer submitAnswer;
+    private String showRight;
+    private String showAnswer;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TArchivesvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TArchivesvo.java
new file mode 100644
index 00000000..6fb0015b
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TArchivesvo.java
@@ -0,0 +1,6 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.module.knowledge.entity.TArchives;
+
+public class TArchivesvo extends TArchives {
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCoursePushVo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCoursePushVo.java
new file mode 100644
index 00000000..7c2fe00a
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCoursePushVo.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 课程推送查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-05-12
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "课程推送查询")
+public class TCoursePushVo extends PageParam {
+    @Schema(description = "主键")
+    @NotNull(message = "id不能为空", groups = EditGroup.class)
+    private Long id;
+
+    @Schema(description = "视频名称")
+    @NotBlank(message = "视频名称不能为空")
+    private String name;
+
+    @Schema(description = "视频路径")
+    @NotBlank(message = "视频路径不能为空")
+    private String fileUrl;
+
+    private Boolean status;
+
+    private Date dateTime;
+
+    @Schema(description = "推送时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date pushTime;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCourseRecordsvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCourseRecordsvo.java
new file mode 100644
index 00000000..214588b9
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCourseRecordsvo.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.module.knowledge.entity.TCourseRecords;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TCourseRecordsvo {
+        private List<String> categories;
+
+        private List<TCourseRecordsvos> series;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCourseRecordsvos.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCourseRecordsvos.java
new file mode 100644
index 00000000..d0d0dba0
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCourseRecordsvos.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TCourseRecordsvos {
+    private String name;
+    private List<Long> data;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCoursewarevos.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCoursewarevos.java
new file mode 100644
index 00000000..5e9d63d6
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCoursewarevos.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class TCoursewarevos extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "课程表主键", example = "1")
+    private Integer courseId;
+
+    @Schema(description = "课程名称", example = "数学课件")
+    private String courseName;
+
+    @Schema(description = "课程名称", example = "数学课件")
+    private String name;
+
+    @Schema(description = "课程分类", example = "dsds")
+    private String dirName;
+
+    @Schema(description = "编码 （用于在文件表中获取附件信息）", example = "a01")
+    private String code;
+
+    @Schema(description = "排序", example = "1")
+    private Integer order;
+
+    @Schema(description = "文件地址", example = "http://www.baidu.com")
+    private String fileUrl;
+
+    @Schema(description = "文件名称")
+    private String fileName;
+
+    @Schema(description = "文件大小 单位M")
+    private Integer fileSize;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TLawsvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TLawsvo.java
new file mode 100644
index 00000000..7ecb1b57
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TLawsvo.java
@@ -0,0 +1,8 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.module.knowledge.entity.TLaws;
+import lombok.Data;
+
+public class TLawsvo extends TLaws {
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TOperaDocmentvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TOperaDocmentvo.java
new file mode 100644
index 00000000..652aa50d
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TOperaDocmentvo.java
@@ -0,0 +1,181 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.module.knowledge.entity.TOperationProcedureCore;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.controller.responsevo
+ * @className:TOperaDocmentvo
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/25 12:32
+ **/
+@Data
+public class TOperaDocmentvo {
+
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "操作文件中文名称",example = "a.pdf")
+    private String cnName;
+
+    @Schema(description = "操作文件英文名",example = "a.pdf")
+    private String enName;
+
+    @Schema(description = "版本",example = "1.0")
+    private String version;
+
+    @Schema(description = "文件编码",example = "ABC123")
+    private String fileCode;
+
+    @Schema(description = "二维码编码",example = "RZ2024001")
+    private String qrCode;
+
+    @Schema(description = "标签",example = "0:标准操作程序模版, 1：产品原料标准模版, 2：工艺设备标准模版")
+    private String tag;
+
+    @Schema(description = "文件路径",example = "")
+    private String url;
+
+    @Schema(description = "操作文件编码",example = "")
+    private String operationDocumentCode;
+
+    @Schema(description = "单位名称",example = "")
+    private String unitName;
+
+    @Schema(description = "作业名称/人数",example = "")
+    private String jobName;
+
+    @Schema(description = "编号",example = "")
+    private String code;
+
+    @Schema(description = "劳保用品",example = "")
+    private String labour;
+
+    @Schema(description = "使用工具/材料",example = "")
+    private String tool;
+
+    @Schema(description = "作业环境",example = "")
+    private String environment;
+
+    @Schema(description = "编制人/日期",example = "")
+    private String organizer;
+
+    @Schema(description = "审核人/日期",example = "")
+    private String auditor;
+
+    @Schema(description = "批准人/日期",example = "")
+    private String approver;
+
+    @Schema(description = "批准人/日期",example = "")
+    private List<TOperationProcedureCore> czTableDatas;
+
+
+    @Schema(description = "原编码",example = "")
+    private String originalCode;
+
+    @Schema(description = "受控状态",example = "")
+    private String controlledState;
+
+    @Schema(description = "发布时间",example = "")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date releaseTime;
+
+    @Schema(description = "实施时间",example = "")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date implementationTime;
+
+    @Schema(description = "顺序号",example = "")
+    private String sn;
+
+    @Schema(description = "系列",example = "")
+    private String series;
+
+    @Schema(description = "具体操作",example = "")
+    private String concreteOperations;
+
+    @Schema(description = "变化内容",example = "")
+    private String changeContent;
+
+    @Schema(description = "标准归口",example = "")
+    private String attribute;
+
+    @Schema(description = "起草单位",example = "")
+    private String draftingUnit;
+
+    @Schema(description = "起草人",example = "")
+    private String rapporteur;
+
+
+    @Schema(description = "第一次发布时间",example = "2024-04-19 15:25:35")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date firstReleaseTime;
+
+    @Schema(description = "符号",example = "")
+    private String symbol;
+
+    @Schema(description = "目的",example = "")
+    private String purpose;
+
+    @Schema(description = "适用范围",example = "")
+    private String scopeOfApplication;
+
+    @Schema(description = "术语",example = "")
+    private String term;
+
+    @Schema(description = "引用文件",example = "")
+    private String referenceFile;
+
+    @Schema(description = "要求",example = "")
+    private String requires;
+
+    @Schema(description = "实验方法",example = "")
+    private String experimentalMethod;
+
+    @Schema(description = "组批",example = "")
+    private String lotGrouping;
+
+    @Schema(description = "取样",example = "")
+    private String sampling;
+
+    @Schema(description = "质量结果判定",example = "")
+    private String resultDetermination;
+
+    @Schema(description = "不合格处置方式",example = "")
+    private String disposalMethod;
+
+    @Schema(description = "称重",example = "")
+    private String weigh;
+
+    @Schema(description = "发放范围",example = "")
+    private String distributionScope;
+
+
+    @Schema(description = "内容",example = "")
+    private List<String> content;
+
+    @Schema(description = "x/x",example = "")
+    private String setx;
+
+
+    //工艺设备字段
+
+    @Schema(description = "要求")
+    private String require;
+
+    @Schema(description = "相关文件")
+    private String relevantFile;
+
+    @Schema(description = "相关记录")
+    private String relevantRecord;
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TPaperQuestionStemvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TPaperQuestionStemvo.java
new file mode 100644
index 00000000..6e1758a7
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TPaperQuestionStemvo.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.module.knowledge.entity.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class TPaperQuestionStemvo implements Serializable {
+    private Long id;
+    @Schema(description = "分值", example = "5")
+    private Double score;
+
+    @Schema(description = "用户编码", example = "100001")
+    private String usercode;
+
+    @Schema(description = "级别 0:容易1:较易2:普通3:较难4:困难", example = "1")
+    private String level;
+
+    @Schema(description = "级别名称", example = "普通")
+    private String levelName;
+
+    @Schema(description = "内容", example = "def")
+    private Content content;
+
+    @Schema(description = "类型 0:单选题 1:多选题 2:判断题 3:填空题 4:简答题", example = "1")
+    private String type;
+    private String typeName;
+
+    @Schema(description = "解析", example = "答案")
+    private String analysis;
+
+    @Schema(description = "解析文件地址", example = "答案")
+    private String analysisFileUrl;
+
+    @Schema(description = "正确答案", example = "A")
+    private List<String> rightAnswers;
+
+    @Schema(description = "题干编码", example = "A02")
+    private String code;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TQuestionAnswervo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TQuestionAnswervo.java
new file mode 100644
index 00000000..7c08259b
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TQuestionAnswervo.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "答案vo")
+public class TQuestionAnswervo {
+    //正确答案
+    private String rightAnswers;
+    //类型 0:单选题1:多选题 2:判断题3:填空题4:简答题
+    private String type;
+    //序号
+    private String orders;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TQuestionStemvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TQuestionStemvo.java
new file mode 100644
index 00000000..d73e73d3
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TQuestionStemvo.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.module.knowledge.entity.TQuestionAnswers;
+import cn.iocoder.yudao.module.knowledge.entity.TQuestionStem;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class TQuestionStemvo extends TQuestionStem implements Serializable {
+
+    private List<TQuestionAnswers> answersRequestList;
+    @Schema(description = "分值", example = "5")
+    private Double score;
+
+    @Schema(description = "用户编码", example = "100001")
+    private String usercode;
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TRegulatoryFrameworkvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TRegulatoryFrameworkvo.java
new file mode 100644
index 00000000..96aa4567
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TRegulatoryFrameworkvo.java
@@ -0,0 +1,6 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework;
+
+public class TRegulatoryFrameworkvo extends TRegulatoryFramework {
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTestPaperAnswerSheetvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTestPaperAnswerSheetvo.java
new file mode 100644
index 00000000..a32ba9a9
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTestPaperAnswerSheetvo.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class TTestPaperAnswerSheetvo {
+    @Schema(description = "id")
+    private Long id;
+    @Schema(description = "试卷信息id")
+    private Long testPaperInfoId;
+    @Schema(description = "考生编号")
+    private String examinationNumber;
+    private Integer pass;
+    @Schema(description = "考生名称")
+    private String examinationName;
+    @Schema(description = "成绩")
+    private Double score;
+    @Schema(description = "是否及格")
+    private String isPass;
+    private String deptName;
+    private String isHand;
+
+    //试卷名称
+    private String paperName;
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    private Date startDate;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTrainOnevo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTrainOnevo.java
new file mode 100644
index 00000000..2990b6a0
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTrainOnevo.java
@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TTestPaperInfoRequest;
+import cn.iocoder.yudao.module.knowledge.entity.TCourseware;
+import cn.iocoder.yudao.module.knowledge.entity.TTestPaperQuestionStem;
+import cn.iocoder.yudao.module.knowledge.entity.TTrainMaterial;
+import cn.iocoder.yudao.module.knowledge.entity.TTrainUser;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "培训类")
+public class TTrainOnevo extends PageParam implements Serializable {
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "培训编码", example = "dsdssKDSDFDS0DSC2")
+    private String code;
+
+    @Schema(description = "培训班名称（内容）", example = "起航班")
+    private String name;
+
+    @Schema(description = "办班单位", example = "起航")
+    private String holdUnit;
+
+    @Schema(description = "办班形式 0:脱产 1：半脱产 2：业余", example = "0")
+    private String holdForm;
+
+    @Schema(description = "教学计划", example = "计划")
+    private String plan;
+
+    @Schema(description = "教师名称", example = "李某某")
+    private String teacherName;
+
+    @Schema(description = "教师学历", example = "大专")
+    private String teacherEducation;
+
+    @Schema(description = "教师职称", example = "高级")
+    private String jobTitle;
+
+    @Schema(description = "授课时长", example = "1.5")
+    private Double teachTime;
+
+    @Schema(description = "办班地址", example = "济南")
+    private String handAddress;
+
+    @Schema(description = "开班时间", example = "2024-04-22")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date startTime;
+
+    @Schema(description = "结束时间", example = "2024-04-22")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date stopTime;
+
+    @Schema(description = "办班单位审批意见", example = "没意见")
+    private String holdApprovalOpinion;
+
+    @Schema(description = "主管单位审批意见", example = "没意见")
+    private String coApprovalOpinion;
+
+    @Schema(description = "备注", example = "备注")
+    private String desrc;
+
+    @Schema(description = "培训人员列表")
+    private List<TTrainUser> trainUser;
+
+    @Schema(description = "课件ids")
+    private List<TCourseware> trainMaterialr;
+
+    @Schema(description = "试卷信息)")
+    private TTestPaperInfoRequest testPaperInfo;
+
+    @Schema(description = "题干列表")
+    private List<TTestPaperQuestionStem> questionStemvoList;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTrainTaskvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTrainTaskvo.java
new file mode 100644
index 00000000..698d148a
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTrainTaskvo.java
@@ -0,0 +1,97 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.entity.TCourseware;
+import cn.iocoder.yudao.module.knowledge.entity.TTrainRecord;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 培训表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "培训类")
+public class TTrainTaskvo extends PageParam implements Serializable {
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "培训编码", example = "dsdssKDSDFDS0DSC2")
+    private String code;
+
+    @Schema(description = "培训班名称（内容）", example = "起航班")
+    private String name;
+
+    @Schema(description = "办班单位", example = "起航")
+    private String holdUnit;
+
+    @Schema(description = "办班形式 0:脱产 1：半脱产 2：业余", example = "0")
+    private String holdForm;
+
+    @Schema(description = "教学计划", example = "计划")
+    private String plan;
+
+    @Schema(description = "教师名称", example = "李某某")
+    private String teacherName;
+
+    @Schema(description = "教师学历", example = "大专")
+    private String teacherEducation;
+
+    @Schema(description = "教师职称", example = "高级")
+    private String jobTitle;
+
+    @Schema(description = "授课时长", example = "1.5")
+    private Double teachTime;
+
+    @Schema(description = "办班地址", example = "济南")
+    private String handAddress;
+
+    @Schema(description = "开班时间", example = "2024-04-22 12:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date startTime;
+
+    @Schema(description = "结束时间", example = "2024-04-22 12:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date stopTime;
+
+    @Schema(description = "办班单位审批意见", example = "没意见")
+    private String holdApprovalOpinion;
+
+    @Schema(description = "主管单位审批意见", example = "没意见")
+    private String coApprovalOpinion;
+
+    @Schema(description = "备注", example = "备注")
+    private String desrc;
+
+
+    @Schema(description = "课件ids")
+    private List<TCourseware> trainMaterialr;
+
+    @Schema(description = "试卷id)")
+    private Long paperInfoId;
+
+    @Schema(description = "用户标识 千人千卷有值)")
+    private String usercode;
+
+    @Schema(description = "考试日期")
+    private LocalDate testDate;
+    private TTrainRecord tTrainRecord;
+    private Double passScore;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTrainvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTrainvo.java
new file mode 100644
index 00000000..57bfecf1
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TTrainvo.java
@@ -0,0 +1,86 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TTestPaperInfoRequest;
+import cn.iocoder.yudao.module.knowledge.entity.TTrainUser;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 培训表查询
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "培训类")
+public class TTrainvo extends PageParam implements Serializable {
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "培训编码", example = "dsdssKDSDFDS0DSC2")
+    private String code;
+
+    @Schema(description = "培训班名称（内容）", example = "起航班")
+    private String name;
+
+    @Schema(description = "办班单位", example = "起航")
+    private String holdUnit;
+
+    @Schema(description = "办班形式 0:脱产 1：半脱产 2：业余", example = "0")
+    private String holdForm;
+
+    @Schema(description = "教学计划", example = "计划")
+    private String plan;
+
+    @Schema(description = "教师名称", example = "李某某")
+    private String teacherName;
+
+    @Schema(description = "教师学历", example = "大专")
+    private String teacherEducation;
+
+    @Schema(description = "教师职称", example = "高级")
+    private String jobTitle;
+
+    @Schema(description = "授课时长", example = "1.5")
+    private Double teachTime;
+
+    @Schema(description = "办班地址", example = "济南")
+    private String handAddress;
+
+    @Schema(description = "开班时间", example = "2024-04-22 12:00:00")
+    private Date startTime;
+
+    @Schema(description = "结束时间", example = "2024-04-22 12:00:00")
+    private Date stopTime;
+
+    @Schema(description = "办班单位审批意见", example = "没意见")
+    private String holdApprovalOpinion;
+
+    @Schema(description = "主管单位审批意见", example = "没意见")
+    private String coApprovalOpinion;
+
+    @Schema(description = "备注", example = "备注")
+    private String desrc;
+
+    @Schema(description = "培训人员列表")
+    private List<TTrainUser> trainUser;
+
+    @Schema(description = "课件ids")
+    private List<Long> trainMaterialr;
+
+    @Schema(description = "试卷信息)")
+    private TTestPaperInfoRequest testPaperInfo;
+
+    @Schema(description = "题干列表")
+    private List<TPaperQuestionStemvo> questionStemvoList;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TViolationImagevo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TViolationImagevo.java
new file mode 100644
index 00000000..1f326f29
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TViolationImagevo.java
@@ -0,0 +1,6 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
+
+public class TViolationImagevo extends TViolationImage {
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TViolationvo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TViolationvo.java
new file mode 100644
index 00000000..065f9472
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TViolationvo.java
@@ -0,0 +1,6 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import cn.iocoder.yudao.module.knowledge.entity.TViolation;
+
+public class TViolationvo extends TViolation {
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TempTimeVo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TempTimeVo.java
new file mode 100644
index 00000000..96f51133
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TempTimeVo.java
@@ -0,0 +1,9 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import lombok.Data;
+
+@Data
+public class TempTimeVo {
+    private String time;
+    private double contimueTime;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TestManagevo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TestManagevo.java
new file mode 100644
index 00000000..dd23b7bc
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TestManagevo.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class TestManagevo {
+    @Schema(description = "考试编号", example = "1")
+    private String examinationNumber;
+    @Schema(description = "考试名称", example = "1")
+    private String testName;
+    @Schema(description = "考试部门", example = "1")
+    private String holdUnit;
+    @Schema(description = "考试人数", example = "1")
+    private String pepNum;
+    @Schema(description = "考试时间", example = "1")
+    private String testDate;
+    @Schema(description = "时长", example = "1")
+    private Integer duration;
+    @Schema(description = "考试状态", example = "1")
+    private Integer completeStatus;
+    @Schema(description = "试卷id", example = "1")
+    private Long testPaperInfoId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/Tree.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/Tree.java
new file mode 100644
index 00000000..49682519
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/Tree.java
@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.knowledge.controller.responsevo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Tree {
+
+    //节点id
+    private Long id;
+    //节点名称
+    private String label;
+
+    List<Tree> children;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/AnswerInfo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/AnswerInfo.java
new file mode 100644
index 00000000..9fb8686e
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/AnswerInfo.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class AnswerInfo {
+    private Long stemId;
+    private Boolean isRight;
+    private List<String> answer;
+    private List<String> rightAnswer;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/Content.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/Content.java
new file mode 100644
index 00000000..709362f2
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/Content.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class Content {
+
+    @Schema(description = "题干", example = "def")
+    private Detail stem;
+    @Schema(description = "选项", example = "abc")
+    private List<Detail> options;
+
+    @Data
+    public static class Detail {
+        private String text;
+        private String options;
+        private String fileUrl;
+    }
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/DeptTree.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/DeptTree.java
new file mode 100644
index 00000000..c7d24cbf
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/DeptTree.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DeptTree {
+    private Long id;
+    private String label;
+    private Long parentId;
+    private List<DeptTree> children;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/RRfeuTaskFile.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/RRfeuTaskFile.java
new file mode 100644
index 00000000..0a3a44e0
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/RRfeuTaskFile.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+
+
+/**
+ * 监督内容文件表
+ *
+ * @author admin
+ * @since 1.0.0 2024-06-23
+ */
+
+@Data
+@TableName("r_rfeu_task_file")
+public class RRfeuTaskFile extends BaseDO {
+	/**
+	* 主键id
+	*/
+	@TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	/**
+	* 监督任务内容id
+	*/
+	private Long rRfeuTaskContentId;
+
+	/**
+	* 文件名称
+	*/
+	private String fileName;
+
+	/**
+	* 文件路径
+	*/
+	private String fileUrl;
+
+	/**
+	* 租户id
+	*/
+	private Long tenantId;
+
+	/**
+	* 文件大小
+	*/
+	private Long fileSize;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/RfeuTaskContent.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/RfeuTaskContent.java
new file mode 100644
index 00000000..97e67839
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/RfeuTaskContent.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@TableName("r_rfeu_task_content")
+@Data
+@Schema(description = "执行计划填报")
+public class RfeuTaskContent extends BaseDO {
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    private Long executionId;
+    private Long taskId;
+    private Long contentId;
+    private String isPass;
+    private String remark;
+    @TableField(exist = false)
+    private String fileName;
+    @TableField(exist = false)
+    private String fileUrl;
+    @TableField(exist = false)
+    private String fileVersion;
+    @TableField(exist = false)
+    private String username;
+    @TableField(exist = false)
+    private List<RRfeuTaskFile> list;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/SubmitAnswer.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/SubmitAnswer.java
new file mode 100644
index 00000000..9b45195b
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/SubmitAnswer.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SubmitAnswer {
+    private List<AnswerInfo> radio;
+    private List<AnswerInfo> checkbox;
+    private List<AnswerInfo> judge;
+    private List<AnswerInfo> gapFilling;
+    private List<AnswerInfo> subjective;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TArchives.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TArchives.java
new file mode 100644
index 00000000..0545147a
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TArchives.java
@@ -0,0 +1,114 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import cn.iocoder.yudao.module.knowledge.controller.responsevo.FileInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 档案表(TArchives)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-11 10:25:58
+ */
+@TableName("t_archives")
+@Data
+@Schema(description = "档案类")
+public class TArchives extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(
+            description = "父id",
+            example = "11"
+    )
+    private Long parentId;
+
+    @Schema(
+            description = "文件的唯一编码",
+            example = "a01"
+    )
+    private String code;
+
+    @Schema(
+            description = "类型 1 ：图片 2：视频 3：文档 4 ：音频",
+            example = "1"
+    )
+    private String type;
+
+    @Schema(
+            description = "文件原名称",
+            example = "文件1"
+    )
+    @ExcelOut(name = "文件名称", sort = 1, width = 20)
+    private String originalFilename;
+
+    @Schema(
+            description = "文件现名称",
+            example = "文件2"
+    )
+    private String curFilename;
+
+    @Schema(
+            description = "排序",
+            example = "1"
+    )
+    private String orders;
+
+    @Schema(
+            description = "文件真实存在的地方",
+            example = "/d/test"
+    )
+    @ExcelOut(name = "文件地址", sort = 3, width = 20,isFileUrl = true)
+    private String fileUrl;
+
+    @Schema(
+            description = "文件大小",
+            example = "10KB"
+    )
+    @ExcelOut(name = "文件大小", sort = 2, width = 20)
+    private Long fileSize;
+
+    @Schema(
+            description = "是否是文件夹 0：文件夹 1:文件",
+            example = "0"
+    )
+    private Integer isDir;
+
+
+    @Schema(
+            description = "是否移到回收站 0：是 1：否",
+            example = "0"
+    )
+    private Integer isRecycled;
+
+    @Schema(
+            description = "创建者",
+            example = "admin"
+    )
+    private String creator;
+
+
+    @Schema(
+            description = "创建者id",
+            example = "1"
+    )
+    private String creatorId;
+
+    @Schema(
+            description = "文件信息",
+            example = "10KB，jpg"
+    )
+    @TableField(exist = false)
+    private FileInfo fileInfo;
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TBidConfirmation.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TBidConfirmation.java
new file mode 100644
index 00000000..54fc89d2
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TBidConfirmation.java
@@ -0,0 +1,111 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+import java.util.Date;
+
+
+/**
+ * 招标确认函
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-18
+ */
+
+@Data
+@TableName("t_bid_confirmation")
+@Schema(description = "招标确认函类")
+public class TBidConfirmation extends BaseDO{
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(
+            description = "标签",
+            example = "1"
+    )
+    private String tag;
+
+    @Schema(
+            description = "公司名",
+            example = "科技公司"
+    )
+    private String companyName;
+
+    @Schema(
+            description = "中标标题",
+            example = "标题"
+    )
+    private String title;
+
+    @Schema(
+            description = "招标编号",
+            example = "a01"
+    )
+    private String bigCode;
+
+    @Schema(
+            description = "项目名称",
+            example = "zhaobiao"
+    )
+    private String projectName;
+
+    @Schema(
+            description = "招标人",
+            example = "xaomin"
+    )
+    private String tenderee;
+
+    @Schema(
+            description = "发函时间",
+            example = "2024"
+    )
+    private Integer letterDateYear;
+
+    @Schema(
+            description = "发函时间",
+            example = "1"
+    )
+    private Integer letterDateMonth;
+
+    @Schema(
+            description = "中标时间",
+            example = "1"
+    )
+    private Date winBidTime;
+
+    @Schema(
+            description = "发函时间",
+            example = "2024:04:15 08:23:56"
+    )
+    private Integer letterDateDay;
+
+    @Schema(
+            description = "中标说明",
+            example = "中标了"
+    )
+    private String winBidDes;
+
+    @Schema(description = "文件真实存在的地方", example = "/path/to/file/example.jpg")
+    private String fileUrl;
+
+    @Schema(description = "文件大小", example = "1024KB")
+    private Long fileSize;
+
+    @Schema(description = "文件原名称", example = "example.jpg")
+    private String fileName;
+
+    @Schema(description = "归档时间", example = "2024-04-15T12:00:00")
+    private Date filingTime;
+
+    @Schema(description = "是否归档", allowableValues = {"0", "1"}, example = "0")
+    private Integer isFiling;
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TBidConfirmationCandidate.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TBidConfirmationCandidate.java
new file mode 100644
index 00000000..ddc4b547
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TBidConfirmationCandidate.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+
+@Data
+@TableName("t_bid_confirmation_candidate")
+@Schema(description = "招标确认函候选人表类")
+public class TBidConfirmationCandidate extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(
+            description = "招标确认函id",
+            example = "1"
+    )
+    private Long bidConfirmationId;
+
+    @Schema(
+            description = "项目名称(排名)",
+            example = "dfrf"
+    )
+    private String orders;
+
+    @Schema(
+            description = "候选人名称",
+            example = "erefd"
+    )
+    private String candidateName;
+
+    @Schema(
+            description = "投标报价",
+            example = "12.2"
+    )
+    private Double tenderOffer;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TBidPlan.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TBidPlan.java
new file mode 100644
index 00000000..1b02e1da
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TBidPlan.java
@@ -0,0 +1,149 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+import java.util.Date;
+
+
+@Data
+@TableName("t_bid_plan")
+@Schema(description = "招标计划类")
+public class TBidPlan extends BaseDO {
+    @Schema(description = "主键")
+    @TableId
+    private Long id;
+
+    @Schema(
+            description = "标签",
+            example = "123"
+    )
+    private String tag;
+
+    @Schema(
+            description = "项目名称",
+            example = "项目"
+    )
+    private String projectName;
+
+    @Schema(
+            description = "委员会",
+            example = "sdas"
+    )
+    private String committee;
+
+    @Schema(
+            description = "编制",
+            example = "wes"
+    )
+    private String authorizedStrength;
+
+    @Schema(
+            description = "审核",
+            example = "dfd"
+    )
+    private String audit;
+
+    @Schema(
+            description = "审批",
+            example = "ddf"
+    )
+    private String approval;
+
+    @Schema(
+            description = "项目日期",
+            example = "2024-04-14 15:13:42"
+    )
+    private Date projectDate;
+
+    @Schema(
+            description = "审议日期",
+            example = "2024-04-14 15:13:42"
+    )
+    private Date auditDate;
+
+    @Schema(
+            description = "盖章日期",
+            example = "2024-04-14 15:13:42"
+    )
+    private Date stampDate;
+
+    @Schema(
+            description = "招标团队",
+            example = "erdf"
+    )
+    private String bidTeam;
+
+    @Schema(
+            description = "分工与职责",
+            example = "ere"
+    )
+    private String responsibility;
+
+    @Schema(
+            description = "项目概述",
+            example = "dfewfew"
+    )
+    private String overview;
+
+    @Schema(
+            description = "调研与对标情况",
+            example = "ddsdff"
+    )
+    private String researchSituation;
+
+    @Schema(
+            description = "工程类（起草人）",
+            example = "小明"
+    )
+    private String engineering;
+
+    @Schema(
+            description = "设备类（批准人）",
+            example = "小青"
+    )
+    private String equipment;
+
+    @Schema(
+            description = "材料类（首次发布时间）",
+            example = "2024-04-14 15:13:42"
+    )
+    private String materials;
+
+    @Schema(
+            description = "服务类(目的)",
+            example = "招标"
+    )
+    private String service;
+
+    @Schema(
+            description = "其他(适用范围)",
+            example = "0"
+    )
+    private String rests;
+
+    @Schema(description = "文件真实存在的地方", example = "/path/to/file/example.jpg")
+    private String fileUrl;
+
+    @Schema(description = "文件大小", example = "1024KB")
+    private Long fileSize;
+
+    @Schema(description = "文件原名称", example = "example.jpg")
+    private String fileName;
+
+    @Schema(description = "归档时间", example = "2024-04-15T12:00:00")
+    private Date filingTime;
+
+    @Schema(description = "是否归档", allowableValues = {"0", "1"}, example = "0")
+    private Integer isFiling;
+    @Schema(
+            description = "创建者",
+            example = "admin"
+    )
+    private String creator;
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourse.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourse.java
new file mode 100644
index 00000000..1f709636
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourse.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+import java.util.List;
+
+
+/**
+ * 课程表
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-16
+ */
+
+@Data
+@TableName("t_course")
+@Schema(description = "课程类")
+public class TCourse extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "课程目录表主键", example = "1")
+    private Long courseDirectoryId;
+
+    @Schema(description = "课程目录名称", example = "数学")
+    private String courseDirectoryName;
+
+    @Schema(description = "课程名称", example = "数学")
+    private String name;
+
+    @Schema(description = "课程说明", example = "erwef")
+    private String desrc;
+
+    @Schema(description = "课件列表")
+    @TableField(exist = false)
+    private List<TCourseware> tCoursewareList;
+
+    @TableField(exist = false)
+    private List<Long> idChain;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseDirectory.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseDirectory.java
new file mode 100644
index 00000000..5fcda242
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseDirectory.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@TableName(value = "t_course_directory",autoResultMap = true)
+@Schema(description = "课程目录类")
+public class TCourseDirectory extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "父id", example = "1")
+    private Long parentId;
+
+
+    @Schema(description = "目录名称", example = "数学")
+    private String name;
+
+    @NotNull(message = "序号不能为空")
+    @Schema(description = "序号", example = "1")
+    private Integer sequence;
+
+    private List<Long> idChain;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCoursePush.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCoursePush.java
new file mode 100644
index 00000000..53e8a762
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCoursePush.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+/**
+ * 课程推送
+ *
+ * @author admin
+ * @since 1.0.0 2024-05-12
+ */
+@EqualsAndHashCode(callSuper = false)
+@Data
+@TableName("t_course_push")
+public class TCoursePush extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "视频名称")
+    private String name;
+
+    @Schema(description = "视频路径")
+    private String fileUrl;
+
+    @Schema(description = "推送时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date pushTime;
+
+    @Schema(description = "是否开启 0：关闭 1：开启")
+    private String status;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseRecords.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseRecords.java
new file mode 100644
index 00000000..3ceb1f4d
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseRecords.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+
+/**
+ * 学习记录表
+ *
+ * @author admin
+ * @since 1.0.0 2024-06-17
+ */
+
+@Data
+@TableName("t_course_records")
+public class TCourseRecords extends BaseDO{
+	/**
+	* 主键
+	*/
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	/**
+	* 用户主键
+	*/
+	private Long userId;
+
+	/**
+	* 课程id
+	*/
+	private Long courseId;
+
+	/**
+	* 持续时长
+	*/
+	private Double continueTime;
+
+
+	/**
+	* 租户id
+	*/
+	private Long tenantId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseware.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseware.java
new file mode 100644
index 00000000..7d4bd971
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseware.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+
+/**
+ * 课件表
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-16
+ */
+
+@Data
+@TableName("t_courseware")
+@Schema(description = "课件类")
+public class TCourseware extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "课程表主键", example = "1")
+    private Integer courseId;
+
+    @Schema(description = "课件名称", example = "数学课件")
+    private String name;
+
+    @Schema(description = "课程说明", example = "dsds")
+    private String desrc;
+
+    @Schema(description = "编码 （用于在文件表中获取附件信息）", example = "a01")
+    private String code;
+
+    @Schema(description = "排序", example = "1")
+    private Integer orders;
+
+    @Schema(description = "文件地址", example = "http://www.baidu.com")
+    private String fileUrl;
+
+    @Schema(description = "文件名称")
+    private String fileName;
+
+    @Schema(description = "文件大小 单位M")
+    private Integer fileSize;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpert.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpert.java
new file mode 100644
index 00000000..934cd9e1
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpert.java
@@ -0,0 +1,78 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import java.util.Date;
+
+
+/**
+ * 专家表
+ *
+ * @author admin 
+ * @since 1.0.0 2024-05-02
+ */
+
+@Data
+@TableName("t_expert")
+public class TExpert extends BaseDO{
+	/**
+	* 主键
+	*/
+	@TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	/**
+	* 人员姓名
+	*/
+	private String username;
+
+	/**
+	* 人员编码
+	*/
+	private String usercode;
+
+	/**
+	* 邮箱
+	*/
+	private String email;
+
+	/**
+	* 手机号
+	*/
+	private String phone;
+
+	/**
+	* 性别
+	*/
+	private String sex;
+
+	/**
+	* 头像
+	*/
+	private String headPortrait;
+
+	/**
+	* 学历
+	*/
+	private String educationBackground;
+
+	/**
+	* 介绍
+	*/
+	private String introduce;
+
+	/**
+	* 领域专家
+	*/
+	private String domainExpert;
+
+	/**
+	* 职位
+	*/
+	private String post;
+
+
+
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertMaintenance.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertMaintenance.java
new file mode 100644
index 00000000..f37f9934
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertMaintenance.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+
+/**
+ * 专家维护信息表
+ *
+ * @author admin
+ * @since 1.0.0 2024-05-02
+ */
+
+@Data
+@TableName("t_expert_maintenance")
+@Schema(description = "专家维护信息")
+public class TExpertMaintenance extends BaseDO {
+	/**
+	* 主键
+	*/
+	@TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	/**
+	* 标签编号
+	*/
+	@ExcelOut(name = "标签编号", sort = 1, width = 20)
+	private String tagNum;
+
+	/**
+	* 标签名称
+	*/
+	@ExcelOut(name = "标签名称", sort = 2, width = 20)
+	private String tagName;
+
+	/**
+	* 专家人数
+	*/
+	@ExcelOut(name = "专家人数", sort = 3, width = 20)
+	private Integer expertNum;
+
+	/**
+	* 专家汇总（专家id 以,隔开）
+	*/
+	private String expertIds;
+	/**
+	 * 专家汇总名字
+	 */
+	@TableField(exist = false)
+	@ExcelOut(name = "专家汇总", sort = 4, width = 20)
+	private String expertNames;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertZone.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertZone.java
new file mode 100644
index 00000000..5d1b6a87
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertZone.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+
+/**
+ * 专家专区
+ *
+ * @author admin
+ * @since 1.0.0 2024-05-04
+ */
+
+@Data
+@TableName("t_expert_zone")
+public class TExpertZone extends BaseDO{
+	/**
+	* 主键
+	*/
+	@TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	/**
+	* 标题
+	*/
+	private String title;
+
+	/**
+	* 内容
+	*/
+	private String content;
+
+	/**
+	* 专家id
+	*/
+	private Long specialistId;
+
+
+	/**
+	 * 是否收藏
+	 */
+	@TableField(exist = false)
+	private Boolean isCollection;
+
+	/**
+	 * 评论数
+	 */
+	@TableField(exist = false)
+	private Integer commentTotal;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertZoneCollection.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertZoneCollection.java
new file mode 100644
index 00000000..aaffe6f6
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertZoneCollection.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+
+/**
+ * 专家专区收藏信息表
+ *
+ * @author admin
+ * @since 1.0.0 2024-05-05
+ */
+
+@Data
+@TableName("t_expert_zone_collection")
+public class TExpertZoneCollection extends BaseDO{
+	/**
+	* 主键
+	*/
+	@TableId(value = "id", type = IdType.AUTO)
+	@JsonFormat(shape =JsonFormat.Shape.STRING )
+	private Long id;
+
+	/**
+	* 专家id
+	*/
+	private Long specialistId;
+
+	/**
+	* 专家专区id
+	*/
+	private Long expertZoneId;
+
+	/**
+	* 用户id
+	*/
+	private Long userId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertZoneComment.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertZoneComment.java
new file mode 100644
index 00000000..a9711b4e
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpertZoneComment.java
@@ -0,0 +1,68 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+import java.util.List;
+
+
+/**
+ * 专家专区评论信息表
+ *
+ * @author admin
+ * @since 1.0.0 2024-05-05
+ */
+
+@Data
+@TableName("t_expert_zone_comment")
+public class TExpertZoneComment extends BaseDO{
+	/**
+	* 主键
+	*/
+	@TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	/**
+	* 专家专区id
+	*/
+	private Long expertZoneId;
+
+	/**
+	* 评论级别：1一级评论，2二级评论
+	*/
+	private String commentLevel;
+
+	/**
+	 * 一级评论id
+	 */
+	private Long pid;
+
+	/**
+	* 评论内容
+	*/
+	private String commentContent;
+
+	/**
+	* 创建用户id
+	*/
+	private Long userId;
+
+	/**
+	 * 二级评论列表
+	 */
+	@TableField(exist = false)
+	private List<TExpertZoneComment> subList;
+
+	/**
+	 * 评论类型(img图片,text文本)
+	 */
+	private String commentType;
+
+	/**
+	 * 评论类型(img图片,text文本)
+	 */
+	private String commentUsername;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TFileInfo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TFileInfo.java
new file mode 100644
index 00000000..b403b9e7
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TFileInfo.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 文件表(TFileInfo)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-12 10:31:34
+ */
+@Data
+@TableName(value = "t_fileinfo")
+public class TFileInfo extends BaseDO {
+
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "文件的唯一编码", example = "ABC123")
+    private String code;
+
+    @Schema(description = "名称", example = "文件现名称")
+    private String curName;
+
+    @Schema(description = "文件真实存在的地方", example = "/path/to/file/example.jpg")
+    private String fileUrl;
+
+    @Schema(description = "文件大小", example = "1024KB")
+    private Long fileSize;
+
+    @Schema(description = "文件原名称", example = "example.jpg")
+    private String originalName;
+
+    @Schema(description = "创建者", example = "John Doe")
+    @ExcelOut(name = "创建人", sort = 5)
+    private String creator;
+
+    @Schema(description = "创建者id", example = "1001")
+    private String creatorId;
+
+    @Schema(description = "文件长度", example = "1001")
+    private Long fileLenght;
+
+
+
+    @Schema(description = "绑定Id", example = "1001")
+    private Long bindId;
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TLaws.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TLaws.java
new file mode 100644
index 00000000..4d87a900
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TLaws.java
@@ -0,0 +1,80 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 法律法规表(TLaws)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-12 10:31:34
+ */
+@Data
+public class TLaws extends BaseDO {
+
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "文件的唯一编码", example = "ABC123")
+    private String code;
+
+    @Schema(description = "名称", example = "文件名称")
+    @ExcelOut(name = "名称", sort = 1)
+    private String name;
+
+    @Schema(description = "版本", example = "1.0")
+    @ExcelOut(name = "版本号", sort = 2)
+    private String version;
+
+    @Schema(description = "文件真实存在的地方", example = "/path/to/file/example.jpg")
+    @ExcelOut(name = "文件地址", sort = 4,width = 85,isFileUrl = true)
+    private String fileUrl;
+
+    @Schema(description = "文件大小", example = "1024KB")
+    @ExcelOut(name = "文件大小", sort = 3)
+    private Long fileSize;
+
+    @Schema(description = "文件原名称", example = "example.jpg")
+    private String fileName;
+
+    @Schema(description = "归档时间", example = "2024-04-15T12:00:00")
+    private Date filingTime;
+
+    @Schema(description = "是否归档", allowableValues = {"0", "1"}, example = "0")
+    private Integer isFiling;
+
+    @Schema(description = "预留字段A")
+    private String lawsA;
+
+    @Schema(description = "预留字段B")
+
+    private String lawsB;
+
+    @Schema(description = "说明", example = "这是一段说明")
+    private String describeInfo;
+
+    @Schema(description = "创建者", example = "John Doe")
+    @ExcelOut(name = "创建人", sort = 5)
+    private String creator;
+
+    @Schema(description = "创建者id", example = "1001")
+    private String creatorId;
+    //1:法律2:行政法规3:部门规章4:地方法规5:地方规章
+    private String type;
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TLawsRecord.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TLawsRecord.java
new file mode 100644
index 00000000..fe59de87
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TLawsRecord.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 法律法规表(TLaws)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-12 10:31:34
+ */
+@Data
+@TableName("t_laws_records")
+
+public class TLawsRecord extends BaseDO {
+
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "对应法律法规id", example = "1001")
+    private Long lawsId;
+
+    @Schema(description = "文件的唯一编码", example = "ABC123")
+    private String code;
+    @Schema(description = "文件名称", example = "1.0")
+    private String name;
+    @Schema(description = "版本", example = "1.0")
+    private String version;
+
+    @Schema(description = "文件大小", example = "1.0")
+    private Long fileSize;
+
+    @Schema(description = "文件真实存在的地方", example = "/path/to/file/example.jpg")
+    private String fileUrl;
+    @Schema(description = "文件原名称", example = "test.jpg")
+    private String fileName;
+    @Schema(description = "归档时间", example = "2024-05-05")
+    private Date filingTime;
+    @Schema(description = "说明", example = "这是一段说明")
+    private String describeInfo;
+    @Schema(description = "创建者", example = "John Doe")
+    private String creator;
+
+    @Schema(description = "创建者id", example = "1001")
+    private String creatorId;
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMap.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMap.java
new file mode 100644
index 00000000..8e2cce88
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMap.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+@Data
+@TableName("t_map")
+@Schema(description = "地图类")
+public class TMap extends BaseDO {
+
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "文件的唯一编码", example = "ABC123")
+    private String name;
+
+    @Schema(description = "名称", example = "文件名称")
+    private String modelTag;
+
+    @Schema(description = "创建者", example = "John Doe")
+    private String creator;
+
+    @Schema(description = "创建者id", example = "1001")
+    private String creatorId;
+
+
+
+    @Schema(description = "地图图片", example = "1001")
+    private String mapImage;
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMapImage.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMapImage.java
new file mode 100644
index 00000000..0d49efa8
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMapImage.java
@@ -0,0 +1,63 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@TableName("t_map_image")
+@Data
+@Schema(description = "地图图片类")
+public class TMapImage extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+
+    @Schema(
+            description = "文件名称",
+            example = "test.doc"
+    )
+    @TableField("fileName")
+    private String name;
+
+    @Schema(
+            description = "文件地址",
+            example = "/d/test"
+    )
+    private String fileUrl;
+
+    @Schema(
+            description = "文件大小",
+            example = "20KB"
+    )
+    private String fileSize;
+
+    @Schema(
+            description = "文件排序",
+            example = "1"
+    )
+    private int sort;
+
+    @Schema(
+            description = "违章编码",
+            example = "a01"
+    )
+    private String mapCode;
+
+    @Schema(
+            description = "创建人",
+            example = "a01"
+    )
+    private String creator;
+
+    @Schema(
+            description = "关联违章id",
+            example = "1"
+    )
+    private Long mapId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMapNode.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMapNode.java
new file mode 100644
index 00000000..3746bbdd
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMapNode.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 法律法规表(TLaws)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-12 10:31:34
+ */
+@Data
+public class TMapNode extends BaseDO {
+
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "文件的唯一编码", example = "ABC123")
+    private Long mapId;
+
+    @Schema(description = "名称", example = "文件名称")
+    private String modelTag;
+
+    @Schema(description = "名称", example = "文件名称")
+    private int orders;
+
+    @Schema(description = "名称", example = "文件名称")
+    private String content;
+
+    @Schema(description = "创建者", example = "John Doe")
+    private String creator;
+
+    @Schema(description = "创建者id", example = "1001")
+    private String creatorId;
+
+    @TableField(
+        fill = FieldFill.INSERT
+    )
+
+
+    @Schema(description = "父级地图节点", example = "list")
+    private Long parentId;
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMonthlyProjectPurchase.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMonthlyProjectPurchase.java
new file mode 100644
index 00000000..69ef720e
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMonthlyProjectPurchase.java
@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * (TMonthlyProjectPurchase)表实体类
+ *
+ */
+@Data
+@TableName("t_monthly_project_purchase")
+public class TMonthlyProjectPurchase extends BaseDO {
+
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    //所在项目名称
+    @ExcelOut(name = "所在项目名称", sort = 1)
+    private String projectName;
+    //采购事项名称
+    @ExcelOut(name = "采购事项名称", sort = 2)
+    private String procurementMatters;
+    //采购内容
+    @ExcelOut(name = "采购内容", sort = 3)
+    private String procurementContent;
+    //事项类型
+    @ExcelOut(name = "事项类型", sort = 4)
+    private String matterType;
+    //采购方式
+    @ExcelOut(name = "采购方式", sort = 5)
+    private String purchasingMethod;
+    //招标代理机构
+    @ExcelOut(name = "招标代理机构", sort = 6)
+    private String tenderingAgency;
+    //预估合同价
+    @ExcelOut(name = "预估合同价", sort = 7)
+    private String contractPriceEstimated;
+    //合同价
+    @ExcelOut(name = "合同价", sort = 8)
+    private String contractPrice;
+    //中标价
+    @ExcelOut(name = "中标价", sort = 9)
+    private String bidPrice;
+    //采购时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ExcelOut(name = "采购时间", sort = 10,dateFormat = "yyyy-MM-dd")
+    private Date purchaseTime;
+    //合同签订时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ExcelOut(name = "合同签订时间", sort = 11,dateFormat = "yyyy-MM-dd")
+    private Date contractSigningTime;
+    //合同相对方
+    @ExcelOut(name = "合同相对方", sort = 12)
+    private String contractCounterparty;
+    //创建人
+    @ExcelOut(name = "创建人", sort = 13)
+    private String creator;
+    //备注
+    @ExcelOut(name = "备注", sort = 14)
+    private String remark;
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TNotProcurementBid.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TNotProcurementBid.java
new file mode 100644
index 00000000..fe21c4e5
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TNotProcurementBid.java
@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 非招标采购方式表(TNotProcurementBid)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-12 10:31:34
+ */
+@Data
+@TableName("t_not_procurement_bid")
+public class TNotProcurementBid extends BaseDO{
+
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "招标计划id", example = "2")
+    private Long bidPlanId;
+
+    @Schema(description = "类型 0:竞争性谈判 1:单一来源 2:询比价 3:其他", example = "0")
+    private Integer type;
+
+    @Schema(description = "序号", example = "1")
+    private String orders;
+
+    @Schema(description = "采购事项", example = "采购事项示例")
+    private String purchaseMatters;
+
+    @Schema(description = "采购内容(采购名称)", example = "采购内容示例")
+    private String purchaseContent;
+
+    @Schema(description = "预估价格（万元）", example = "100.0")
+    private Double estimatedPrice;
+
+    @Schema(description = "计划时间", example = "2024-04-23T12:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date planTime;
+
+    @TableField(exist = false)
+    private String planTimes;
+
+    @Schema(description = "评审办法", example = "评审办法示例")
+    private String evaluationMethod;
+
+    @Schema(description = "确认方式", example = "确认方式示例")
+    private String confirmationMode;
+
+    @Schema(description = "创建者", example = "John Doe")
+    private String creator;
+    @Schema(
+            description = "创建者id",
+            example = "1"
+    )
+    private String creatorId;
+
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationDocument.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationDocument.java
new file mode 100644
index 00000000..1fbaf915
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationDocument.java
@@ -0,0 +1,83 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TOperationDocument
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/19 15:30
+ **/
+@Data
+@TableName("t_operation_document")
+public class TOperationDocument   {
+
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "操作文件中文名称",example = "a.pdf")
+
+    @ExcelOut(name = "操作文件中文名称", sort = 1, width = 20)
+    private String cnName;
+
+    @TableField(exist = false)
+    private String name;
+
+    @Schema(description = "操作文件英文名",example = "a.pdf")
+    private String enName;
+
+    @Schema(description = "操作文件大小",example = "30kb")
+    private String fileSize;
+
+    @Schema(description = "版本",example = "1.0")
+    @ExcelOut(name = "版本", sort = 4, width = 20)
+    private String version;
+
+    @Schema(description = "文件编码",example = "ABC123")
+    @ExcelOut(name = "文件编码", sort = 2, width = 20)
+    private String fileCode;
+
+    private String fileName;
+
+    @Schema(description = "二维码编码",example = "RZ2024001")
+    private String qrCode;
+
+    @Schema(description = "标签",example = "0:标准操作程序模版, 1：产品原料标准模版, 2：工艺设备标准模版")
+    private String tag;
+
+    @Schema(description = "文件路径",example = "")
+
+    @ExcelOut(name = "文件路径", sort = 3, width = 20,isFileUrl = true)
+    private String url;
+
+
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTimes;
+
+
+
+
+    @Schema(description = "x/x",example = "")
+    private String setx;
+
+    @TableField(exist = false)
+    private String des;
+    //具体内容
+    private String specificContent;
+    //结果判定
+    private String resultDetermination;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationProcedure.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationProcedure.java
new file mode 100644
index 00000000..d048550e
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationProcedure.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TOperationProcedure
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/21 21:45
+ **/
+@Data
+@TableName(value = "t_operation_procedure")
+public class TOperationProcedure extends BaseDO {
+
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "操作文件编码",example = "")
+    private String operationDocumentCode;
+
+    @Schema(description = "单位名称",example = "")
+    private String unitName;
+
+    @Schema(description = "作业名称/人数",example = "")
+    private String jobName;
+
+    @Schema(description = "编号",example = "")
+    private String code;
+
+    @Schema(description = "劳保用品",example = "")
+    private String labour;
+
+    @Schema(description = "使用工具/材料",example = "")
+    private String tool;
+
+    @Schema(description = "作业环境",example = "")
+    private String environment;
+
+    @Schema(description = "编制人/日期",example = "")
+    private String organizer;
+
+    @Schema(description = "审核人/日期",example = "")
+    private String auditor;
+
+    @Schema(description = "批准人/日期",example = "")
+    private String approver;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationProcedureCore.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationProcedureCore.java
new file mode 100644
index 00000000..56321710
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationProcedureCore.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TOperationProcedureCore
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/21 21:52
+ **/
+@Data
+@TableName(value = "t_operation_procedure_core")
+public class TOperationProcedureCore extends BaseDO {
+
+    
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    
+    @Schema(description = "操作文件编码",example = "")
+    private String operationDocumentCode;
+
+    @Schema(description = "序号",example = "")
+    private String orders;
+
+    @Schema(description = "步骤简述",example = "")
+    private String sketch;
+
+    @Schema(description = "具体动作",example = "")
+    private String specificAction;
+
+    @Schema(description = "风险描述",example = "")
+    private String riskDescription;
+
+    @Schema(description = "风险管控措施",example = "")
+    private String riskControlMeasures;
+
+    @Schema(description = "关键动作",example = "")
+    private String keyAction;
+
+    @Schema(description = "紧急处置措施",example = "")
+    private String emergencyMeasures;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOtherArchives.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOtherArchives.java
new file mode 100644
index 00000000..dc202ab1
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOtherArchives.java
@@ -0,0 +1,117 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import cn.iocoder.yudao.module.knowledge.controller.responsevo.FileInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 档案表(t_other_archives)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-11 10:25:58
+ */
+@TableName("t_other_archives")
+@Data
+@Schema(description = "档案类")
+public class TOtherArchives extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(
+            description = "父id",
+            example = "11"
+    )
+    private Long parentId;
+
+    @Schema(
+            description = "文件的唯一编码",
+            example = "a01"
+    )
+    private String code;
+
+    @Schema(
+            description = "类型 1 ：图片 2：视频 3：文档 4 ：音频",
+            example = "1"
+    )
+    private String type;
+
+    @Schema(
+            description = "文件原名称",
+            example = "文件1"
+    )
+    @ExcelOut(name = "文件名称", sort = 1, width = 20)
+    private String originalFilename;
+
+    @Schema(
+            description = "文件现名称",
+            example = "文件2"
+    )
+    private String curFilename;
+
+    @Schema(
+            description = "排序",
+            example = "1"
+    )
+    private String orders;
+
+    @Schema(
+            description = "文件真实存在的地方",
+            example = "/d/test"
+    )
+    @ExcelOut(name = "文件地址", sort = 3, width = 20,isFileUrl = true)
+    private String fileUrl;
+
+    @Schema(
+            description = "文件大小",
+            example = "10KB"
+    )
+    @ExcelOut(name = "文件大小", sort = 2, width = 20)
+    private Long fileSize;
+
+    @Schema(
+            description = "是否是文件夹 0：文件夹 1:文件",
+            example = "0"
+    )
+    private Integer isDir;
+
+
+    
+
+    @Schema(
+            description = "是否移到回收站 0：是 1：否",
+            example = "0"
+    )
+    private Integer isRecycled;
+
+    @Schema(
+            description = "创建者",
+            example = "admin"
+    )
+    private String creator;
+
+
+    @Schema(
+            description = "创建者id",
+            example = "1"
+    )
+    private String creatorId;
+
+    @Schema(
+            description = "文件信息",
+            example = "10KB，jpg"
+    )
+    @TableField(exist = false)
+    private FileInfo fileInfo;
+
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TProcurementBid.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TProcurementBid.java
new file mode 100644
index 00000000..451a2c6f
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TProcurementBid.java
@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 招标采购方式表(TProcurementBid)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-12 10:31:34
+ */
+@Data
+@TableName("t_procurement_bid")
+public class TProcurementBid extends BaseDO {
+
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "招标计划id", example = "2")
+    private Long bidPlanId;
+
+    @Schema(description = "类型 0:代表公开招标 1:代表邀请招标", example = "0")
+    private Integer type;
+
+    @Schema(description = "序号", example = "1")
+    private String orders;
+
+    @Schema(description = "标段名称", example = "标段名称示例")
+    private String sectionName;
+
+    @Schema(description = "招标内容", example = "招标内容示例")
+    private String bidContent;
+
+    @Schema(description = "预估价格（万元）", example = "100.0")
+    private Double estimatedPrice;
+
+    @Schema(description = "计划时间", example = "2024-04-23T12:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date planTime;
+
+    @TableField(exist = false)
+    private String planTimes;
+
+    @Schema(description = "评标办法", example = "评标办法示例")
+    private String bidEvaluationMethod;
+
+    @Schema(description = "定标方式", example = "定标方式示例")
+    private String scalingMode;
+
+    @Schema(description = "创建者", example = "John Doe")
+    private String creator;
+    @Schema(
+            description = "创建者id",
+            example = "1"
+    )
+    private String creatorId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TProductRawMaterials.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TProductRawMaterials.java
new file mode 100644
index 00000000..59fb550a
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TProductRawMaterials.java
@@ -0,0 +1,116 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TProductRawMaterials
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/22 7:20
+ **/
+@Data
+@TableName(value = "t_product_raw_materials")
+public class TProductRawMaterials extends BaseDO {
+
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "操作文件编码",example = "")
+    private String operationDocumentCode;
+
+    @Schema(description = "编码",example = "")
+    private String code;
+
+    @Schema(description = "原编码",example = "")
+    private String originalCode;
+
+    @Schema(description = "受控状态",example = "")
+    private String controlledState;
+
+    @Schema(description = "发布时间",example = "")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date releaseTime;
+
+    @Schema(description = "实施时间",example = "")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date implementationTime;
+
+    @Schema(description = "顺序号",example = "")
+    private String sn;
+
+    @Schema(description = "系列",example = "")
+    private String series;
+
+    @Schema(description = "具体操作",example = "")
+    private String concreteOperations;
+
+    @Schema(description = "变化内容",example = "")
+    private String changeContent;
+
+    @Schema(description = "标准归口",example = "")
+    private String attribute;
+
+    @Schema(description = "起草单位",example = "")
+    private String draftingUnit;
+
+    @Schema(description = "起草人",example = "")
+    private String rapporteur;
+
+    @Schema(description = "批准人",example = "")
+    private String approver;
+
+    @Schema(description = "第一次发布时间",example = "2024-04-19 15:25:35")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date firstReleaseTime;
+
+    @Schema(description = "符号",example = "")
+    private String symbol;
+
+    @Schema(description = "目的",example = "")
+    private String purpose;
+
+    @Schema(description = "适用范围",example = "")
+    private String scopeOfApplication;
+
+    @Schema(description = "术语",example = "")
+    private String term;
+
+    @Schema(description = "引用文件",example = "")
+    private String referenceFile;
+
+    @Schema(description = "要求",example = "")
+    private String requires;
+
+    @Schema(description = "实验方法",example = "")
+    private String experimentalMethod;
+
+    @Schema(description = "组批",example = "")
+    private String lotGrouping;
+
+    @Schema(description = "取样",example = "")
+    private String sampling;
+
+    @Schema(description = "质量结果判定",example = "")
+    private String resultDetermination;
+
+    @Schema(description = "不合格处置方式",example = "")
+    private String disposalMethod;
+
+    @Schema(description = "称重",example = "")
+    private String weigh;
+
+    @Schema(description = "发放范围",example = "")
+    private String distributionScope;
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionAnswers.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionAnswers.java
new file mode 100644
index 00000000..0cdc9f72
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionAnswers.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+import java.io.Serializable;
+
+
+@Data
+@TableName("t_question_answers")
+@Schema(description = "题答案类")
+public class TQuestionAnswers extends BaseDO implements Serializable {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    @Schema(description = "主键")
+    private Long id;
+
+    @Schema(description = "题干表id", example = "1")
+    private Long questionStemId;
+
+    @Schema(description = "内容", example = "dsfs")
+    private String content;
+
+    @Schema(description = "文件地址", example = "/d/ddw")
+    private String fileUrl;
+
+    @Schema(description = "选项", example = "A")
+    private String options;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionBank.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionBank.java
new file mode 100644
index 00000000..c4b35062
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionBank.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+import java.util.List;
+
+
+/**
+ * 题库表
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-16
+ */
+
+@Data
+@TableName(value = "t_question_bank",autoResultMap = true)
+@Schema(description = "题库类")
+public class TQuestionBank extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "父id", example = "1")
+    private Long parentId;
+
+    @Schema(description = "目录名称", example = "dwd")
+    private String name;
+
+    private Integer sequence;
+    private List<Long> idChain;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionStem.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionStem.java
new file mode 100644
index 00000000..38b93cbe
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionStem.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+import java.util.List;
+
+
+/**
+ * 题干表
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-16
+ */
+
+@Data
+@TableName("t_question_stem")
+@Schema(description = "题干类")
+public class TQuestionStem extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "题库id", example = "1")
+    private Long questionBankId;
+
+    @Schema(description = "题库名字", example = "题库1")
+    private String questionBankName;
+
+    @Schema(description = "内容", example = "def")
+    private String content;
+
+    @Schema(description = "类型 0:单选题 1:多选题 2:判断题 3:填空题 4:简答题", example = "1")
+    private String type;
+
+    @Schema(description = "级别 0:容易 1:较易 2:普通 3:较难 4:困难", example = "1")
+    private String level;
+
+    @Schema(description = "文件地址", example = "/d/kdl")
+    private String fileUrl;
+
+    @Schema(description = "解析", example = "答案")
+    private String analysis;
+
+    @Schema(description = "解析文件地址", example = "答案")
+    private String analysisFileUrl;
+
+    @Schema(description = "正确答案", example = "A")
+    private String rightAnswers;
+
+    @Schema(description = "题干编码", example = "A02")
+    private String code;
+    //关键字
+    private String keyContent;
+
+    @TableField(exist = false)
+    @Schema(description = "题目选项", example = "A02")
+    private List<TQuestionAnswers> answersRequestList;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFramework.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFramework.java
new file mode 100644
index 00000000..b5398fc6
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFramework.java
@@ -0,0 +1,82 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 规章制度表(TRegulatoryFramework)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-12 17:36:32
+ */
+@Data
+public class TRegulatoryFramework extends BaseDO {
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "文件的唯一编码", example = "RZ2024001")
+    private String code;
+    //1:安全环保职业健康消防2:财务与资产管理3:采购销售4:党、工、团、纪律监督5:法律合规内审内控6:科技与投资7:企业文化与宣传8:人力资源9:社会责任10:生产管理11:行政管理
+    private String type;
+
+    @Schema(description = "规章制度名称", example = "安全管理制度")
+    @ExcelOut(name = "名称", sort = 1)
+    private String name;
+
+    @Schema(description = "版本号", example = "1.0")
+    @ExcelOut(name = "版本号", sort = 2)
+    private String version;
+
+    @Schema(description = "文件地址", example = "/path/to/file/example.pdf")
+    @ExcelOut(name = "文件地址", sort = 4,width = 85,isFileUrl = true)
+    private String fileUrl;
+
+    @Schema(description = "文件大小", example = "1024KB")
+    @ExcelOut(name = "文件大小", sort = 3)
+    private Long fileSize;
+
+    @Schema(description = "文件原名称", example = "safety_management_policy.pdf")
+    private String fileName;
+
+    @Schema(description = "归档时间", example = "2024-04-15T12:00:00")
+    private Date filingTime;
+
+    @Schema(description = "是否归档", allowableValues = {"0", "1"}, example = "0")
+    private Integer isFiling;
+
+
+
+    @Schema(description = "预留字段A")
+    private String lawsA;
+
+    @Schema(description = "预留字段B")
+    private String lawsB;
+
+    @Schema(description = "创建者", example = "John Doe")
+    @ExcelOut(name = "创建人", sort = 5)
+    private String creator;
+
+    @Schema(description = "创建者id", example = "1001")
+    private String creatorId;
+
+
+
+    @Schema(description = "说明", example = "这是一段说明")
+    private String describeInfo;
+
+
+}
+
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFrameworkExecution.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFrameworkExecution.java
new file mode 100644
index 00000000..73dd5d91
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFrameworkExecution.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TRegulatoryFrameworkexcusion
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/27 11:43
+ **/
+@Data
+@TableName(value = "t_regulatory_framework_execution")
+public class TRegulatoryFrameworkExecution   extends BaseDO  {
+
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "",example = "")
+    @ExcelOut(name = "执行监督名称", sort = 1, width = 20)
+    private String name;
+
+    @Schema(description = "",example = "")
+    @ExcelOut(name = "文件的唯一编码", sort = 2, width = 20)
+    private String code;
+
+    @Schema(description = "",example = "")
+    private String state;
+
+    @Schema(description = "",example = "")
+    @ExcelOut(name = "备注说明", sort = 4, width = 20)
+    private String descr;
+
+
+    @Schema(description = "",example = "")
+    private String creator;
+
+    @Schema(description = "",example = "")
+    private String creatorId;
+
+
+
+    @Schema(description = "",example = "")
+    @TableField(exist = false)
+    private Double processNum;
+    @TableField(exist = false)
+    //状态1未填报2已上报
+    private String status;
+    @TableField(exist = false)
+    private List<TRfeContent>  contents;
+    @TableField(exist = false)
+    private List<TRfeUser>  users;
+    @TableField(exist = false)
+    private List<RfeuTaskContent>  taskContents;
+    @TableField(exist = false)
+    private Long taskId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFrameworkRecord.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFrameworkRecord.java
new file mode 100644
index 00000000..6f459e6c
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFrameworkRecord.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 规章制度表表实体类
+ *
+ * @author makejava
+ * @since 2024-04-12 10:31:34
+ */
+@Data
+@TableName("t_regulatory_framework_records")
+public class TRegulatoryFrameworkRecord extends BaseDO {
+
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "对应法律法规id")
+    private Long lawsId;
+
+    @Schema(description = "文件的唯一编码")
+    private String code;
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "版本")
+    private String version;
+
+    @Schema(description = "文件真实存在的地方")
+    private String fileUrl;
+
+    @Schema(description = "文件大小")
+    private String fileSize;
+
+    @Schema(description = "文件原名称")
+    private String fileName;
+
+    @Schema(description = "归档时间", example = "2024-04-23T12:00:00")
+    private Date filingTime;
+
+    @Schema(description = "说明")
+    private String describeInfo;
+
+    @Schema(description = "操作者")
+    private String creator;
+
+    @Schema(description = "操作者id")
+    private String creatorId;
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRevision.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRevision.java
new file mode 100644
index 00000000..14f5bb5e
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRevision.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TProductRawMaterials
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/22 7:20
+ **/
+@Data
+@TableName(value = "t_revision")
+public class TRevision extends BaseDO {
+
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "操作文件编码",example = "")
+    private String operationDocumentCode;
+    private String type;
+
+    @Schema(description = "内容",example = "")
+    private String content;
+
+    @Schema(description = "序号",example = "")
+    private String orders;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeContent.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeContent.java
new file mode 100644
index 00000000..6a67d299
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeContent.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TRfeContent
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/27 11:53
+ **/
+@Data
+public class TRfeContent extends BaseDO {
+
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "",example = "")
+    private Long rfeId;
+
+    @Schema(description = "",example = "")
+    private String fileName;
+
+    @Schema(description = "",example = "")
+    private String fileUrl;
+
+    @Schema(description = "",example = "")
+    private String fileVersion;
+
+    @Schema(description = "",example = "")
+    private Integer sort;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeUser.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeUser.java
new file mode 100644
index 00000000..2581b1be
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeUser.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TRfeUser
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/27 11:48
+ **/
+@Data
+public class TRfeUser  {
+
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "",example = "")
+    private String code;
+
+    @Schema(description = "",example = "")
+    private String refCode;
+
+    @Schema(description = "",example = "")
+    private String username;
+
+    @Schema(description = "",example = "")
+    private String usercode;
+
+    @Schema(description = "",example = "")
+    private String state;
+
+
+    
+
+    @Schema(description = "",example = "")
+    private String creator;
+
+    @Schema(description = "",example = "")
+    private String creatorId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeuTask.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeuTask.java
new file mode 100644
index 00000000..5be4c1fe
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeuTask.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TRfeuTask
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/27 11:55
+ **/
+@Data
+public class TRfeuTask extends BaseDO {
+
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    @Schema(description = "",example = "")
+    private String userId;
+
+    @Schema(description = "",example = "")
+    private String rfecId;
+    //状态1未填报2已上报
+    @Schema(description = "",example = "")
+    private String status;
+
+    @Schema(description = "",example = "")
+    private String descr;
+    @TableField(exist = false)
+    private List<RfeuTaskContent> rfeuTaskContents;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TSpecialist.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TSpecialist.java
new file mode 100644
index 00000000..1fac2d00
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TSpecialist.java
@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.entity
+ * @className:TSpecialist
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/30 16:50
+ **/
+@Data
+@TableName(value = "t_specialist")
+@Schema(description = "专家列表信息")
+public class TSpecialist extends BaseDO{
+
+    @Schema(description = "主键id", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "人员姓名",example = "张三")
+    @ExcelOut(name = "人员姓名", sort = 1, width = 20)
+    private String username;
+
+    @Schema(description = "人员编码",example = "001")
+    @ExcelOut(name = "人员编码", sort = 2, width = 20)
+    private String usercode;
+
+    @Schema(description = "邮箱",example = "12345678901@qq.com")
+    @ExcelOut(name = "邮箱", sort = 3, width = 20)
+    private String email;
+
+    @Schema(description = "手机号",example = "12345678901")
+    @ExcelOut(name = "手机号", sort = 4, width = 20)
+    private String phone;
+
+    @Schema(description = "性别",example = "男")
+    @ExcelOut(name = "性别", sort = 5, width = 20, dateFormat = "1=男,2=女")
+    private String sex;
+
+    @Schema(description = "",example = "")
+    private String headPortrait;
+
+    @Schema(description = "学历",example = "本科")
+    @ExcelOut(name = "学历", sort = 6, width = 20)
+    private String educationBackground;
+
+    @Schema(description = "介绍",example = "这是一段介绍")
+    @ExcelOut(name = "介绍", sort = 7, width = 20)
+    private String introduce;
+
+    @Schema(description = "领域专家",example = "001")
+    private String domainExpert;
+
+    @Schema(description = "职位",example = "暂无")
+    @ExcelOut(name = "职位", sort = 9, width = 20)
+    private String post;
+
+    @Schema(description = "",example = "")
+    private Long expertId;
+
+
+    @ExcelOut(name = "领域专家", sort = 8, width = 20)
+    @TableField(exist = false)
+    private String tagName;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTechnologyEquipment.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTechnologyEquipment.java
new file mode 100644
index 00000000..e18a3287
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTechnologyEquipment.java
@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 工艺设备
+ **/
+@Data
+@TableName(value = "t_technology_equipment")
+public class TTechnologyEquipment extends BaseDO {
+
+    @Schema(description = "主键", example = "1")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "操作文件编码")
+    private String operationDocumentCode;
+
+    @Schema(description = "编码")
+    private String code;
+
+    @Schema(description = "原编码")
+    private String originalCode;
+
+    @Schema(description = "受控状态")
+    private String controlledState;
+
+    @Schema(description = "发布时间", example = "2024-04-23T12:00:00")
+    private Date releaseTime;
+
+    @Schema(description = "实施时间", example = "2024-04-23T12:00:00")
+    private Date implementationTime;
+
+    @Schema(description = "顺序号")
+    private String sn;
+
+    @Schema(description = "系列")
+    private String series;
+
+    @Schema(description = "具体操作")
+    private String concreteOperations;
+
+    @Schema(description = "变化内容")
+    private String changeContent;
+
+    @Schema(description = "标准归口")
+    private String attribute;
+
+    @Schema(description = "起草单位")
+    private String draftingUnit;
+
+    @Schema(description = "起草人")
+    private String rapporteur;
+
+    @Schema(description = "批准人")
+    private String approver;
+
+    @Schema(description = "第一次发布时间", example = "2024-04-23T12:00:00")
+    private Date firstReleaseTime;
+
+    @Schema(description = "目的")
+    private String purpose;
+
+    @Schema(description = "适用范围")
+    private String scopeOfApplication;
+
+    @Schema(description = "术语")
+    private String term;
+
+    @Schema(description = "引用文件")
+    private String referenceFile;
+
+    @Schema(description = "要求")
+    private String requires;
+
+    @Schema(description = "相关文件")
+    private String relevantFile;
+
+    @Schema(description = "相关记录")
+    private String relevantRecord;
+
+    @Schema(description = "发放范围")
+    private String distributionScope;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTestPaperAnswerSheet.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTestPaperAnswerSheet.java
new file mode 100644
index 00000000..00d4901c
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTestPaperAnswerSheet.java
@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+/**
+ * 试卷答题卡表
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-26
+ */
+
+@Data
+@TableName(value = "t_test_paper_answer_sheet", autoResultMap = true)
+public class TTestPaperAnswerSheet extends BaseDO {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 试卷信息id
+     */
+    private Long testPaperInfoId;
+
+    /**
+     * 得分
+     */
+    private Double score;
+
+    /**
+     * 提交答案
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private SubmitAnswer submitAnswer;
+
+    /**
+     * 考生编号
+     */
+    private String examinationNumber;
+    /**
+     * 考生名称
+     */
+    private String examinationName;
+
+    /**
+     * 开始考试时间
+     */
+    private Date startTime;
+    /**
+     * 是否补考 0不是
+     */
+    private Integer type;
+    /**
+     * 是否通过
+     */
+    private Integer pass;
+    /**
+     * 纠错次数
+     */
+    private Integer redress;
+    /**
+     * 纠错次数
+     */
+    @TableField(exist = false)
+    private String deptName;
+    private Long userId;
+    @TableField(
+            fill = FieldFill.INSERT
+    )
+    private String identityId;
+
+    @Schema(description = "是否是交卷", example = "1")
+    private String isHand;
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    private Date startDate;
+
+    //试卷名称
+    @TableField(exist = false)
+    private String paperName;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTestPaperInfo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTestPaperInfo.java
new file mode 100644
index 00000000..0337905b
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTestPaperInfo.java
@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.Stemdto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.List;
+
+
+@Data
+@TableName(value = "t_test_paper_info",autoResultMap = true)
+@Schema(description = "试卷信息类")
+public class TTestPaperInfo extends BaseDO implements Serializable {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "考试编号", example = "123")
+    private String testNum;
+
+    @Schema(description = "试卷名称", example = "数学试卷")
+    private String name;
+
+    @Schema(description = "考试开始日期", example = "123")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate startDate;
+
+    @Schema(description = "考试截止日期", example = "123")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate endDate;
+
+    @Schema(description = "考试时长", example = "123")
+    private Integer duration;
+
+    @Schema(description = "考试人数", example = "123")
+    private Integer peopleCount;
+
+    @Schema(description = "题库名称", example = "一号题库")
+    private String questionBankName;
+
+    @Schema(description = "题库id", example = "1")
+    private Long questionBankId;
+
+    @Schema(description = "试卷类型 0:统一试卷 1:千人千份", example = "0")
+    private String type;
+
+    @Schema(description = "总分", example = "100")
+    private Double allScore;
+
+    @Schema(description = "及格分", example = "20")
+    private Double passScore;
+
+    @Schema(description = "补考次数", example = "1")
+    private Integer makeUp;
+
+    @Schema(description = "纠错次数", example = "2")
+    private Integer errorCorrection;
+
+    @Schema(description = "总题数", example = "10")
+    private Integer allQuestionSum;
+
+    @Schema(description = "培训编码", example = "dsdssKDSDFDS0DSC2")
+    private String teachCode;
+
+    @Schema(description = "各题字段(题设置)", example = "de")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Stemdto> setting;
+
+    @Schema(description = "培训id", example = "123")
+    private Long trainId;
+
+    @TableField(exist = false)
+    @Schema(description = "考试状态", example = "未开始")
+    private String testStatus;
+
+
+
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTestPaperQuestionStem.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTestPaperQuestionStem.java
new file mode 100644
index 00000000..9a77cae2
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTestPaperQuestionStem.java
@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+
+@Data
+@TableName(value = "t_test_paper_question_stem", autoResultMap = true)
+@Schema(description = "试卷题干类")
+@Accessors(chain = true)
+public class TTestPaperQuestionStem extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "培训id")
+    private Long trainId;
+
+    @Schema(description = "员工id")
+    private Long userId;
+
+    @Schema(description = "员工姓名")
+    private String userName;
+
+    @Schema(description = "试卷id", example = "1")
+    private Long testPaperInfoId;
+
+    @Schema(description = "文件地址", example = "/dev/dsdhsd.doc")
+    private String fileUrl;
+
+    @Schema(description = "内容", example = "123")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Content content;
+
+    @Schema(description = "类型 0:单选题1:多选题 2:判断题3:填空题4:简答题", example = "1")
+    private String type;
+
+    @Schema(description = "级别 0:容易1:较易2:普通3:较难4:困难", example = "1")
+    private String level;
+
+    @Schema(description = "解析", example = "fdjasdnfj")
+    private String analysis;
+
+    @Schema(description = "正确答案", example = "A")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<String> rightAnswers;
+
+    @Schema(description = "题干编码", example = "a01")
+    private String code;
+
+    @Schema(description = "题干id", example = "34")
+    private Long tQuestionStemId;
+
+    @Schema(description = "分值", example = "5")
+    private double score;
+
+    @Schema(description = "序号", example = "1")
+    private String orders;
+
+    @Schema(description = "用户标识 用户标识 千人千卷有值", example = "1")
+    private String usercode;
+
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrain.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrain.java
new file mode 100644
index 00000000..f89361a8
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrain.java
@@ -0,0 +1,91 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+@Data
+@TableName("t_train")
+@Schema(description = "培训类")
+public class TTrain extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "培训编码", example = "dsdssKDSDFDS0DSC2")
+    private String code;
+
+    @Schema(description = "培训班名称（内容）", example = "起航班")
+    private String name;
+
+    @Schema(description = "办班单位", example = "起航")
+    private String holdUnit;
+
+    @Schema(description = "办班形式 0:脱产 1：半脱产 2：业余", example = "0")
+    private Integer holdForm;
+
+    @Schema(description = "教学计划", example = "计划")
+    private String plan;
+
+    @Schema(description = "教师名称", example = "李某某")
+    private String teacherName;
+
+    @Schema(description = "教师学历", example = "大专")
+    private String teacherEducation;
+
+    @Schema(description = "教师职称", example = "高级")
+    private String jobTitle;
+
+    @Schema(description = "授课时长", example = "1.5")
+    private Double teachTime;
+
+    @Schema(description = "办班地址", example = "济南")
+    private String handAddress;
+
+    @Schema(description = "开班时间", example = "2024-04-22 12:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date startTime;
+
+    @Schema(description = "结束时间", example = "2024-04-22 12:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date stopTime;
+
+    @Schema(description = "办班单位审批意见", example = "没意见")
+    private String holdApprovalOpinion;
+
+    @Schema(description = "主管单位审批意见", example = "没意见")
+    private String coApprovalOpinion;
+
+    @Schema(description = "备注", example = "备注")
+    private String desrc;
+
+    @Schema(description = "培训人数", example = "11")
+    @TableField(exist = false)
+    private Integer userTotal;
+
+    @Schema(description = "考试成绩)")
+    @TableField(exist = false)
+    private Double score;
+
+    @Schema(description = "是否合格)")
+    @TableField(exist = false)
+    private String isPass;
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date examTime;
+    @TableField(exist = false)
+    private Integer duration;
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainMaterial.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainMaterial.java
new file mode 100644
index 00000000..5d61d15f
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainMaterial.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+
+/**
+ * 培训教材表
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-22
+ */
+
+@Data
+@TableName("t_train_material")
+@Schema(description = "培训教材类")
+public class TTrainMaterial extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "排序", example = "1")
+    private Integer orders;
+
+    @Schema(description = "课件id", example = "1")
+    private Long coursewareId;
+
+    @Schema(description = "培训编码", example = "dsdssKDSDFDS0DSC2")
+    private String teachCode;
+
+    @Schema(description = "培训id", example = "1")
+    private Long trainId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainRecord.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainRecord.java
new file mode 100644
index 00000000..15039d47
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainRecord.java
@@ -0,0 +1,104 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+/**
+ * 培训记录表
+ *
+ * @author admin
+ * @since 1.0.0 2024-05-03
+ */
+
+@Data
+@TableName("t_train_record")
+public class TTrainRecord extends BaseDO{
+	/**
+	* 主键
+	*/
+	@TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	/**
+	* 培训班名称（内容）
+	*/
+	private String name;
+	private String content;
+
+	@TableField(exist = false)
+	private String holdUnit;
+
+	@TableField(exist = false)
+	private String handAddress;
+
+	/**
+	* 培训id
+	*/
+	private Long trainId;
+
+	/**
+	* 开班时间
+	*/
+	private Date startTime;
+
+	@TableField(exist = false)
+	private Date startDate;
+
+	@TableField(exist = false)
+	private Date endDate;
+
+	/**
+	* 员工id
+	*/
+	private Long userId;
+
+	//员工姓名
+	private String userName;
+
+	@Schema(description = "考试成绩)")
+	@TableField(exist = false)
+	private Double score;
+
+	@TableField(exist = false)
+	private Double allScore;
+
+	@TableField(exist = false)
+	private Double passScore;
+
+	@Schema(description = "是否合格)")
+	@TableField(exist = false)
+	private String isPass;
+
+	@Schema(description = "试卷id)")
+	private Long paperInfoId;
+
+	@Schema(description = "是否是交卷)")
+	@TableField(exist = false)
+	private String isHand;
+
+	@TableField(exist = false)
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date createTimes;
+
+
+	//补考次数
+	@TableField(exist = false)
+	private String retakeCount;
+
+	//纠错次数
+	@TableField(exist = false)
+	private String correctCount;
+
+	@TableField(exist = false)
+	private String paperName;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainReport.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainReport.java
new file mode 100644
index 00000000..6d36704d
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainReport.java
@@ -0,0 +1,124 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+
+
+@Data
+@TableName("t_train_report")
+@Schema(description = "培训报告类")
+public class TTrainReport extends BaseDO{
+
+	@Schema(description = "主键")
+	@TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	@Schema(description = "培训表主键", example = "1")
+	private Long trainId;
+
+	@Schema(description = "培训班名称", example = "ddd")
+	@ExcelOut(name = "培训班名称", sort = 1, width = 20)
+	private String name;
+
+	private String code;
+
+	@Schema(description = "培训单位", example = "dfd")
+	private String holdUnit;
+
+	@Schema(description = "填表人", example = "dfd")
+	private String writeAuthor;
+
+	@Schema(description = "培训要求及达到的目的", example = "fdsd")
+	private String purpose;
+
+	@Schema(description = "培训内容", example = "fdf")
+	@ExcelOut(name = "培训内容", sort = 2, width = 20)
+	private String content;
+
+	@Schema(description = "学习人数", example = "1")
+	private Integer studentsum;
+
+	@Schema(description = "出勤率", example = "1")
+	private String attendance;
+
+	@Schema(description = "教师考核情况", example = "1")
+	private String examDetail;
+
+	@Schema(description = "办班形式 0:脱产  1：半脱产 2：业余", example = "1")
+	private Integer holdForm;
+
+	@TableField(exist = false)
+	private String holdForm0;
+
+	@TableField(exist = false)
+	private String holdForm1;
+
+	@TableField(exist = false)
+	private String holdForm2;
+
+	@Schema(description = "考核形式 0:笔试1:口试2:现场考核3：线上考核", example = "1")
+	private Integer examForm;
+
+	@TableField(exist = false)
+	private String examForm0;
+
+	@TableField(exist = false)
+	private String examForm1;
+
+	@TableField(exist = false)
+	private String examForm2;
+
+	@Schema(description = "及格人数", example = "1")
+	private Integer passSum;
+
+	@Schema(description = "不及格人数", example = "1")
+	private Integer failSum;
+
+	@Schema(description = "受训人员工作胜任率", example = "1")
+	private String competencyRate;
+
+	@Schema(description = "受训人员工作聘任率", example = "1")
+	private String appointmentRate;
+
+	@Schema(description = "教师名称", example = "dds")
+	private String teacherName;
+
+	@Schema(description = "教师学历", example = "xhue")
+	private String teacherEducation;
+
+	@Schema(description = "教师职称", example = "dsh")
+	private String jobTitle;
+
+	@Schema(description = "教师是否有备课笔记 0:有1:没有", example = "1")
+	private Integer isNote;
+
+	@Schema(description = "教学是否按计划完成 0:完成1:未完成", example = "1")
+	private Integer isFinishPlan;
+
+	@Schema(description = "教学水平 0:良好 1:差劲", example = "1")
+	private Integer teachLevel;
+
+	@Schema(description = "教学方法", example = "dfd")
+	private String teachMethod;
+
+	@Schema(description = "培训班效果评价1", example = "cdv")
+	private String evaluateOne;
+
+	@Schema(description = "培训班效果评价2", example = "dsd")
+	private String evaluateTwo;
+
+	@Schema(description = "培训班效果评价3", example = "dds")
+	private String evaluateThree;
+
+	@Schema(description = "是否达成目的 0:是1:否", example = "1")
+	private String isAchievePurpose;
+
+	@Schema(description = "pdf路径", example = "1")
+	@ExcelOut(name = "pdf路径", sort = 3, width = 20,isFileUrl = true)
+	private String fileUrl;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainTeacher.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainTeacher.java
new file mode 100644
index 00000000..18c22341
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainTeacher.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+
+/**
+ * 培训教师表
+ *
+ * @author admin
+ * @since 1.0.0 2024-05-01
+ */
+
+@Data
+@TableName("t_train_teacher")
+public class TTrainTeacher extends BaseDO{
+	/**
+	* 教师名称
+	*/
+	@TableId
+	private String teacherName;
+
+	/**
+	* 职称
+	*/
+	private String professional;
+
+	/**
+	* 学历
+	*/
+	private String educationalBackground;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainUser.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainUser.java
new file mode 100644
index 00000000..3a0e88e5
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TTrainUser.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+
+/**
+ * 培训人员表
+ *
+ * @author admin
+ * @since 1.0.0 2024-04-22
+ */
+
+@Data
+@TableName("t_train_user")
+@Schema(description = "培训人员类")
+public class TTrainUser extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "培训id", example = "1234")
+    private Long trainId;
+
+    @Schema(description = "培训id", example = "1234")
+    private Long paperInfoId;
+
+    @Schema(description = "用户名称", example = "admin")
+    private String username;
+
+    @Schema(description = "用户编码", example = "dufdufd0222")
+    private String usercode;
+
+    @Schema(description = "培训编码", example = "dfdsf02")
+    private String teachCode;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TViolation.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TViolation.java
new file mode 100644
index 00000000..33b424c3
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TViolation.java
@@ -0,0 +1,96 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 违章表(TViolation)表实体类
+ *
+ * @author makejava
+ * @since 2024-04-13 14:58:19
+ */
+@Data
+public class TViolation extends BaseDO {
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(
+            description = "违章标题",
+            example = "违章了"
+    )
+    @ExcelOut(name = "违章标题", sort = 1)
+    private String title;
+
+    @Schema(
+            description = "违章类别",
+            example = "1"
+    )
+    @ExcelOut(name = "违章类别", sort = 2)
+    private String type;
+
+    @Schema(
+            description = "违章人员",
+            example = "王"
+    )
+    @ExcelOut(name = "违章人员", sort = 3)
+    private String violator;
+
+    @Schema(
+            description = "备注说明",
+            example = "备注"
+    )
+    private String descr;
+
+    @Schema(
+            description = "违章编码",
+            example = "A02"
+    )
+    private String code;
+
+    @Schema(
+            description = "违章时间",
+            example = "2024-04-14 15:13:42"
+    )
+    @ExcelOut(name = "违章时间", sort = 5,width = 25,dateFormat = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date violationTime;
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date violationTimes;
+
+    @Schema(
+            description = "最后推送时间",
+            example = "2024-04-14 15:13:42"
+    )
+    private Date lastPushTime;
+
+    @Schema(
+            description = "预留字段",
+            example = "预留字段"
+    )
+    private String violationB;
+
+    @Schema(
+            description = "创建人",
+            example = "人员"
+    )
+    @ExcelOut(name = "创建人", sort = 4)
+    private String creator;
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TViolationImage.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TViolationImage.java
new file mode 100644
index 00000000..9daf5146
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TViolationImage.java
@@ -0,0 +1,68 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@TableName("t_violation_image")
+@Data
+@Schema(description = "违章图片类")
+public class TViolationImage extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId
+    private String id;
+
+    @Schema(
+            description = "文件名称",
+            example = "test.doc"
+    )
+    @TableField("fileName")
+    private String name;
+
+    @Schema(
+            description = "文件地址",
+            example = "/d/test"
+    )
+    private String fileUrl;
+
+    @Schema(
+            description = "文件大小",
+            example = "20KB"
+    )
+    private String fileSize;
+
+    @Schema(
+            description = "文件排序",
+            example = "1"
+    )
+    private int sort;
+
+    @Schema(
+            description = "违章编码",
+            example = "a01"
+    )
+    private String violationCode;
+
+    @Schema(
+            description = "预留字段",
+            example = "a01"
+    )
+    private String violationImageA;
+
+    @Schema(
+            description = "创建人",
+            example = "a01"
+    )
+    private String creator;
+
+    @Schema(
+            description = "关联违章id",
+            example = "1"
+    )
+    private Long violationId;
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/UserInfo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/UserInfo.java
new file mode 100644
index 00000000..c21776bf
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/UserInfo.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.knowledge.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+@TableName("USER_INFO")
+@Data
+@Schema(description = "用户类")
+public class UserInfo extends BaseDO {
+
+    @Schema(description = "主键")
+    @TableId
+    private Integer id;
+
+    @Schema(
+            description = "用户名称",
+            example = "ysnnuan"
+    )
+    private String username;
+
+    @Schema(
+            description = "密码",
+            example = "ysnnuan"
+    )
+    private String password;
+
+    @Schema(
+            description = "密码",
+            example = "18"
+    )
+    private Integer age;
+
+    @Schema(
+            description = "密码",
+            example = "13057910639"
+    )
+    private String mobile;
+
+    @Schema(
+            description = "性别",
+            example = "1"
+    )
+    private Byte sex;
+
+    @Schema(
+            description = "生日",
+            example = "2024-03-05"
+    )
+    private Date birthday;
+
+}
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TArchivesMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TArchivesMapper.java
new file mode 100644
index 00000000..b9b239d3
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TArchivesMapper.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.knowledge.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
+import cn.iocoder.yudao.module.knowledge.entity.TArchives;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 档案表(TArchives)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-04-11 10:25:58
+ */
+@Mapper
+public interface TArchivesMapper extends BaseMapper<TArchives> {
+    IPage<TArchives> selectTArchivesList(Page page, @Param("param") TArchivesRequest tArchives);
+    IPage<TArchives> selectTArchivesListOfName(Page page, @Param("param") TArchivesRequest tArchives);
+    List<TArchives> findAllDoc(@Param("param") TArchivesRequest tArchives);
+    List<TArchives> getParByCode( @Param("code") String code);
+
+    List<TArchives> selectByCondition(@Param("param") TArchives tArchives);
+    TArchives selectByCode(@Param("code") String code);
+    List<TArchives> selectOneByCode(@Param("code") String code);
+
+    List<TArchives> selectByArchivId(@Param("parentId") Long parentId);
+    TArchives selectByArchivParentId(@Param("parentId") Long parentId);
+
+    TArchives selectOnleByCondition(@Param("param") TArchivesRequest tArchivesRequest);
+    TArchives selectOneByCondition(@Param("param") TArchivesRequest tArchivesRequest);
+
+    TArchives getParentId(Long id);
+
+    TArchives selectOnleByConditionDir(@Param("param") TArchivesRequest tArchivesRequest);
+
+    List<TArchives> findAllDocList(Page<TArchives> page, @Param("param") TArchivesRequest tArchives);
+
+    IPage<TArchives> appFindByParentId(Page<TArchives> page,@Param("param") TArchivesRequest tArchives);
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TFileInfoMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TFileInfoMapper.java
new file mode 100644
index 00000000..6bc0e501
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TFileInfoMapper.java
@@ -0,0 +1,12 @@
+package cn.iocoder.yudao.module.knowledge.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TFileInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+
+@Mapper
+public interface TFileInfoMapper extends BaseMapper<TFileInfo> {
+    TFileInfo selectByPlanId(@Param("id") Long id);
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsMapper.java
new file mode 100644
index 00000000..ae6a1f01
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsMapper.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.knowledge.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TLawsRequest;
+import cn.iocoder.yudao.module.knowledge.entity.TLaws;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 法律法规表(TLaws)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-04-12 10:31:34
+ */
+@Mapper
+public interface TLawsMapper extends BaseMapper<TLaws> {
+    IPage<TLaws> getListPage(Page<TLaws> page, @Param("dto") TLawsRequest tLaws);
+    IPage<TLaws> selectForApp(Page<TLaws> page, @Param("dto") TLawsRequest tLaws);
+
+    List<TLaws> getListPage( @Param("dto") TLawsRequest tLaws);
+
+    int updateByLawId(@Param("dto")TLawsRequest tLaws);
+
+    int deleteByIds(@Param("id") long id);
+
+    int filling(@Param("id") long id);
+
+    int judgeIsFilling(@Param("id") long id);
+
+
+    IPage<TLaws> findAllDocuments(Page<TLaws> page, @Param("dto") TLawsRequest tLaws);
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsRecordMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsRecordMapper.java
new file mode 100644
index 00000000..e1302570
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsRecordMapper.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.knowledge.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TLawsRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface TLawsRecordMapper extends BaseMapper<TLawsRecord> {
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkExecutionMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkExecutionMapper.java
new file mode 100644
index 00000000..6bf19011
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkExecutionMapper.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.knowledge.mapper;
+
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.MonitorRequestPage;
+import cn.iocoder.yudao.module.knowledge.entity.RfeuTaskContent;
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFrameworkExecution;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @packageName:com.chalco.zlzn.server.providerknowledge.dao
+ * @className:TOperaDocMapper
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/19 15:19
+ **/
+@Mapper
+public interface TRegulatoryFrameworkExecutionMapper extends BaseMapper<TRegulatoryFrameworkExecution> {
+
+
+    IPage<TRegulatoryFrameworkExecution> selectPageMonitor(Page page, @Param("monitorRequestPage") MonitorRequestPage monitorRequestPage);
+    IPage<TRegulatoryFrameworkExecution> findTask(Page page, @Param("monitorRequestPage") MonitorRequestPage monitorRequestPage);
+
+    List<TRegulatoryFrameworkExecution> selectPageMonitor(@Param("monitorRequestPage") MonitorRequestPage monitorRequestPage);
+    List<RfeuTaskContent> findOwn(@Param("executionId")Long executionId, @Param("userId") Long userId);
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkMapper.java
new file mode 100644
index 00000000..6d40406d
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkMapper.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.knowledge.mapper;
+
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TRegulatoryFrameworkRequest;
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 规章制度表(TRegulatoryFramework)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-04-12 17:36:32
+ */
+@Mapper
+public interface TRegulatoryFrameworkMapper extends BaseMapper<TRegulatoryFramework> {
+    IPage<TRegulatoryFramework> getListPage(Page<TRegulatoryFramework> page, @Param("dto") TRegulatoryFrameworkRequest tLaws);
+    IPage<TRegulatoryFramework> selectForApp(Page<TRegulatoryFramework> page, @Param("dto") TRegulatoryFrameworkRequest tLaws);
+
+    List<TRegulatoryFramework> getListPage(@Param("dto") TRegulatoryFrameworkRequest dto);
+
+    int updateByLawId(@Param("dto")TRegulatoryFrameworkRequest tLaws);
+
+    int deleteByIds(@Param("id") long id);
+
+    int filling(@Param("id") long id);
+
+    int judgeIsFilling(@Param("id") long id);
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkRecordMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkRecordMapper.java
new file mode 100644
index 00000000..379d1bf5
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkRecordMapper.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.knowledge.mapper;
+
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFrameworkRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface TRegulatoryFrameworkRecordMapper extends BaseMapper<TRegulatoryFrameworkRecord> {
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationImageMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationImageMapper.java
new file mode 100644
index 00000000..3fb638a5
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationImageMapper.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.knowledge.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+@Mapper
+public interface TViolationImageMapper extends BaseMapper<TViolationImage> {
+
+    List<TViolationImage> selectByViolationId(@Param("id") long id);
+    List<TViolationImage> findOneForApp(@Param("id") long id);
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationMapper.java
new file mode 100644
index 00000000..1f5352d2
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationMapper.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.knowledge.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TViolationRequest;
+import cn.iocoder.yudao.module.knowledge.entity.TViolation;
+import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 违章表(TViolation)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-04-13 14:58:19
+ */
+@Mapper
+public interface TViolationMapper extends BaseMapper<TViolation> {
+
+    IPage<TViolation> getListPage(Page<TViolation> page, @Param("dto") TViolationRequest dto);
+
+    IPage<TViolation> appFindAll(Page<TViolation> page, @Param("dto") TViolationRequest dto);
+
+    List<TViolation> getListPage( @Param("dto") TViolationRequest dto);
+
+    int saveRelatedImgInfo(@Param("paramList")List<TViolationImage> paramList);
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/ConvertToMultipartFile.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/ConvertToMultipartFile.java
new file mode 100644
index 00000000..3454a9b5
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/ConvertToMultipartFile.java
@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.knowledge.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+
+public class ConvertToMultipartFile implements MultipartFile {
+    private byte[] fileBytes;
+    String name;
+    String originalFilename;
+    String contentType;
+    boolean isEmpty;
+    long size;
+
+    public ConvertToMultipartFile(byte[] fileBytes, String name, String originalFilename, String contentType,
+                          long size) {
+        this.fileBytes = fileBytes;
+        this.name = name;
+        this.originalFilename = originalFilename;
+        this.contentType = contentType;
+        this.size = size;
+        this.isEmpty = false;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getOriginalFilename() {
+        return originalFilename;
+    }
+
+    @Override
+    public String getContentType() {
+        return contentType;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return isEmpty;
+    }
+
+    @Override
+    public long getSize() {
+        return size;
+    }
+
+    @Override
+    public byte[] getBytes() throws IOException {
+        return fileBytes;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return new ByteArrayInputStream(fileBytes);
+    }
+
+    @Override
+    public void transferTo(File dest) throws IOException, IllegalStateException {
+        new FileOutputStream(dest).write(fileBytes);
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TArchivesService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TArchivesService.java
new file mode 100644
index 00000000..a4987011
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TArchivesService.java
@@ -0,0 +1,514 @@
+package cn.iocoder.yudao.module.knowledge.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.iocoder.yudao.module.knowledge.constants.CodeEnum;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
+import cn.iocoder.yudao.module.knowledge.mapper.TArchivesMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TArchives;
+import cn.iocoder.yudao.module.knowledge.utils.FileTypeUtils;
+import cn.iocoder.yudao.module.knowledge.utils.MimeTypeUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
+
+/**
+ * 档案表(TArchives)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-04-11 10:25:58
+ */
+@Service
+public class TArchivesService extends ServiceImpl<TArchivesMapper, TArchives> {
+
+    @Autowired
+    private TArchivesMapper tArchivesMapper;
+
+    public Result add(TArchivesRequest tArchivesRequest) throws Exception {
+
+        //去重
+        if (ObjectUtils.isEmpty(tArchivesRequest.getArchiveType())){
+            if (ObjectUtils.isEmpty(tArchivesRequest.getCurFilename())){
+                tArchivesRequest.setCurFilename(tArchivesRequest.getOriginalFilename());
+            }
+            TArchives tArchives1 = new TArchives();
+            if (ObjectUtils.isEmpty(tArchivesRequest.getParentId())){
+                tArchives1 = tArchivesMapper.selectOnleByConditionDir(tArchivesRequest);
+            }else {
+                tArchives1 = tArchivesMapper.selectOnleByCondition(tArchivesRequest);
+            }
+            if (ObjectUtils.isNotEmpty(tArchives1)){
+                return  Result.error(25000,"文件名重复");
+            }
+        }
+        //不归档
+        if (StringUtils.isNotEmpty(tArchivesRequest.getArchiveType()) && "0".equals(tArchivesRequest.getArchiveType())){
+            TArchives tArchives = tArchivesMapper.selectOnleByCondition(tArchivesRequest);
+            if (ObjectUtils.isNotEmpty(tArchives)){
+                tArchives.setOriginalFilename(tArchivesRequest.getOriginalFilename());
+                tArchives.setFileSize(tArchivesRequest.getFileSize());
+                tArchives.setFileUrl(tArchivesRequest.getFileUrl());
+                return Result.success(tArchivesMapper.updateById(tArchives));
+            }
+        }
+        //归档
+        if (StringUtils.isNotEmpty(tArchivesRequest.getArchiveType()) && "1".equals(tArchivesRequest.getArchiveType())){
+            return Result.success(archivist(tArchivesRequest));
+        }
+        //用户信息
+        tArchivesRequest.setCreator(getLoginUserNickname());
+        tArchivesRequest.setCreatorId(getLoginUserId().toString());
+        //保存数据
+        TArchives tArchives = new TArchives();
+        if (ObjectUtils.isNotEmpty(tArchivesRequest.getFileInfo())){
+            tArchives.setFileSize(Long.parseLong(tArchivesRequest.getFileInfo().getFileSize()));
+            tArchives.setFileUrl(tArchivesRequest.getFileInfo().getFileUrl());
+        }
+        BeanUtils.copyProperties(tArchivesRequest, tArchives);
+        //文件类型
+        if (StringUtils.isNotEmpty(tArchivesRequest.getFileUrl())) {
+            tArchives.setIsDir(1);
+            //图片
+            if (ArrayUtils.contains(MimeTypeUtils.IMAGE_EXTENSION, FileTypeUtils.getFileType(tArchivesRequest.getOriginalFilename()))) {
+                tArchives.setType("1");
+            }
+            //视频
+            if (ArrayUtils.contains(MimeTypeUtils.VIDEO_EXTENSION, FileTypeUtils.getFileType(tArchivesRequest.getOriginalFilename()))) {
+                tArchives.setType("2");
+            }
+            //文档
+            if (ArrayUtils.contains(MimeTypeUtils.FLASH_FILE, FileTypeUtils.getFileType(tArchivesRequest.getOriginalFilename()))) {
+                tArchives.setType("3");
+            }
+            //音频
+            if (ArrayUtils.contains(MimeTypeUtils.FLASH_SANG, FileTypeUtils.getFileType(tArchivesRequest.getOriginalFilename()))) {
+                tArchives.setType("4");
+            }
+            //加文件大小
+            TArchives parById = getById(tArchives.getParentId());
+            if (ObjectUtils.isNotEmpty(parById)){
+                Long fileSize = parById.getFileSize();
+                fileSize = fileSize + tArchives.getFileSize();
+                resuceAd(parById,fileSize);
+            }
+
+        } else {
+            tArchives.setIsDir(0);
+        }
+        boolean save = save(tArchives);
+        //处理文件code
+        if (ObjectUtils.isNotEmpty(tArchives.getParentId())) {
+            TArchives parentObj = getById(tArchives.getParentId());
+            tArchives.setCode(parentObj.getCode() + tArchives.getId() + "|");
+        } else {
+            tArchives.setCode(tArchives.getId() + "|");
+        }
+        updateById(tArchives);
+        if (tArchives.getIsDir() == 1) {
+            List<TArchives> list = baseMapper.getParByCode(tArchivesRequest.getCode());
+            for (TArchives archives : list) {
+                archives.setFileSize(archives.getFileSize() + tArchivesRequest.getFileSize());
+            }
+            updateBatchById(list);
+        }
+        return Result.success(save);
+    }
+
+    //归档
+    public  boolean archivist(TArchivesRequest tArchivesRequest) {
+        boolean flag = false;
+        //获取当前年份
+        Date date = new Date();  // 获取当前时间的Date实例
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");  // 定义日期格式
+        String year = sdf.format(date);  // 格式化日期
+        //查询归档文件夹
+        TArchives tArchives = tArchivesMapper.selectByArchivParentId(tArchivesRequest.getParentId());
+        //查询是否存在当年的文件夹
+        List<TArchives> list = tArchivesMapper.selectByArchivId(tArchivesRequest.getParentId());
+        //如果不存在，创建当年的文件夹进行归档
+        if (CollectionUtils.isEmpty(list)){
+            tArchivesRequest.setPigeonholeId(tArchives.getId());
+            pigeonhole(tArchivesRequest,year);
+        }else {
+            for (TArchives archives : list) {
+                //如果存在当年文件夹
+                if (year.equals(archives.getCurFilename())){
+                    //重名就替换
+                    tArchivesRequest.setParentId(archives.getId());
+                    TArchives one = tArchivesMapper.selectOneByCondition(tArchivesRequest);
+                    if (ObjectUtils.isNotEmpty(one)){
+                        Long id = one.getId();
+                        tArchivesMapper.deleteById(id);
+                    }
+                    //添加归档文件
+                    TArchives archives1 = new TArchives();
+                    BeanUtils.copyProperties(tArchivesRequest, archives1);
+                    archives1.setIsDir(1);
+                    archives1.setParentId(archives.getId());
+                    archives1.setType("3");
+                    //加文件大小
+                    TArchives parById = getById(archives1.getParentId());
+                    Long fileSize = parById.getFileSize();
+                    fileSize = fileSize + archives1.getFileSize();
+                    resuceAd(parById,fileSize);
+                    save(archives1);
+                    //处理文件code
+                    if (ObjectUtils.isNotEmpty(archives1.getParentId())) {
+                        TArchives parentObj = getById(archives1.getParentId());
+                        archives1.setCode(parentObj.getCode() + archives1.getId() + "|");
+                    } else {
+                        archives1.setCode(archives1.getId() + "|");
+                    }
+                    updateById(archives1);
+                    if (archives1.getIsDir() == 1) {
+                        List<TArchives> lists = baseMapper.getParByCode(tArchivesRequest.getCode());
+                        for (TArchives archivess : lists) {
+                            archivess.setFileSize(archivess.getFileSize() + tArchivesRequest.getFileSize());
+                        }
+                        updateBatchById(lists);
+                    }
+                    return true;
+                }else {
+                    tArchivesRequest.setPigeonholeId(tArchives.getId());
+                    pigeonhole(tArchivesRequest,year);
+                }
+            }
+        }
+        return flag;
+    }
+
+    public boolean pigeonhole(TArchivesRequest tArchivesRequest,String year){
+
+        //重名就替换
+        TArchives one = tArchivesMapper.selectOneByCondition(tArchivesRequest);
+        if (ObjectUtils.isNotEmpty(one)){
+            Long id = one.getId();
+            tArchivesMapper.deleteById(id);
+        }
+        TArchives archives = new TArchives();
+        archives.setParentId(tArchivesRequest.getPigeonholeId());
+        archives.setCurFilename(year);
+        archives.setIsDir(0);
+        archives.setType("0");
+        save(archives);
+        //处理文件code
+        if (ObjectUtils.isNotEmpty(archives.getParentId())) {
+            TArchives parentObj = getById(archives.getParentId());
+            archives.setCode(parentObj.getCode() + archives.getId() + "|");
+        } else {
+            archives.setCode(archives.getId() + "|");
+        }
+        updateById(archives);
+        //添加归档文件
+        TArchives archives1 = new TArchives();
+        BeanUtils.copyProperties(tArchivesRequest, archives1);
+        archives1.setIsDir(1);
+        archives1.setParentId(archives.getId());
+        archives1.setType("3");
+        //加文件大小
+        TArchives parById = getById(archives1.getParentId());
+        if (ObjectUtils.isNotEmpty(parById)){
+            Long fileSize = parById.getFileSize();
+            fileSize = fileSize + archives1.getFileSize();
+            resuceAd(parById,fileSize);
+            save(archives1);
+        }
+        //处理文件code
+        if (ObjectUtils.isNotEmpty(archives1.getParentId())) {
+            TArchives parentObj = getById(archives1.getParentId());
+            archives1.setCode(parentObj.getCode() + archives1.getId() + "|");
+        } else {
+            archives1.setCode(archives1.getId() + "|");
+        }
+        updateById(archives1);
+        if (archives1.getIsDir() == 1) {
+            List<TArchives> lists = baseMapper.getParByCode(tArchivesRequest.getCode());
+            for (TArchives archivess : lists) {
+                archivess.setFileSize(archivess.getFileSize() + tArchivesRequest.getFileSize());
+            }
+            updateBatchById(lists);
+        }
+        return true;
+    }
+
+    public IPage findAll(Page<TArchives> page, TArchivesRequest tArchives) {
+        IPage<TArchives> page1;
+        if (StringUtils.isEmpty(tArchives.getOriginalFilename())){
+            page1 = baseMapper.selectTArchivesList(page, tArchives);
+        }else{
+            String code="";
+            //根据parid获取code
+            if (ObjectUtil.isNotEmpty(tArchives.getParentId())){
+                TArchives tArchives1 = this.getById(tArchives.getParentId());
+                code= tArchives1.getCode();
+            }
+            tArchives.setCode(code);
+            page1 = baseMapper.selectTArchivesListOfName(page, tArchives);
+        }
+        return page1;
+    }
+
+    public IPage appFindAll(Page<TArchives> page, TArchivesRequest tArchives) {
+        IPage<TArchives> page1;
+        if (StringUtils.isEmpty(tArchives.getOriginalFilename())){
+            page1 = baseMapper.selectTArchivesList(page, tArchives);
+        }else{
+            String code="";
+            //根据parid获取code
+            if (ObjectUtil.isNotEmpty(tArchives.getParentId())){
+                TArchives tArchives1 = this.getById(tArchives.getParentId());
+                code= tArchives1.getCode();
+            }
+            tArchives.setCode(code);
+            page1 = baseMapper.selectTArchivesListOfName(page, tArchives);
+        }
+        return page1;
+    }
+
+    public Result updateByTaId(TArchives tArchives) {
+        boolean flag = false;
+        //当前目录下去重
+        List<TArchives> list = tArchivesMapper.selectByCondition(tArchives);
+        if (CollectionUtils.isEmpty(list) || list.size() < 1) {
+            //判断是否修改了文件名称
+            String originalFilename = getById(tArchives.getId()).getOriginalFilename();
+            if (StringUtils.isNotEmpty(originalFilename) && !originalFilename.equals(tArchives.getCurFilename())) {
+                tArchives.setOriginalFilename(tArchives.getCurFilename());
+            }
+            return Result.success(updateById(tArchives));
+        } else {
+            return Result.error(CodeEnum.DB_FAILD.getCode(), CodeEnum.DB_FAILD.getMsg());
+        }
+    }
+
+
+    public Result delete(List<Long> ids) throws Exception {
+        if (ObjectUtils.isEmpty(ids)){
+            return Result.error(25323,"请先选择要删除的文件");
+        }
+        int flag = 0;
+        for (Long id : ids) {
+            TArchives tArchives = getById(id);
+            if (tArchives.getId()==105 || tArchives.getId() ==106 || tArchives.getId()==193 ||
+                    tArchives.getId()==10653 || tArchives.getId()==10963 || tArchives.getId()==10655 ||
+                    tArchives.getId()==10966 || tArchives.getId()==10969 || tArchives.getId()==10967 ||
+                    tArchives.getId()==154L ||tArchives.getId()==11004L || tArchives.getId()==11033L || tArchives.getId()==11034L){
+                return Result.error(25000,"该类文件不能删除");
+            }
+            LambdaUpdateWrapper<TArchives> wrapper =new LambdaUpdateWrapper<>();
+            wrapper.likeRight(TArchives::getCode,tArchives.getCode()).set(TArchives::getIsRecycled,0);
+            flag = tArchivesMapper.update(wrapper);
+            //减文件大小
+            TArchives parById = getById(tArchives.getParentId());
+            if(ObjectUtils.isNotEmpty(parById)){
+                Long fileSize = parById.getFileSize();
+                fileSize = fileSize - tArchives.getFileSize();
+                resuceRe(parById,fileSize);
+            }
+        }
+        return Result.success(flag);
+    }
+
+    public List<TArchives> selectOneById(Long id) {
+        ArrayList<TArchives> finalList = new ArrayList<>();
+        String fileCode ="";
+        if(ObjectUtil.isNotEmpty(id)){
+            TArchives byId = this.getById(id);
+            fileCode = byId.getCode();
+        }
+
+        List<TArchives> tArchives = tArchivesMapper.selectOneByCode(fileCode);
+        finalList.addAll(tArchives);
+        return finalList;
+    }
+
+    public List<TArchives> selectOneByIds(List<Long> ids) {
+
+        if (ObjectUtils.isEmpty(ids)){
+            return new ArrayList<TArchives>();
+        }
+        String fileCode ="";
+        List<TArchives> finalList = new ArrayList<>();
+
+        for (Long id : ids) {
+            if(ObjectUtil.isNotEmpty(id)){
+                TArchives byId = this.getById(id);
+                if (byId.getIsDir()==0){
+                    List<TArchives> tempListDir = new ArrayList<>();
+                    fileCode = byId.getCode();
+                    tempListDir = tArchivesMapper.selectOneByCode(fileCode);
+                    finalList.addAll(tempListDir);
+                }else {
+                    List<TArchives> tempListDoc = new ArrayList<>();
+                    TArchives tArchives = this.getById(id);
+                    tempListDoc.add(tArchives);
+                    finalList.addAll(tempListDoc);
+                }
+            }
+        }
+
+        return finalList;
+    }
+
+    public Result ackDelete(List<Long> ids) {
+
+        if (ObjectUtils.isEmpty(ids)){
+            return  Result.success();
+        }
+        //计算文件大小
+        for (Long id : ids) {
+            TArchives byId = getById(id);
+            if (ObjectUtils.isNotEmpty(byId.getParentId())) {
+                TArchives parById = getById(byId.getParentId());
+                Long fileSize = parById.getFileSize();
+                fileSize = fileSize - byId.getFileSize();
+                parById.setFileSize(fileSize);
+                updateById(parById);
+            }
+        }
+        //更新文件编码
+        int flag = 0;
+        for (Long id : ids) {
+            TArchives tArchives = getById(id);
+            LambdaUpdateWrapper<TArchives> query = new LambdaUpdateWrapper<>();
+            query.likeRight(TArchives::getCode, tArchives.getCode()).set(TArchives::getDeleted, 1);
+            flag = tArchivesMapper.update(query);
+        }
+
+        return Result.success(flag);
+    }
+
+    public TArchives selectByCode(String code) {
+        return tArchivesMapper.selectByCode(code);
+    }
+
+    public Result restore(List<Long> ids) {
+        int flag = 0;
+        for (Long id : ids) {
+            TArchives tArchives = getById(id);
+            LambdaUpdateWrapper<TArchives> wrapper =new LambdaUpdateWrapper<>();
+            wrapper.likeRight(TArchives::getCode,tArchives.getCode()).set(TArchives::getIsRecycled,1);
+            flag = tArchivesMapper.update(wrapper);
+            //加文件大小
+            TArchives parById = getById(tArchives.getParentId());
+            if (ObjectUtils.isNotEmpty(parById)){
+                Long fileSize = parById.getFileSize();
+                fileSize = fileSize + tArchives.getFileSize();
+                resuceAd(parById,fileSize);
+            }
+
+        }
+        return Result.success(flag);
+    }
+
+    public Result move(TArchivesRequest tArchivesRequest) {
+        int flag = 0;
+        for (Long id : tArchivesRequest.getIds()) {
+            TArchives tArchives = tArchivesMapper.selectById(id);
+            tArchives.setParentId(tArchivesRequest.getParentId());
+            flag = tArchivesMapper.updateById(tArchives);
+        }
+        return Result.success(flag);
+    }
+
+    /**
+     * 递归减文件大小
+     * @param tArchives
+     * @param fileSize
+     */
+    public void resuceRe(TArchives tArchives,Long fileSize){
+        tArchives.setFileSize(fileSize);
+        updateById(tArchives);
+        if (ObjectUtils.isNotEmpty(tArchives.getParentId())){
+            TArchives one = getById(tArchives.getParentId());
+            resuceRe(one,fileSize);
+        }
+    }
+
+    /**
+     * 递归加文件大小
+     * @param tArchives
+     * @param fileSize
+     */
+    public void resuceAd(TArchives tArchives,Long fileSize){
+        tArchives.setFileSize(fileSize);
+        updateById(tArchives);
+        if (ObjectUtils.isNotEmpty(tArchives.getParentId())){
+            TArchives one = getById(tArchives.getParentId());
+            resuceAd(one,fileSize);
+        }
+    }
+
+    public Result getParentId(Long id) {
+        TArchives tArchives = new TArchives();
+        if (ObjectUtils.isNotEmpty(id)){
+            tArchives = tArchivesMapper.getParentId(id);
+        }
+        /*if (ObjectUtils.isNotEmpty(tArchives.getParentId())){
+            tArchives = tArchivesMapper.getParentId(tArchives.getParentId());
+        }else {
+            tArchives.setId(null);
+        }*/
+        if (ObjectUtils.isEmpty(tArchives.getParentId())){
+            tArchives.setParentId(null);
+        }
+        return Result.success(tArchives);
+    }
+
+    public Result findAllDocList(Page<TArchives> page, TArchivesRequest tArchives) {
+        List<TArchives> allDocList = tArchivesMapper.findAllDocList(page, tArchives);
+        return Result.success(allDocList);
+    }
+
+    public List<TArchives> findAllDoc(TArchivesRequest tArchives) {
+//        String tokenStr = "&Authorization=Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZGVudGl0eUlkIjoxLCJkZXB0SWQiOjEsIm5pY2tuYW1lIjoiR2xvYmFsIFVzZXIiLCJ0ZW5hbnQtaWQiOjEsInVzZXJuYW1lIjoiR2xvYmFsIFVzZXIiLCJleHAiOjE5NzU2NTcyNzZ9.VuFK-ubqp54VwSL3O8yprt7lMWkc77jfSboxUXtRqQ4";
+
+        List<TArchives> result = baseMapper.findAllDoc(tArchives);
+//        result = result.stream()
+//                .peek(obj -> obj.setFileUrl(obj.getFileUrl() + tokenStr))
+//                .collect(Collectors.toList());
+        return result;
+    }
+
+    public void delByFileIdAndYear(TArchivesRequest tArchives) {
+        LambdaQueryWrapper<TArchives> queryWrapper1 =new LambdaQueryWrapper();
+        queryWrapper1.eq(TArchives::getParentId,tArchives.getParentId())
+                .eq(TArchives::getCurFilename,"归档");
+        TArchives guid = this.getOne(queryWrapper1);
+        LambdaQueryWrapper<TArchives> queryWrapper2 =new LambdaQueryWrapper();
+        queryWrapper2.eq(TArchives::getParentId,guid.getId())
+                .eq(TArchives::getCurFilename,tArchives.getYear());
+        TArchives one = this.getOne(queryWrapper2);
+        if (ObjectUtils.isNotEmpty(one)){
+            //删除此文件夹下的相关归档文件
+            LambdaQueryWrapper<TArchives> queryWrapper3=new LambdaQueryWrapper();
+            queryWrapper3.eq(TArchives::getParentId,one.getId())
+                    .eq(TArchives::getCurFilename,tArchives.getCurFilename());
+            this.remove(queryWrapper3);
+        }
+
+    }
+
+    public IPage<TArchives> appFindByParentId(Page<TArchives> page, TArchivesRequest tArchives) {
+        IPage<TArchives> tArchivesIPage = tArchivesMapper.appFindByParentId(page, tArchives);
+        return tArchivesIPage;
+    }
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TFileInfoService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TFileInfoService.java
new file mode 100644
index 00000000..5c0214b2
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TFileInfoService.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.knowledge.service;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.iocoder.yudao.module.knowledge.mapper.TFileInfoMapper;
+import cn.iocoder.yudao.module.knowledge.entity.*;
+import org.springframework.stereotype.Service;
+
+/**
+ * @packageName:cn.iocoder.yudao.module.knowledge.service
+ * @className:TOperaDocService
+ * @Description:
+ * @author:韩维杰
+ * @date 2024/4/19 15:22
+ **/
+
+@Service
+public class TFileInfoService extends ServiceImpl<TFileInfoMapper, TFileInfo> {
+
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsRecordService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsRecordService.java
new file mode 100644
index 00000000..3ff58d1e
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsRecordService.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.iocoder.yudao.module.knowledge.mapper.TLawsRecordMapper;
+
+import cn.iocoder.yudao.module.knowledge.entity.TLawsRecord;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TLawsRecordService extends ServiceImpl<TLawsRecordMapper, TLawsRecord> {
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsService.java
new file mode 100644
index 00000000..04d5af01
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsService.java
@@ -0,0 +1,435 @@
+package cn.iocoder.yudao.module.knowledge.service;
+
+import cn.hutool.core.date.DateUtil;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.knowledge.constants.CodeEnum;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TLawsRequest;
+import cn.iocoder.yudao.module.knowledge.mapper.TLawsMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TLaws;
+import cn.iocoder.yudao.module.knowledge.entity.TLawsRecord;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 法律法规表(TLaws)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-04-12 10:31:34
+ */
+@Service
+public class TLawsService extends ServiceImpl<TLawsMapper, TLaws> {
+    @Autowired
+    private TArchivesService tArchivesService;
+    @Autowired
+    private TLawsRecordService recordService;
+
+
+    public IPage select(Page<TLaws> page, TLawsRequest tLaws) {
+        tLaws.setCreateTimeStr(DateUtil.format(tLaws.getCreateTime(),"yyyy-MM-dd"));
+        return baseMapper.getListPage(page,tLaws);
+    }
+
+
+    public List<TLaws> selectForExport( TLawsRequest tLaws) {
+//        String tokenStr = "&Authorization=Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZGVudGl0eUlkIjoxLCJkZXB0SWQiOjEsIm5pY2tuYW1lIjoiR2xvYmFsIFVzZXIiLCJ0ZW5hbnQtaWQiOjEsInVzZXJuYW1lIjoiR2xvYmFsIFVzZXIiLCJleHAiOjE5NzU2NTcyNzZ9.VuFK-ubqp54VwSL3O8yprt7lMWkc77jfSboxUXtRqQ4";
+        //使用重载方法
+        List<TLaws> result = baseMapper.getListPage(tLaws);
+//        result = result.stream()
+//                .peek(obj -> obj.setFileUrl(obj.getFileUrl() + tokenStr))
+//                .collect(Collectors.toList());
+        return result;
+    }
+
+
+    public Result add(TLawsRequest tLaws) throws Exception {
+        LambdaQueryWrapper<TLaws> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(TLaws::getName,tLaws.getName()).last("limit 1");
+        TLaws old = this.getOne(queryWrapper);
+        //判断之前是否有相同名字的法律法规
+
+        if (old != null){
+            //判断版本号是否重复
+            if(old.getVersion().equals(tLaws.getVersion()))
+            {
+                throw new  RuntimeException("存在历史版本号");
+            }
+            //更新相同名字的记录
+            TLaws newLaws =new TLaws();
+            BeanUtils.copyProperties(tLaws,newLaws);
+            newLaws.setId(old.getId());
+            newLaws.setIsFiling(0);
+            baseMapper.updateById(newLaws);
+            if(old.getIsFiling()==0){
+                //之前未归档过归档过
+                //进行修改
+                // 将现存数据移至历史
+                TLawsRecord saveData =new TLawsRecord();
+                BeanUtils.copyProperties(old,saveData);
+                saveData.setLawsId(old.getId());
+                saveData.setFilingTime(new Date());
+                saveData.setId(null);
+                saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+                saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+                recordService.save(saveData);
+                // 通信法律法规文件夹
+                TArchivesRequest tArchivesRequest =new TArchivesRequest();
+                tArchivesRequest.setParentId(106L);
+                tArchivesRequest.setFileSize(old.getFileSize());
+                tArchivesRequest.setOriginalFilename(old.getFileName());
+                tArchivesRequest.setFileUrl(old.getFileUrl());
+                tArchivesRequest.setCurFilename(old.getName()+"_"+old.getVersion());
+                tArchivesRequest.setType("3");
+                tArchivesRequest.setArchiveType("1");
+                tArchivesService.add(tArchivesRequest);
+            }
+        }else {
+            //在历史库中查询版本号是否重复
+            LambdaQueryWrapper<TLawsRecord> queryWrapperHis = new LambdaQueryWrapper<>();
+            queryWrapperHis.eq(TLawsRecord::getName,tLaws.getName()).eq(TLawsRecord::getVersion,tLaws.getVersion());
+            long count = this.count(queryWrapper);
+            if (count>0){
+                throw new  RuntimeException("存在历史版本号");
+            }
+            //进行新增数据
+            TLaws data =new TLaws();
+            BeanUtils.copyProperties(tLaws,data);
+            data.setCode(generateRandomString());
+            data.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+            baseMapper.insert(data);
+        }
+//        // 通信法律法规文件夹
+//        TArchivesRequest tArchivesRequest =new TArchivesRequest();
+//        tArchivesRequest.setParentId(106L);
+//        tArchivesRequest.setFileSize(tLaws.getFileSize());
+//        tArchivesRequest.setOriginalFilename(tLaws.getFileName());
+//        tArchivesRequest.setFileUrl(tLaws.getFileUrl());
+//        tArchivesRequest.setCurFilename(tLaws.getName());
+//        tArchivesRequest.setType("3");
+//        tArchivesRequest.setArchiveType("0");
+//        tArchivesService.add(tArchivesRequest);
+        return Result.success();
+
+    }
+
+
+    public Result updateByTLId(TLawsRequest tLaws) throws Exception {
+        TLaws old = this.getById(tLaws.getId());
+        if (old != null){
+            //判断是否修改了文件名称
+            old.setFileName(tLaws.getFileName());
+            old.setFileSize(tLaws.getFileSize());
+            old.setFileUrl(tLaws.getFileUrl());
+            old.setDescribeInfo(tLaws.getDescribeInfo());
+            old.setType(tLaws.getType());
+            baseMapper.updateById(old);
+//            // 通信法律法规文件夹
+//            TArchivesRequest tArchivesRequest =new TArchivesRequest();
+//            tArchivesRequest.setParentId(106L);
+//            tArchivesRequest.setFileSize(old.getFileSize());
+//            tArchivesRequest.setOriginalFilename(old.getFileName());
+//            tArchivesRequest.setFileUrl(old.getFileUrl());
+//            tArchivesRequest.setCurFilename(old.getName());
+//            tArchivesRequest.setType("3");
+//            tArchivesRequest.setArchiveType("0");
+//            tArchivesService.add(tArchivesRequest);
+            return Result.success();
+        }else {
+            return Result.error(CodeEnum.TARCHIVES_SELECT_FAILED.getCode(),CodeEnum.TARCHIVES_SELECT_FAILED.getMsg());
+        }
+
+    }
+
+    public List<TLaws> history(TLawsRequest tLaws) {
+        LambdaQueryWrapper<TLaws> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TLaws::getName,tLaws.getName());
+        queryWrapper.eq(TLaws::getDeleted,"1");
+        queryWrapper.orderByDesc(TLaws::getCreateTime);
+
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void filing(long id) throws Exception {
+        // 归档操作
+        baseMapper.filling(id);
+        TLaws old = getById(id);
+        // 将现存数据移至历史
+        TLawsRecord saveData =new TLawsRecord();
+        BeanUtils.copyProperties(old,saveData);
+        saveData.setId(null);
+        saveData.setLawsId(old.getId());
+        saveData.setFilingTime(new Date());
+        saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+        saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+        recordService.save(saveData);
+        // 通信法律法规文件夹
+        TArchivesRequest tArchivesRequest =new TArchivesRequest();
+        tArchivesRequest.setParentId(106L);
+        tArchivesRequest.setFileSize(old.getFileSize());
+        tArchivesRequest.setOriginalFilename(old.getFileName());
+        tArchivesRequest.setFileUrl(old.getFileUrl());
+        tArchivesRequest.setCurFilename(old.getName()+"_"+old.getVersion());
+        tArchivesRequest.setType("3");
+        tArchivesRequest.setArchiveType("1");
+        tArchivesService.add(tArchivesRequest);
+    }
+
+
+    public void archiveFolder() {
+
+    }
+
+    public List<TLawsRecord> recordsQuery(TLawsRequest tLawsRequest) {
+        LambdaQueryWrapper<TLawsRecord> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TLawsRecord::getLawsId,tLawsRequest.getId()).orderByDesc(BaseDO::getCreateTime);
+        //记录查询
+        List<TLawsRecord> targetList = recordService.list(queryWrapper);
+        return targetList;
+    }
+
+    /**
+     * 逻辑删除数据
+     * @param ids
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Result delete(List<Long> ids) {
+        int flag = 0;
+        for (Long id : ids) {
+            LambdaQueryWrapper<TLawsRecord> queryWrapper =new LambdaQueryWrapper<>();
+            queryWrapper.eq(TLawsRecord::getLawsId,id);
+            //同步删除归档记录
+            List<TLawsRecord> records = recordService.list(queryWrapper);
+            for (TLawsRecord record : records) {
+                //同步删除档案管理中的文件
+                TArchivesRequest tArchivesRequest =new TArchivesRequest();
+                tArchivesRequest.setParentId(106L);
+                tArchivesRequest.setCurFilename(record.getName()+"_"+record.getVersion());
+                tArchivesRequest.setYear(DateUtil.format(record.getFilingTime(),"yyyy"));
+                tArchivesService.delByFileIdAndYear(tArchivesRequest);
+                recordService.removeById(record.getId());
+            }
+            baseMapper.deleteById(id);
+            flag++;
+        }
+        return Result.success(flag);
+    }
+
+    public boolean isFilling(long id){
+        if (baseMapper.judgeIsFilling(id) == 1){
+            //已经归档，不可预览
+            return true;
+        }else {
+            //未归档，可以预览
+            return false;
+        }
+
+
+    }
+
+
+    public static String generateRandomString() {
+        Random random = new Random();
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < 6; i++) {
+            int randomNumber = random.nextInt(10);
+            sb.append(randomNumber);
+        }
+
+        return sb.toString();
+    }
+
+    //===========app
+    public IPage selectForApp(Page<TLaws> page, TLawsRequest tLaws) throws ParseException {
+        tLaws.setCreateTimeStr(DateUtil.format(tLaws.getCreateTime(),"yyyy-MM-dd"));
+        IPage<TLaws> tLawsIPage = baseMapper.selectForApp(page, tLaws);
+        List<TLaws> records = tLawsIPage.getRecords();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        for (TLaws record : records) {
+            String format = simpleDateFormat.format(record.getCreateTime());
+            Date date = simpleDateFormat.parse(format);
+        }
+        return tLawsIPage;
+    }
+
+    public List<TLawsRecord> recordsQueryForApp(TLawsRequest tLawsRequest) {
+        LambdaQueryWrapper<TLawsRecord> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TLawsRecord::getLawsId,tLawsRequest.getId()).orderByDesc(BaseDO::getCreateTime);
+        //记录查询
+        List<TLawsRecord> targetList = recordService.list(queryWrapper);
+        return targetList;
+    }
+
+    public Result addForApp(TLawsRequest tLaws) throws Exception {
+        LambdaQueryWrapper<TLaws> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(TLaws::getName,tLaws.getName()).last("limit 1");
+        TLaws old = this.getOne(queryWrapper);
+        //判断之前是否有相同名字的法律法规
+
+        if (old != null){
+            //判断版本号是否重复
+            if(old.getVersion().equals(tLaws.getVersion()))
+            {
+                throw new  RuntimeException("存在历史版本号");
+            }
+            //更新相同名字的记录
+            TLaws newLaws =new TLaws();
+            BeanUtils.copyProperties(tLaws,newLaws);
+            newLaws.setId(old.getId());
+            newLaws.setIsFiling(0);
+            baseMapper.updateById(newLaws);
+            if(old.getIsFiling()==0){
+                //之前未归档过归档过
+                //进行修改
+                // 将现存数据移至历史
+                TLawsRecord saveData =new TLawsRecord();
+                BeanUtils.copyProperties(old,saveData);
+                saveData.setLawsId(old.getId());
+                saveData.setFilingTime(new Date());
+                saveData.setId(null);
+                saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+                saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+                recordService.save(saveData);
+                // 通信法律法规文件夹
+                TArchivesRequest tArchivesRequest =new TArchivesRequest();
+                tArchivesRequest.setParentId(106L);
+                tArchivesRequest.setFileSize(old.getFileSize());
+                tArchivesRequest.setOriginalFilename(old.getFileName());
+                tArchivesRequest.setFileUrl(old.getFileUrl());
+                tArchivesRequest.setCurFilename(old.getName()+"_"+old.getVersion());
+                tArchivesRequest.setType("3");
+                tArchivesRequest.setArchiveType("1");
+                tArchivesService.add(tArchivesRequest);
+            }
+        }else {
+            //在历史库中查询版本号是否重复
+            LambdaQueryWrapper<TLawsRecord> queryWrapperHis = new LambdaQueryWrapper<>();
+            queryWrapperHis.eq(TLawsRecord::getName,tLaws.getName()).eq(TLawsRecord::getVersion,tLaws.getVersion());
+            long count = this.count(queryWrapper);
+            if (count>0){
+                throw new  RuntimeException("存在历史版本号");
+            }
+            //进行新增数据
+            TLaws data =new TLaws();
+            BeanUtils.copyProperties(tLaws,data);
+            data.setCode(generateRandomString());
+            data.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+            baseMapper.insert(data);
+        }
+        // 通信法律法规文件夹
+        TArchivesRequest tArchivesRequest =new TArchivesRequest();
+        tArchivesRequest.setParentId(106L);
+        tArchivesRequest.setFileSize(tLaws.getFileSize());
+        tArchivesRequest.setOriginalFilename(tLaws.getFileName());
+        tArchivesRequest.setFileUrl(tLaws.getFileUrl());
+        tArchivesRequest.setCurFilename(tLaws.getName());
+        tArchivesRequest.setType("3");
+        tArchivesRequest.setArchiveType("0");
+        tArchivesService.add(tArchivesRequest);
+        return Result.success();
+
+    }
+
+
+    public Result updateByTLIdForApp(TLawsRequest tLaws) throws Exception {
+        TLaws old = this.getById(tLaws.getId());
+        if (old != null){
+            //判断是否修改了文件名称
+            old.setFileName(tLaws.getFileName());
+            old.setFileSize(tLaws.getFileSize());
+            old.setFileUrl(tLaws.getFileUrl());
+            old.setDescribeInfo(tLaws.getDescribeInfo());
+            baseMapper.updateById(old);
+            // 通信法律法规文件夹
+            TArchivesRequest tArchivesRequest =new TArchivesRequest();
+            tArchivesRequest.setParentId(106L);
+            tArchivesRequest.setFileSize(old.getFileSize());
+            tArchivesRequest.setOriginalFilename(old.getFileName());
+            tArchivesRequest.setFileUrl(old.getFileUrl());
+            tArchivesRequest.setCurFilename(old.getName());
+            tArchivesRequest.setType("3");
+            tArchivesRequest.setArchiveType("0");
+            tArchivesService.add(tArchivesRequest);
+            return Result.success();
+        }else {
+            return Result.error(CodeEnum.TARCHIVES_SELECT_FAILED.getCode(),CodeEnum.TARCHIVES_SELECT_FAILED.getMsg());
+        }
+
+    }
+
+    public List<TLaws> historyForApp(TLawsRequest tLaws) {
+        LambdaQueryWrapper<TLaws> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TLaws::getName,tLaws.getName());
+        queryWrapper.eq(TLaws::getDeleted,"1");
+        queryWrapper.orderByDesc(TLaws::getCreateTime);
+
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void filingForApp(long id) throws Exception {
+        // 归档操作
+        baseMapper.filling(id);
+        TLaws old = getById(id);
+        // 将现存数据移至历史
+        TLawsRecord saveData =new TLawsRecord();
+        BeanUtils.copyProperties(old,saveData);
+        saveData.setId(null);
+        saveData.setLawsId(old.getId());
+        saveData.setFilingTime(new Date());
+        saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+        saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+        recordService.save(saveData);
+        // 通信法律法规文件夹
+        TArchivesRequest tArchivesRequest =new TArchivesRequest();
+        tArchivesRequest.setParentId(106L);
+        tArchivesRequest.setFileSize(old.getFileSize());
+        tArchivesRequest.setOriginalFilename(old.getFileName());
+        tArchivesRequest.setFileUrl(old.getFileUrl());
+        tArchivesRequest.setCurFilename(old.getName()+"_"+old.getVersion());
+        tArchivesRequest.setType("3");
+        tArchivesRequest.setArchiveType("1");
+        tArchivesService.add(tArchivesRequest);
+    }
+
+
+    public void archiveFolderForApp() {
+
+        //todo 将所有的归档法律法规根据年限进行分组形成时间文件夹
+
+
+    }
+
+    /**
+     * 逻辑删除数据
+     * @param ids
+     */
+    public Result deleteForApp(List<Long> ids) {
+        int flag = 0;
+        for (Long id : ids) {
+            baseMapper.deleteById(id);
+            flag++;
+        }
+        return Result.success(flag);
+    }
+
+
+    public IPage findAllDocuments(Page<TLaws> page, TLawsRequest tLaws) {
+        IPage<TLaws> allDocuments = baseMapper.findAllDocuments(page, tLaws);
+        return allDocuments;
+    }
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkRecordsService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkRecordsService.java
new file mode 100644
index 00000000..0d775911
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkRecordsService.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.knowledge.service;
+
+import cn.iocoder.yudao.module.knowledge.mapper.TRegulatoryFrameworkRecordMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFrameworkRecord;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class TRegulatoryFrameworkRecordsService extends ServiceImpl<TRegulatoryFrameworkRecordMapper, TRegulatoryFrameworkRecord> {
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkService.java
new file mode 100644
index 00000000..150dd5b1
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkService.java
@@ -0,0 +1,407 @@
+package cn.iocoder.yudao.module.knowledge.service;
+
+import cn.hutool.core.date.DateUtil;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.knowledge.constants.CodeEnum;
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TRegulatoryFrameworkRequest;
+import cn.iocoder.yudao.module.knowledge.mapper.TRegulatoryFrameworkMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework;
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFrameworkRecord;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+;
+
+/**
+ * 规章制度表(TRegulatoryFramework)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-04-12 17:36:32
+ */
+@Service
+public class TRegulatoryFrameworkService extends ServiceImpl<TRegulatoryFrameworkMapper, TRegulatoryFramework> {
+
+    @Autowired
+    private TArchivesService tArchivesService;
+    @Autowired
+    private TRegulatoryFrameworkRecordsService recordService;
+
+
+    public IPage select(Page<TRegulatoryFramework> page, TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
+
+        return baseMapper.getListPage(page,regulatoryFrameworkRequest);
+    }
+
+    public List<TRegulatoryFramework> selectForExport(TRegulatoryFrameworkRequest dto) {
+        //使用重载方法
+        return baseMapper.getListPage(dto);
+    }
+
+
+    public Result add(TRegulatoryFrameworkRequest regulatoryFrameworkRequest)throws Exception {
+        LambdaQueryWrapper<TRegulatoryFramework> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(TRegulatoryFramework::getName,regulatoryFrameworkRequest.getName()).last("limit 1");
+        TRegulatoryFramework old = this.getOne(queryWrapper);
+        //判断之前是否有相同名字的规章制度
+
+        if (old != null){
+            //判断版本号是否重复
+            if(old.getVersion().equals(regulatoryFrameworkRequest.getVersion()))
+            {
+                throw new  RuntimeException("存在历史版本号");
+            }
+            //更新相同名字的记录
+            TRegulatoryFramework newRegulatoryFramework =new TRegulatoryFramework();
+            BeanUtils.copyProperties(regulatoryFrameworkRequest,newRegulatoryFramework);
+            newRegulatoryFramework.setId(old.getId());
+            baseMapper.updateById(newRegulatoryFramework);
+            if(old.getIsFiling()==0){
+                //之前未归档过归档过
+                //进行修改
+                // 将现存数据移至历史
+                TRegulatoryFrameworkRecord saveData =new TRegulatoryFrameworkRecord();
+                BeanUtils.copyProperties(old,saveData);
+                saveData.setLawsId(old.getId());
+                saveData.setFilingTime(new Date());
+                saveData.setId(null);
+                saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+                saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+                recordService.save(saveData);
+                noticeFolder(old,193l,"1");
+            }
+        }else {
+            //在历史库中查询版本号是否重复
+            LambdaQueryWrapper<TRegulatoryFrameworkRecord> queryWrapperHis = new LambdaQueryWrapper<>();
+            queryWrapperHis.eq(TRegulatoryFrameworkRecord::getName,regulatoryFrameworkRequest.getName()).eq(TRegulatoryFrameworkRecord::getVersion,regulatoryFrameworkRequest.getVersion());
+            long count = this.count(queryWrapper);
+            if (count>0){
+                throw new  RuntimeException("存在历史版本号");
+            }
+            //进行新增数据
+            TRegulatoryFramework data =new TRegulatoryFramework();
+            BeanUtils.copyProperties(regulatoryFrameworkRequest,data);
+            data.setCode(generateRandomString());
+            data.setIsFiling(0);
+            baseMapper.insert(data);
+           // noticeFolder(data,193l,"0");
+        }
+
+        return Result.success();
+
+    }
+
+
+    public Result updateByTLId(TRegulatoryFrameworkRequest regulatoryFrameworkRequest) throws Exception {
+        TRegulatoryFramework old = this.getById(regulatoryFrameworkRequest.getId());
+        if (old != null){
+            //判断是否修改了文件名称
+            old.setFileName(regulatoryFrameworkRequest.getFileName());
+            old.setFileSize(regulatoryFrameworkRequest.getFileSize());
+            old.setFileUrl(regulatoryFrameworkRequest.getFileUrl());
+            old.setDescribeInfo(regulatoryFrameworkRequest.getDescribeInfo());
+            old.setType(regulatoryFrameworkRequest.getType());
+            baseMapper.updateById(old);
+            //noticeFolder(old,193l,"0");
+            return Result.success();
+        }else {
+            return Result.error(CodeEnum.TARCHIVES_SELECT_FAILED.getCode(),CodeEnum.TARCHIVES_SELECT_FAILED.getMsg());
+        }
+
+    }
+
+    public List<TRegulatoryFramework> history(TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
+        LambdaQueryWrapper<TRegulatoryFramework> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TRegulatoryFramework::getName,regulatoryFrameworkRequest.getName());
+        queryWrapper.eq(TRegulatoryFramework::getDeleted,"1");
+        queryWrapper.orderByDesc(TRegulatoryFramework::getCreateTime);
+
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void filing(long id) throws Exception {
+        // 归档操作
+        baseMapper.filling(id);
+        TRegulatoryFramework old = getById(id);
+        // 将现存数据移至历史
+        TRegulatoryFrameworkRecord saveData =new TRegulatoryFrameworkRecord();
+        BeanUtils.copyProperties(old,saveData);
+        saveData.setId(null);
+        saveData.setLawsId(old.getId());
+        saveData.setFilingTime(new Date());
+        saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+        saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+        recordService.save(saveData);
+        noticeFolder(old,193l,"1");
+
+    }
+
+    public boolean isFilling(long id){
+        if (baseMapper.judgeIsFilling(id) == 1){
+            //已经归档，不可预览
+            return true;
+        }else {
+            //未归档，可以预览
+            return false;
+        }
+
+
+    }
+
+
+    public void archiveFolder() {
+
+        //todo 将所有的归档规章制度根据年限进行分组形成时间文件夹
+
+
+    }
+
+    public List<TRegulatoryFrameworkRecord> recordsQuery(TRegulatoryFrameworkRequest tLawsRequest) {
+        LambdaQueryWrapper<TRegulatoryFrameworkRecord> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TRegulatoryFrameworkRecord::getLawsId,tLawsRequest.getId()).orderByDesc(BaseDO::getCreateTime);
+        //记录查询
+        List<TRegulatoryFrameworkRecord> targetList = recordService.list(queryWrapper);
+        return targetList;
+    }
+
+    /**
+     * 逻辑删除数据
+     * @param ids
+     */
+    public Result delete(List<Long> ids) {
+        int flag = 0;
+        for (Long id : ids) {
+            LambdaQueryWrapper<TRegulatoryFrameworkRecord> queryWrapper =new LambdaQueryWrapper<>();
+            queryWrapper.eq(TRegulatoryFrameworkRecord::getLawsId,id);
+            //同步删除归档记录
+            List<TRegulatoryFrameworkRecord> records = recordService.list(queryWrapper);
+            for (TRegulatoryFrameworkRecord record : records) {
+                //同步删除档案管理中的文件
+                TArchivesRequest tArchivesRequest =new TArchivesRequest();
+                tArchivesRequest.setParentId(193l);
+                tArchivesRequest.setCurFilename(record.getName()+"_"+record.getVersion());
+                tArchivesRequest.setYear(DateUtil.format(record.getFilingTime(),"yyyy"));
+                tArchivesService.delByFileIdAndYear(tArchivesRequest);
+                recordService.removeById(record.getId());
+            }
+            baseMapper.deleteById(id);
+            flag++;
+        }
+        return Result.success(flag);
+    }
+
+
+    public static String generateRandomString() {
+        Random random = new Random();
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < 6; i++) {
+            int randomNumber = random.nextInt(10);
+            sb.append(randomNumber);
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * 通信违章图片文件夹
+     * @param target
+     * @param folderNum
+     * @param fileType
+     * @return
+     */
+    private boolean noticeFolder(TRegulatoryFramework target, long folderNum, String fileType) {
+        // 通信规章制度文件夹
+        TArchivesRequest tArchivesRequest = new TArchivesRequest();
+        tArchivesRequest.setParentId(folderNum);
+        tArchivesRequest.setFileSize(target.getFileSize());
+        tArchivesRequest.setOriginalFilename(target.getFileName());
+        tArchivesRequest.setFileUrl(target.getFileUrl());
+        tArchivesRequest.setCurFilename(target.getName() + "_" + target.getVersion());
+        tArchivesRequest.setType("3");
+        tArchivesRequest.setArchiveType(fileType);
+        try {
+            tArchivesService.add(tArchivesRequest);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
+    //=====app
+    public IPage selectForApp(Page<TRegulatoryFramework> page, TRegulatoryFrameworkRequest regulatoryFrameworkRequest) throws ParseException {
+
+        IPage<TRegulatoryFramework> tRegulatoryFrameworkIPage = baseMapper.selectForApp(page, regulatoryFrameworkRequest);
+        List<TRegulatoryFramework> records = tRegulatoryFrameworkIPage.getRecords();
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        for (TRegulatoryFramework record : records) {
+            String format = simpleDateFormat.format(record.getCreateTime());
+            Date date = simpleDateFormat.parse(format);
+
+        }
+        return tRegulatoryFrameworkIPage;
+    }
+
+    public List<TRegulatoryFramework> selectForExportForApp(TRegulatoryFrameworkRequest dto) {
+        //使用重载方法
+        return baseMapper.getListPage(dto);
+    }
+
+
+    public Result addForApp(TRegulatoryFrameworkRequest regulatoryFrameworkRequest)throws Exception {
+        LambdaQueryWrapper<TRegulatoryFramework> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(TRegulatoryFramework::getName,regulatoryFrameworkRequest.getName()).last("limit 1");
+        TRegulatoryFramework old = this.getOne(queryWrapper);
+        //判断之前是否有相同名字的规章制度
+
+        if (old != null){
+            //判断版本号是否重复
+            if(old.getVersion().equals(regulatoryFrameworkRequest.getVersion()))
+            {
+                throw new  RuntimeException("存在历史版本号");
+            }
+            //更新相同名字的记录
+            TRegulatoryFramework newRegulatoryFramework =new TRegulatoryFramework();
+            BeanUtils.copyProperties(regulatoryFrameworkRequest,newRegulatoryFramework);
+            newRegulatoryFramework.setId(old.getId());
+            baseMapper.updateById(newRegulatoryFramework);
+            if(old.getIsFiling()==0){
+                //之前未归档过归档过
+                //进行修改
+                // 将现存数据移至历史
+                TRegulatoryFrameworkRecord saveData = new TRegulatoryFrameworkRecord();
+                BeanUtils.copyProperties(old,saveData);
+                saveData.setLawsId(old.getId());
+                saveData.setFilingTime(new Date());
+                saveData.setId(null);
+                saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+                saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+                recordService.save(saveData);
+                noticeFolder(old,193l,"1");
+            }
+        }else {
+            //在历史库中查询版本号是否重复
+            LambdaQueryWrapper<TRegulatoryFrameworkRecord> queryWrapperHis = new LambdaQueryWrapper<>();
+            queryWrapperHis.eq(TRegulatoryFrameworkRecord::getName,regulatoryFrameworkRequest.getName()).eq(TRegulatoryFrameworkRecord::getVersion,regulatoryFrameworkRequest.getVersion());
+            long count = this.count(queryWrapper);
+            if (count>0){
+                throw new  RuntimeException("存在历史版本号");
+            }
+            //进行新增数据
+            TRegulatoryFramework data =new TRegulatoryFramework();
+            BeanUtils.copyProperties(regulatoryFrameworkRequest,data);
+            data.setCode(generateRandomString());
+            data.setIsFiling(0);
+            baseMapper.insert(data);
+           // noticeFolder(data,193l,"0");
+        }
+
+        return Result.success();
+
+    }
+
+
+    public Result updateByTLIdForApp(TRegulatoryFrameworkRequest regulatoryFrameworkRequest) throws Exception {
+        TRegulatoryFramework old = this.getById(regulatoryFrameworkRequest.getId());
+        if (old != null){
+            //判断是否修改了文件名称
+            old.setFileName(regulatoryFrameworkRequest.getFileName());
+            old.setFileSize(regulatoryFrameworkRequest.getFileSize());
+            old.setFileUrl(regulatoryFrameworkRequest.getFileUrl());
+            old.setDescribeInfo(regulatoryFrameworkRequest.getDescribeInfo());
+            baseMapper.updateById(old);
+           // noticeFolder(old,193l,"0");
+            return Result.success();
+        }else {
+            return Result.error(CodeEnum.TARCHIVES_SELECT_FAILED.getCode(),CodeEnum.TARCHIVES_SELECT_FAILED.getMsg());
+        }
+
+    }
+
+    public List<TRegulatoryFramework> historyForApp(TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
+        LambdaQueryWrapper<TRegulatoryFramework> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TRegulatoryFramework::getName,regulatoryFrameworkRequest.getName());
+        queryWrapper.eq(TRegulatoryFramework::getDeleted,"1");
+        queryWrapper.orderByDesc(TRegulatoryFramework::getCreateTime);
+
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void filingForApp(long id) throws Exception {
+        // 归档操作
+        baseMapper.filling(id);
+        TRegulatoryFramework old = getById(id);
+        // 将现存数据移至历史
+        TRegulatoryFrameworkRecord saveData = new TRegulatoryFrameworkRecord();
+        BeanUtils.copyProperties(old,saveData);
+        saveData.setId(null);
+        saveData.setLawsId(old.getId());
+        saveData.setFilingTime(new Date());
+        saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+        saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+        recordService.save(saveData);
+        noticeFolder(old,193l,"1");
+
+    }
+
+    public boolean isFillingForApp(long id){
+        if (baseMapper.judgeIsFilling(id) == 1){
+            //已经归档，不可预览
+            return true;
+        }else {
+            //未归档，可以预览
+            return false;
+        }
+
+
+    }
+
+
+    public void archiveFolderForApp() {
+
+        //todo 将所有的归档规章制度根据年限进行分组形成时间文件夹
+
+
+    }
+
+    public List<TRegulatoryFrameworkRecord> recordsQueryForApp(TRegulatoryFrameworkRequest tLawsRequest) {
+        LambdaQueryWrapper<TRegulatoryFrameworkRecord> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TRegulatoryFrameworkRecord::getLawsId,tLawsRequest.getId()).orderByDesc(BaseDO::getCreateTime);
+        //记录查询
+        List<TRegulatoryFrameworkRecord> targetList = recordService.list(queryWrapper);
+        return targetList;
+    }
+
+    /**
+     * 逻辑删除数据
+     * @param ids
+     */
+    public Result deleteForApp(List<Long> ids) {
+        int flag = 0;
+        for (Long id : ids) {
+            baseMapper.deleteById(id);
+            flag++;
+        }
+        return Result.success(flag);
+    }
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationImageService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationImageService.java
new file mode 100644
index 00000000..d0b00dec
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationImageService.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.module.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.iocoder.yudao.module.knowledge.mapper.TViolationImageMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TViolationImageService extends ServiceImpl<TViolationImageMapper, TViolationImage> {
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationService.java
new file mode 100644
index 00000000..9e737b05
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationService.java
@@ -0,0 +1,313 @@
+package cn.iocoder.yudao.module.knowledge.service;
+
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TViolationRequest;
+import cn.iocoder.yudao.module.knowledge.mapper.TViolationImageMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TViolation;
+import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
+import cn.iocoder.yudao.module.knowledge.mapper.TViolationMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.*;
+
+/**
+ * 违章表(TViolation)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-04-13 14:58:19
+ */
+@Service
+public class TViolationService extends ServiceImpl<TViolationMapper, TViolation> {
+    //    @Transactional(rollbackFor = Exception.class)
+    @Autowired
+    private TViolationImageMapper imageMapper;
+
+    @Autowired
+    private TArchivesService tArchivesService;
+    @Autowired
+    private  AdminUserApi userApi;
+    private static final String msgCode ="violation";
+
+
+    public IPage select(Page<TViolation> page, TViolationRequest tViolation) {
+
+        return baseMapper.getListPage(page, tViolation);
+    }
+
+    public IPage appFindAll(Page<TViolation> page, TViolationRequest tViolation) {
+
+        IPage<TViolation> tViolationIPage = baseMapper.appFindAll(page, tViolation);
+        for (TViolation record : tViolationIPage.getRecords()) {
+            record.setViolationTimes(record.getViolationTime());
+        }
+        return tViolationIPage;
+    }
+
+    public List<TViolation> selectForExport(TViolationRequest violationRequest) {
+        //使用重载方法
+        return baseMapper.getListPage(violationRequest);
+    }
+
+    public TViolationRequest getTVById(Long id) {
+        TViolation tViolation = baseMapper.selectById(id);
+        TViolationRequest target = new TViolationRequest();
+        BeanUtils.copyProperties(tViolation, target);
+        List<TViolationImage> images = imageMapper.selectByViolationId(id);
+        target.setImgList(images);
+
+        return target;
+    }
+
+    public TViolationRequest findOneForApp(Long id) {
+        TViolation tViolation = baseMapper.selectById(id);
+        TViolationRequest target = new TViolationRequest();
+        BeanUtils.copyProperties(tViolation, target);
+        List<TViolationImage> images = imageMapper.findOneForApp(id);
+        target.setImgList(images);
+
+        return target;
+    }
+
+
+    public Result add(TViolationRequest request) {
+
+        //进行新增数据
+        TViolation data = new TViolation();
+        BeanUtils.copyProperties(request, data);
+        data.setCode(generateRandomString());
+        int newId = new Random().nextInt();
+        if (newId<0){
+            newId = -newId;
+        }
+        data.setId(Long.valueOf(newId));
+        data.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+        baseMapper.insert(data);
+        //添加图片表
+        if (request.getImgList() != null){
+            List<TViolationImage> imgList = request.getImgList();
+            int i = 1;
+            for (TViolationImage image :imgList){
+                image.setName(request.getTitle() + i++);
+                image.setViolationId(Long.valueOf(newId));
+            
+                image.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+                imageMapper.insert(image);
+                noticeFolder(image,10963L,"1");
+            }
+        }
+
+        return Result.success();
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void updateByIdVo(TViolationRequest request){
+        //进行新增数据
+        TViolation data = new TViolation();
+        BeanUtils.copyProperties(request, data);
+        baseMapper.updateById(data);
+        //添加图片表
+        LambdaQueryWrapper<TViolationImage> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(TViolationImage::getViolationId,request.getId());
+        imageMapper.delete(wrapper);
+        if (request.getImgList() != null){
+            List<TViolationImage> imgList = request.getImgList();
+            int i = 1;
+            for (TViolationImage image :imgList){
+                image.setName(request.getTitle() + i++);
+                image.setViolationId(request.getId());
+                image.setId(generateRandomString());
+                image.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+                imageMapper.insert(image);
+                noticeFolder(image,10963L,"1");
+            }
+        }
+    }
+    public void push(Long id) {
+        TViolation pushData = getById(id);
+
+        Date date = pushData.getLastPushTime();
+       //判断是否推送过
+        if(date != null){
+            Instant instant = date.toInstant();
+            ZoneId zone = ZoneId.systemDefault();
+            LocalDate localDate = instant.atZone(zone).toLocalDate();
+
+            //判断最后推送时间是否是今天
+            if (!LocalDate.now().isEqual(localDate)) {
+                //todo 推送
+                pushData.setLastPushTime(new Date());
+                baseMapper.updateById(pushData);
+            }
+        }else {
+            //todo 推送
+            pushData.setLastPushTime(new Date());
+            baseMapper.updateById(pushData);
+        }
+
+    }
+
+
+    /**
+     * 逻辑删除数据
+     *
+     * @param ids
+     */
+    public Result delete(List<Long> ids) {
+        int flag = 0;
+        for (Long id : ids) {
+            baseMapper.deleteById(id);
+            flag++;
+        }
+        return Result.success(flag);
+    }
+
+
+    public static String generateRandomString() {
+        Random random = new Random();
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < 6; i++) {
+            int randomNumber = random.nextInt(10);
+            sb.append(randomNumber);
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * 通信违章图片文件夹
+     * @param target
+     * @param folderNum
+     * @param fileType
+     * @return
+     */
+    private boolean noticeFolder(TViolationImage target,long folderNum,String fileType){
+        TArchivesRequest tArchivesRequest =new TArchivesRequest();
+        tArchivesRequest.setParentId(folderNum);
+//        tArchivesRequest.setFileSize(Long.valueOf(target.getFileSize()));
+        tArchivesRequest.setFileSize(Long.valueOf(target.getFileSize()));
+        tArchivesRequest.setOriginalFilename(target.getName());
+        tArchivesRequest.setFileUrl(target.getFileUrl());
+        tArchivesRequest.setCurFilename(target.getName());
+        tArchivesRequest.setType(fileType);
+        tArchivesRequest.setArchiveType("0");
+        try {
+            tArchivesService.add(tArchivesRequest);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return false;
+    }
+
+    public Result addForApp(TViolationRequest request) {
+
+        //进行新增数据
+        TViolation data = new TViolation();
+        BeanUtils.copyProperties(request, data);
+        data.setCode(generateRandomString());
+        int newId = new Random().nextInt();
+        if (newId<0){
+            newId = -newId;
+        }
+        data.setId(Long.valueOf(newId));
+        data.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+        baseMapper.insert(data);
+        //添加图片表
+        if (request.getImgList() != null){
+            List<TViolationImage> imgList = request.getImgList();
+            int i = 1;
+            for (TViolationImage image :imgList){
+                image.setName(request.getTitle() + i++);
+                image.setViolationId(Long.valueOf(newId));
+                image.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+                imageMapper.insert(image);
+                noticeFolder(image,10963L,"1");
+            }
+        }
+
+        return Result.success();
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void updateByIdVoForApp(TViolationRequest request){
+        //进行新增数据
+        TViolation data = new TViolation();
+        BeanUtils.copyProperties(request, data);
+        baseMapper.updateById(data);
+        //添加图片表
+        LambdaQueryWrapper<TViolationImage> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(TViolationImage::getViolationId,request.getId());
+        imageMapper.delete(wrapper);
+        if (request.getImgList() != null){
+            List<TViolationImage> imgList = request.getImgList();
+            int i = 1;
+            for (TViolationImage image :imgList){
+                image.setName(request.getTitle() + i++);
+                image.setViolationId(request.getId());
+                image.setId(generateRandomString());
+                image.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
+                imageMapper.insert(image);
+                noticeFolder(image,10963L,"1");
+            }
+        }
+    }
+    public void pushForApp(Long id) {
+        TViolation pushData = getById(id);
+
+        Date date = pushData.getLastPushTime();
+        //判断是否推送过
+        if(date != null){
+            Instant instant = date.toInstant();
+            ZoneId zone = ZoneId.systemDefault();
+            LocalDate localDate = instant.atZone(zone).toLocalDate();
+
+            //判断最后推送时间是否是今天
+            if (!LocalDate.now().isEqual(localDate)) {
+                //todo 推送
+                pushData.setLastPushTime(new Date());
+                baseMapper.updateById(pushData);
+            }
+        }else {
+            //todo 推送
+            pushData.setLastPushTime(new Date());
+            baseMapper.updateById(pushData);
+        }
+
+    }
+
+
+    /**
+     * 逻辑删除数据
+     *
+     * @param ids
+     */
+    public Result deleteForApp(List<Long> ids) {
+        int flag = 0;
+        for (Long id : ids) {
+            baseMapper.deleteById(id);
+            flag++;
+        }
+        return Result.success(flag);
+    }
+
+
+
+}
+
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/DateUtils.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/DateUtils.java
new file mode 100644
index 00000000..bd0a94e9
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/DateUtils.java
@@ -0,0 +1,188 @@
+package cn.iocoder.yudao.module.knowledge.utils;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.*;
+import java.util.Date;
+
+/**
+ * 时间工具类
+ *
+ * @author ruoyi
+ */
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils
+{
+    public static String YYYY = "yyyy";
+
+    public static String YYYY_MM = "yyyy-MM";
+
+    public static String YYYY_MM_DD = "yyyy-MM-dd";
+
+    public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+    private static String[] parsePatterns = {
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
+    /**
+     * 获取当前Date型日期
+     *
+     * @return Date() 当前日期
+     */
+    public static Date getNowDate()
+    {
+        return new Date();
+    }
+
+    /**
+     * 获取当前日期, 默认格式为yyyy-MM-dd
+     *
+     * @return String
+     */
+    public static String getDate()
+    {
+        return dateTimeNow(YYYY_MM_DD);
+    }
+
+    public static final String getTime()
+    {
+        return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
+    }
+
+    public static final String dateTimeNow()
+    {
+        return dateTimeNow(YYYYMMDDHHMMSS);
+    }
+
+    public static final String dateTimeNow(final String format)
+    {
+        return parseDateToStr(format, new Date());
+    }
+
+    public static final String dateTime(final Date date)
+    {
+        return parseDateToStr(YYYY_MM_DD, date);
+    }
+
+    public static final String parseDateToStr(final String format, final Date date)
+    {
+        return new SimpleDateFormat(format).format(date);
+    }
+
+    public static final Date dateTime(final String format, final String ts)
+    {
+        try
+        {
+            return new SimpleDateFormat(format).parse(ts);
+        }
+        catch (ParseException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 日期路径 即年/月/日 如2018/08/08
+     */
+    public static final String datePath()
+    {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyy/MM/dd");
+    }
+
+    /**
+     * 日期路径 即年/月/日 如20180808
+     */
+    public static final String dateTime()
+    {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyyMMdd");
+    }
+
+    /**
+     * 日期型字符串转化为日期 格式
+     */
+    public static Date parseDate(Object str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        try
+        {
+            return parseDate(str.toString(), parsePatterns);
+        }
+        catch (ParseException e)
+        {
+            return null;
+        }
+    }
+
+    /**
+     * 获取服务器启动时间
+     */
+    public static Date getServerStartDate()
+    {
+        long time = ManagementFactory.getRuntimeMXBean().getStartTime();
+        return new Date(time);
+    }
+
+    /**
+     * 计算相差天数
+     */
+    public static int differentDaysByMillisecond(Date date1, Date date2)
+    {
+        return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
+    }
+
+    /**
+     * 计算时间差
+     *
+     * @param endDate 最后时间
+     * @param startTime 开始时间
+     * @return 时间差（天/小时/分钟）
+     */
+    public static String timeDistance(Date endDate, Date startTime)
+    {
+        long nd = 1000 * 24 * 60 * 60;
+        long nh = 1000 * 60 * 60;
+        long nm = 1000 * 60;
+        // long ns = 1000;
+        // 获得两个时间的毫秒时间差异
+        long diff = endDate.getTime() - startTime.getTime();
+        // 计算差多少天
+        long day = diff / nd;
+        // 计算差多少小时
+        long hour = diff % nd / nh;
+        // 计算差多少分钟
+        long min = diff % nd % nh / nm;
+        // 计算差多少秒//输出结果
+        // long sec = diff % nd % nh % nm / ns;
+        return day + "天" + hour + "小时" + min + "分钟";
+    }
+
+    /**
+     * 增加 LocalDateTime ==> Date
+     */
+    public static Date toDate(LocalDateTime temporalAccessor)
+    {
+        ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
+
+    /**
+     * 增加 LocalDate ==> Date
+     */
+    public static Date toDate(LocalDate temporalAccessor)
+    {
+        LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
+        ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/ExcelUtils.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/ExcelUtils.java
new file mode 100644
index 00000000..50dd44fd
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/ExcelUtils.java
@@ -0,0 +1,293 @@
+package cn.iocoder.yudao.module.knowledge.utils;
+
+import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
+
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.tomcat.util.http.parser.Authorization;
+import org.mybatis.logging.Logger;
+import org.mybatis.logging.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+@Slf4j
+@Component
+public class ExcelUtils {
+
+
+
+
+
+    public static String PRIVATE_KEY;
+    public static String REQUEST_TOKEN;
+
+
+    private final static Logger logger = LoggerFactory.getLogger(ExcelUtils.class);
+
+    /**
+     * @param list     导出的数据list
+     * @param clazz    导出的对象class
+     * @param fileName 导出的文件名称
+     * @param response response
+     * @param <T>
+     */
+    public static <T> void exportExcel(List<T> list, Class<T> clazz, String fileName, HttpServletResponse response) {
+        SXSSFWorkbook workBook = getWorkBook(list, clazz);
+        try {
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8");  // .xlsx 用这个
+            //response.setContentType("application/vnd.ms-excel;charset=UTF-8");  // .xls 用这个
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(fileName + ".xlsx", "UTF-8"));
+            OutputStream output = response.getOutputStream();
+            BufferedOutputStream bufferedOutPut = new BufferedOutputStream(output);
+            workBook.write(bufferedOutPut);
+            bufferedOutPut.flush();
+            bufferedOutPut.close();
+            output.close();
+            workBook.close();
+        } catch (Exception e) {
+            //记录日志
+            log.info(e.getMessage());
+            //throw new BadRequestException(e.getMessage());
+        }
+    }
+
+    private static <T> SXSSFWorkbook getWorkBook(List<T> list, Class<T> clazz) {
+        SXSSFWorkbook wb = new SXSSFWorkbook(100);
+        // 单元格样式
+        CellStyle titleStyle = titleStyle(wb);// 表头样式
+        CellStyle orderStyle = orderStyle(wb);// 序号样式
+        CellStyle contentStyle = contentStyle(wb);// 普通单元格样式
+
+        // 遍历集合数据，产生数据行
+        Iterator<?> it = list.iterator();
+        int index = 0;//数据条数（行数）
+        int rowIndex = 0;// 每新建一个sheet此数值归零
+        Sheet sheet = null;
+        while (it.hasNext()) {
+            if (index == 0 || index % 5000 == 0) {//此处是限制单个sheet数据量，每5000条数据新建一个sheet
+                rowIndex = 0;
+                //创建新的sheet
+                sheet = wb.createSheet();
+                Row row = sheet.createRow(0);
+                row.setHeightInPoints(23);
+                Field[] declaredFields = getAllFields(clazz);
+                //添加序号
+                Cell cellOrder = row.createCell(0);
+                cellOrder.setCellValue("序号");
+                cellOrder.setCellStyle(titleStyle);
+                sheet.setColumnWidth(0, 10 * 256);
+                //设置表头
+                for (Field field : declaredFields) {
+                    ExcelOut annotation =         field.getAnnotation(ExcelOut.class);
+                    if (annotation != null) {
+                        Cell cell = row.createCell(Integer.valueOf(annotation.sort()));
+                        cell.setCellValue(annotation.name());
+                        cell.setCellStyle(titleStyle);
+                        //设置列的宽度
+                        sheet.setColumnWidth(Integer.valueOf(annotation.sort()), (int) annotation.width() * 256);
+                    }
+                }
+            }
+
+            index++;
+            rowIndex++;
+
+            //设置序号值
+            Row row = sheet.createRow(rowIndex);
+            Cell cell = row.createCell(0);
+            cell.setCellStyle(orderStyle);
+            //cell.setCellValue(index);//新的sheet序号接着上个sheet的序号累加
+            cell.setCellValue(rowIndex);//新的sheet序号从头开始累加
+            row.setHeightInPoints(18);
+            T t = (T) it.next();
+            // 利用反射，根据javabean属性的先后顺序，动态调用getXxx()方法得到属性值
+            Field[] fields = getAllFields(t.getClass());
+            for (Field field : fields) {
+                ExcelOut annotation = field.getAnnotation(ExcelOut.class);
+                if (annotation != null) {
+                    cell = row.createCell(Integer.valueOf(annotation.sort()));
+                    cell.setCellStyle(contentStyle);
+                    String fieldName = field.getName();
+                    String getMethodName = "get" + fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+                    try {
+                        Method getMethod = t.getClass().getMethod(getMethodName, new Class[]{});
+                        Object value = getMethod.invoke(t, new Object[]{});
+                        String dateFormat = annotation.dateFormat();
+                        Boolean isFileUrl = annotation.isFileUrl();
+                        if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
+                        {
+
+                            cell.setCellValue(parseDateToStr(dateFormat, value));
+                        }else if(isFileUrl){
+                            cell.setCellValue(PRIVATE_KEY + value + REQUEST_TOKEN);
+                        }else {
+                            cell.setCellValue(null == value ? "" : String.valueOf(value));
+                        }
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return wb;
+    }
+    /**
+     * 格式化不同类型的日期对象
+     *
+     * @param dateFormat 日期格式
+     * @param val 被格式化的日期对象
+     * @return 格式化后的日期字符
+     */
+    public static String parseDateToStr(String dateFormat, Object val)
+    {
+        if (val == null)
+        {
+            return "";
+        }
+        String str;
+        if (val instanceof Date)
+        {
+            str = DateUtils.parseDateToStr(dateFormat, (Date) val);
+        }
+        else if (val instanceof LocalDateTime)
+        {
+            str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val));
+        }
+        else if (val instanceof LocalDate)
+        {
+            str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val));
+        }
+        else
+        {
+            str = val.toString();
+        }
+        return str;
+    }
+    //设置标题样式
+    private static CellStyle titleStyle(SXSSFWorkbook wb) {
+        CellStyle cellStyle = contentStyle(wb);
+        //设置居中
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+        //设置单元格背景颜色
+        cellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+        //设置单元格填充样式(使用纯色背景颜色填充)
+        cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        //设置字体加粗
+        Font font = wb.createFont();
+        font.setBold(true);
+        font.setFontHeightInPoints((short) 12);
+        //设置字体
+        font.setFontName("宋体");
+        cellStyle.setFont(font);
+        return cellStyle;
+    }
+
+    //设置单元格样式
+    private static CellStyle contentStyle(SXSSFWorkbook wb) {
+        //给单元格设置样式
+        CellStyle cellStyle = wb.createCellStyle();
+        Font font = wb.createFont();
+        // 设置字体大小
+        font.setFontHeightInPoints((short) 11);
+        // 设置字体
+        font.setFontName("宋体");
+        // 给字体设置样式
+        cellStyle.setFont(font);
+        // 字体设置边框
+        cellStyle.setBorderBottom(BorderStyle.THIN);
+        cellStyle.setBorderRight(BorderStyle.THIN);
+        // 设置垂直居中
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        return cellStyle;
+    }
+
+    // 设置单元格样式
+    private static CellStyle orderStyle(SXSSFWorkbook wb) {
+        CellStyle cellStyle = contentStyle(wb);
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+        return cellStyle;
+    }
+
+    private static <T> Field[] getAllFields(Class<T> clazz) {
+        Field[] declaredFields = clazz.getDeclaredFields();
+        Class superClass = clazz.getSuperclass();
+        if (!superClass.equals(Object.class)) {
+            Field[] superFields = superClass.getDeclaredFields();
+            int sonLength = declaredFields.length;
+            int superLength = superFields.length;
+            // 合并两个数组
+            Field[] newFields = new Field[sonLength + superLength];
+            System.arraycopy(declaredFields, 0, newFields, 0, sonLength);
+            System.arraycopy(superFields, 0, newFields, sonLength, superLength);
+            return newFields;
+        }
+        return declaredFields;
+    }
+
+    private static final String XLS = "xls";
+    private static final String XLSX = "xlsx";
+
+    /**
+     * 根据文件后缀名类型获取对应的工作簿对象
+     *
+     * @param inputStream 读取文件的输入流
+     * @param fileType    文件后缀名类型（xls或xlsx）
+     * @return 包含文件数据的工作簿对象
+     * @throws IOException
+     */
+    public static Workbook getWorkbook(InputStream inputStream, String fileType) throws IOException {
+        Workbook workbook = null;
+        if (fileType.equalsIgnoreCase(XLS)) {
+            workbook = new HSSFWorkbook(inputStream);
+        } else if (fileType.equalsIgnoreCase(XLSX)) {
+            workbook = new XSSFWorkbook(inputStream);
+        }
+        return workbook;
+    }
+
+    /**
+     * 导入Excel
+     */
+    public static Workbook importExcel(MultipartFile file) throws IOException {
+        //读取文件流
+        InputStream is = file.getInputStream();
+        //文件名
+        String fileName = file.getOriginalFilename();
+        //判断文件格式是否为excel
+        boolean notNull = false;
+        if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+            //throw new BusinessException("上传文件格式不正确");
+        }
+        Workbook wb = null;
+        if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
+            //xlsx格式
+            wb = new XSSFWorkbook(is);
+        } else {
+            //xls格式
+            wb = new HSSFWorkbook(is);
+        }
+        return wb;
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/FileTypeUtils.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/FileTypeUtils.java
new file mode 100644
index 00000000..df7f6d72
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/FileTypeUtils.java
@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.knowledge.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+
+/**
+ * 文件类型工具类
+ *
+ * @author ruoyi
+ */
+public class FileTypeUtils
+{
+    /**
+     * 获取文件类型
+     * <p>
+     * 例如: ruoyi.txt, 返回: txt
+     *
+     * @param file 文件名
+     * @return 后缀（不含".")
+     */
+    public static String getFileType(File file)
+    {
+        if (null == file)
+        {
+            return StringUtils.EMPTY;
+        }
+        return getFileType(file.getName());
+    }
+
+    /**
+     * 获取文件类型
+     * <p>
+     * 例如: ruoyi.txt, 返回: txt
+     *
+     * @param fileName 文件名
+     * @return 后缀（不含".")
+     */
+    public static String getFileType(String fileName)
+    {
+        int separatorIndex = fileName.lastIndexOf(".");
+        if (separatorIndex < 0)
+        {
+            return "";
+        }
+        return fileName.substring(separatorIndex + 1).toLowerCase();
+    }
+
+    /**
+     * 获取文件类型
+     *
+     * @param photoByte 文件字节码
+     * @return 后缀（不含".")
+     */
+    public static String getFileExtendName(byte[] photoByte)
+    {
+        String strFileExtendName = "JPG";
+        if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
+                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
+        {
+            strFileExtendName = "GIF";
+        }
+        else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
+        {
+            strFileExtendName = "JPG";
+        }
+        else if ((photoByte[0] == 66) && (photoByte[1] == 77))
+        {
+            strFileExtendName = "BMP";
+        }
+        else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
+        {
+            strFileExtendName = "PNG";
+        }
+        return strFileExtendName;
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/FileUtils.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/FileUtils.java
new file mode 100644
index 00000000..63c1458f
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/FileUtils.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.knowledge.utils;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+
+public class FileUtils {
+    /**
+     * 检查文件是否可上传
+     *
+     * @param resource 需要上传的文件
+     * @return true 正常 false 非法
+     */
+    public static boolean checkAllowUpload(String resource)
+    {
+        // 禁止目录上跳级别
+        if (StringUtils.contains(resource, ".."))
+        {
+            return false;
+        }
+
+        // 检查允许下载的文件规则
+        if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)))
+        {
+            return true;
+        }
+
+        // 不在允许下载的文件规则
+        return false;
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/MimeTypeUtils.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/MimeTypeUtils.java
new file mode 100644
index 00000000..959333e2
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/MimeTypeUtils.java
@@ -0,0 +1,61 @@
+package cn.iocoder.yudao.module.knowledge.utils;
+
+/**
+ * 媒体类型工具类
+ *
+ * @author ruoyi
+ */
+public class MimeTypeUtils
+{
+    public static final String IMAGE_PNG = "image/png";
+
+    public static final String IMAGE_JPG = "image/jpg";
+
+    public static final String IMAGE_JPEG = "image/jpeg";
+
+    public static final String IMAGE_BMP = "image/bmp";
+
+    public static final String IMAGE_GIF = "image/gif";
+
+    public static final String[] IMAGE_EXTENSION = { "jpg", "jpeg", "png" };
+
+    public static final String[] FLASH_EXTENSION = { "swf", "flv" };
+    public static final String[] FLASH_SANG = { "mp3" };
+    public static final String[] FLASH_FILE = {  "doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt","pdf" };
+
+    public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
+            "asf", "rm", "rmvb" };
+
+    public static final String[] VIDEO_EXTENSION = { "mp4" };
+
+    public static final String[] DEFAULT_ALLOWED_EXTENSION = {
+            // 图片
+            "jpg", "jpeg", "png",
+            // word excel powerpoint
+            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt","tmp",
+            // 压缩文件
+            "rar", "zip",
+            // 视频格式
+            "mp4","mp3",
+            // pdf
+            "pdf" };
+
+    public static String getExtension(String prefix)
+    {
+        switch (prefix)
+        {
+            case IMAGE_PNG:
+                return "png";
+            case IMAGE_JPG:
+                return "jpg";
+            case IMAGE_JPEG:
+                return "jpeg";
+            case IMAGE_BMP:
+                return "bmp";
+            case IMAGE_GIF:
+                return "gif";
+            default:
+                return "";
+        }
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/PathUtil.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/PathUtil.java
new file mode 100644
index 00000000..224137c5
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/PathUtil.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.knowledge.utils;
+
+import org.springframework.beans.factory.annotation.Value;
+
+/**
+ * 加载本地路径示例，具体内容直接修改
+ * 使用的时候放开注解 @Component
+ */
+//@Component
+public class PathUtil {
+    @Value("${excelUrl.downloadTemplate_win}")
+    private String downloadTemplate_win;
+
+    @Value("${excelUrl.downloadTemplate_linux}")
+    private String downloadTemplate_linux;
+
+    @Value("${excelUrl.uploadPoleExcelFile_win}")
+    private String uploadPoleExcelFile_win;
+
+    @Value("${excelUrl.uploadPoleExcelFile_linux}")
+    private String uploadPoleExcelFile_linux;
+
+    /**
+     * 获取文件上传后保存的路径
+     * @param method
+     * @return
+     */
+    public String getOsFilePath(String method){
+        String os = System.getProperty("os.name");
+        String filePath="";
+        switch (method){
+            case "downloadTemplates":
+                if (os.toLowerCase().startsWith("win")){
+                    filePath=downloadTemplate_win;
+                }else {
+                    filePath=downloadTemplate_linux;
+                }
+                break;
+            case "uploadPoleExcelFile":
+                if (os.toLowerCase().startsWith("win")){
+                    filePath=uploadPoleExcelFile_win;
+                }else {
+                    filePath=uploadPoleExcelFile_linux;
+                }
+                break;
+        }
+        return filePath;
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/StringUtils.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/StringUtils.java
new file mode 100644
index 00000000..6b14ffb8
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/StringUtils.java
@@ -0,0 +1,622 @@
+package cn.iocoder.yudao.module.knowledge.utils;
+
+import cn.iocoder.yudao.module.knowledge.common.StrFormatter;
+import org.springframework.util.AntPathMatcher;
+
+import java.util.*;
+
+/**
+ * 字符串工具类
+ *
+ * @author ruoyi
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils
+{
+    /** 空字符串 */
+    private static final String NULLSTR = "";
+
+    /** 下划线 */
+    private static final char SEPARATOR = '_';
+
+    /**
+     * 获取参数不为空值
+     *
+     * @param value defaultValue 要判断的value
+     * @return value 返回值
+     */
+    public static <T> T nvl(T value, T defaultValue)
+    {
+        return value != null ? value : defaultValue;
+    }
+
+    /**
+     * * 判断一个Collection是否为空， 包含List，Set，Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Collection<?> coll)
+    {
+        return isNull(coll) || coll.isEmpty();
+    }
+
+    /**
+     * * 判断一个Collection是否非空，包含List，Set，Queue
+     *
+     * @param coll 要判断的Collection
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Collection<?> coll)
+    {
+        return !isEmpty(coll);
+    }
+
+    /**
+     * * 判断一个对象数组是否为空
+     *
+     * @param objects 要判断的对象数组
+     ** @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Object[] objects)
+    {
+        return isNull(objects) || (objects.length == 0);
+    }
+
+    /**
+     * * 判断一个对象数组是否非空
+     *
+     * @param objects 要判断的对象数组
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Object[] objects)
+    {
+        return !isEmpty(objects);
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Map<?, ?> map)
+    {
+        return isNull(map) || map.isEmpty();
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     *
+     * @param map 要判断的Map
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Map<?, ?> map)
+    {
+        return !isEmpty(map);
+    }
+
+    /**
+     * * 判断一个字符串是否为空串
+     *
+     * @param str String
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(String str)
+    {
+        return isNull(str) || NULLSTR.equals(str.trim());
+    }
+
+    /**
+     * * 判断一个字符串是否为非空串
+     *
+     * @param str String
+     * @return true：非空串 false：空串
+     */
+    public static boolean isNotEmpty(String str)
+    {
+        return !isEmpty(str);
+    }
+
+    /**
+     * * 判断一个对象是否为空
+     *
+     * @param object Object
+     * @return true：为空 false：非空
+     */
+    public static boolean isNull(Object object)
+    {
+        return object == null;
+    }
+
+    /**
+     * * 判断一个对象是否非空
+     *
+     * @param object Object
+     * @return true：非空 false：空
+     */
+    public static boolean isNotNull(Object object)
+    {
+        return !isNull(object);
+    }
+
+    /**
+     * * 判断一个对象是否是数组类型（Java基本型别的数组）
+     *
+     * @param object 对象
+     * @return true：是数组 false：不是数组
+     */
+    public static boolean isArray(Object object)
+    {
+        return isNotNull(object) && object.getClass().isArray();
+    }
+
+    /**
+     * 去空格
+     */
+    public static String trim(String str)
+    {
+        return (str == null ? "" : str.trim());
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str 字符串
+     * @param start 开始
+     * @return 结果
+     */
+    public static String substring(final String str, int start)
+    {
+        if (str == null)
+        {
+            return NULLSTR;
+        }
+
+        if (start < 0)
+        {
+            start = str.length() + start;
+        }
+
+        if (start < 0)
+        {
+            start = 0;
+        }
+        if (start > str.length())
+        {
+            return NULLSTR;
+        }
+
+        return str.substring(start);
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str 字符串
+     * @param start 开始
+     * @param end 结束
+     * @return 结果
+     */
+    public static String substring(final String str, int start, int end)
+    {
+        if (str == null)
+        {
+            return NULLSTR;
+        }
+
+        if (end < 0)
+        {
+            end = str.length() + end;
+        }
+        if (start < 0)
+        {
+            start = str.length() + start;
+        }
+
+        if (end > str.length())
+        {
+            end = str.length();
+        }
+
+        if (start > end)
+        {
+            return NULLSTR;
+        }
+
+        if (start < 0)
+        {
+            start = 0;
+        }
+        if (end < 0)
+        {
+            end = 0;
+        }
+
+        return str.substring(start, end);
+    }
+
+    /**
+     * 判断是否为空，并且不是空白字符
+     *
+     * @param str 要判断的value
+     * @return 结果
+     */
+    public static boolean hasText(String str)
+    {
+        return (str != null && !str.isEmpty() && containsText(str));
+    }
+
+    private static boolean containsText(CharSequence str)
+    {
+        int strLen = str.length();
+        for (int i = 0; i < strLen; i++)
+        {
+            if (!Character.isWhitespace(str.charAt(i)))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 格式化文本, {} 表示占位符<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     *
+     * @param template 文本模板，被替换的部分用 {} 表示
+     * @param params 参数值
+     * @return 格式化后的文本
+     */
+    public static String format(String template, Object... params)
+    {
+        if (isEmpty(params) || isEmpty(template))
+        {
+            return template;
+        }
+        return StrFormatter.format(template, params);
+    }
+
+    /**
+     * 字符串转set
+     *
+     * @param str 字符串
+     * @param sep 分隔符
+     * @return set集合
+     */
+    public static final Set<String> str2Set(String str, String sep)
+    {
+        return new HashSet<String>(str2List(str, sep, true, false));
+    }
+
+    /**
+     * 字符串转list
+     *
+     * @param str 字符串
+     * @param sep 分隔符
+     * @param filterBlank 过滤纯空白
+     * @param trim 去掉首尾空白
+     * @return list集合
+     */
+    public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim)
+    {
+        List<String> list = new ArrayList<String>();
+        if (StringUtils.isEmpty(str))
+        {
+            return list;
+        }
+
+        // 过滤空白字符串
+        if (filterBlank && StringUtils.isBlank(str))
+        {
+            return list;
+        }
+        String[] split = str.split(sep);
+        for (String string : split)
+        {
+            if (filterBlank && StringUtils.isBlank(string))
+            {
+                continue;
+            }
+            if (trim)
+            {
+                string = string.trim();
+            }
+            list.add(string);
+        }
+
+        return list;
+    }
+
+    /**
+     * 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
+     *
+     * @param collection 给定的集合
+     * @param array 给定的数组
+     * @return boolean 结果
+     */
+    public static boolean containsAny(Collection<String> collection, String... array)
+    {
+        if (isEmpty(collection) || isEmpty(array))
+        {
+            return false;
+        }
+        else
+        {
+            for (String str : array)
+            {
+                if (collection.contains(str))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
+     *
+     * @param cs 指定字符串
+     * @param searchCharSequences 需要检查的字符串数组
+     * @return 是否包含任意一个字符串
+     */
+    public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences)
+    {
+        if (isEmpty(cs) || isEmpty(searchCharSequences))
+        {
+            return false;
+        }
+        for (CharSequence testStr : searchCharSequences)
+        {
+            if (containsIgnoreCase(cs, testStr))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 驼峰转下划线命名
+     */
+    public static String toUnderScoreCase(String str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        // 前置字符是否大写
+        boolean preCharIsUpperCase = true;
+        // 当前字符是否大写
+        boolean curreCharIsUpperCase = true;
+        // 下一字符是否大写
+        boolean nexteCharIsUpperCase = true;
+        for (int i = 0; i < str.length(); i++)
+        {
+            char c = str.charAt(i);
+            if (i > 0)
+            {
+                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
+            }
+            else
+            {
+                preCharIsUpperCase = false;
+            }
+
+            curreCharIsUpperCase = Character.isUpperCase(c);
+
+            if (i < (str.length() - 1))
+            {
+                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
+            }
+
+            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase)
+            {
+                sb.append(SEPARATOR);
+            }
+            else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase)
+            {
+                sb.append(SEPARATOR);
+            }
+            sb.append(Character.toLowerCase(c));
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * 是否包含字符串
+     *
+     * @param str 验证字符串
+     * @param strs 字符串组
+     * @return 包含返回true
+     */
+    public static boolean inStringIgnoreCase(String str, String... strs)
+    {
+        if (str != null && strs != null)
+        {
+            for (String s : strs)
+            {
+                if (str.equalsIgnoreCase(trim(s)))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
+     *
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String convertToCamelCase(String name)
+    {
+        StringBuilder result = new StringBuilder();
+        // 快速检查
+        if (name == null || name.isEmpty())
+        {
+            // 没必要转换
+            return "";
+        }
+        else if (!name.contains("_"))
+        {
+            // 不含下划线，仅将首字母大写
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
+        }
+        // 用下划线将原始字符串分割
+        String[] camels = name.split("_");
+        for (String camel : camels)
+        {
+            // 跳过原始字符串中开头、结尾的下换线或双重下划线
+            if (camel.isEmpty())
+            {
+                continue;
+            }
+            // 首字母大写
+            result.append(camel.substring(0, 1).toUpperCase());
+            result.append(camel.substring(1).toLowerCase());
+        }
+        return result.toString();
+    }
+
+    /**
+     * 驼峰式命名法
+     * 例如：user_name->userName
+     */
+    public static String toCamelCase(String s)
+    {
+        if (s == null)
+        {
+            return null;
+        }
+        if (s.indexOf(SEPARATOR) == -1)
+        {
+            return s;
+        }
+        s = s.toLowerCase();
+        StringBuilder sb = new StringBuilder(s.length());
+        boolean upperCase = false;
+        for (int i = 0; i < s.length(); i++)
+        {
+            char c = s.charAt(i);
+
+            if (c == SEPARATOR)
+            {
+                upperCase = true;
+            }
+            else if (upperCase)
+            {
+                sb.append(Character.toUpperCase(c));
+                upperCase = false;
+            }
+            else
+            {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+     *
+     * @param str 指定字符串
+     * @param strs 需要检查的字符串数组
+     * @return 是否匹配
+     */
+    public static boolean matches(String str, List<String> strs)
+    {
+        if (isEmpty(str) || isEmpty(strs))
+        {
+            return false;
+        }
+        for (String pattern : strs)
+        {
+            if (isMatch(pattern, str))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断url是否与规则配置:
+     * ? 表示单个字符;
+     * * 表示一层路径内的任意字符串，不可跨层级;
+     * ** 表示任意层路径;
+     *
+     * @param pattern 匹配规则
+     * @param url 需要匹配的url
+     * @return
+     */
+    public static boolean isMatch(String pattern, String url)
+    {
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T cast(Object obj)
+    {
+        return (T) obj;
+    }
+
+    /**
+     * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。
+     *
+     * @param num 数字对象
+     * @param size 字符串指定长度
+     * @return 返回数字的字符串格式，该字符串为指定长度。
+     */
+    public static final String padl(final Number num, final int size)
+    {
+        return padl(num.toString(), size, '0');
+    }
+
+    /**
+     * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。
+     *
+     * @param s 原始字符串
+     * @param size 字符串指定长度
+     * @param c 用于补齐的字符
+     * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。
+     */
+    public static final String padl(final String s, final int size, final char c)
+    {
+        final StringBuilder sb = new StringBuilder(size);
+        if (s != null)
+        {
+            final int len = s.length();
+            if (s.length() <= size)
+            {
+                for (int i = size - len; i > 0; i--)
+                {
+                    sb.append(c);
+                }
+                sb.append(s);
+            }
+            else
+            {
+                return s.substring(len - size, len);
+            }
+        }
+        else
+        {
+            for (int i = size; i > 0; i--)
+            {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/validated/AddGroup.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/validated/AddGroup.java
new file mode 100644
index 00000000..08a4a0b2
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/validated/AddGroup.java
@@ -0,0 +1,4 @@
+package cn.iocoder.yudao.module.knowledge.validated;
+
+public interface AddGroup {
+}
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/validated/EditGroup.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/validated/EditGroup.java
new file mode 100644
index 00000000..d42300f1
--- /dev/null
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/validated/EditGroup.java
@@ -0,0 +1,4 @@
+package cn.iocoder.yudao.module.knowledge.validated;
+
+public interface EditGroup {
+}
diff --git a/dl-module-knowledge/src/main/resources/mapper/KnowledgeStatisticsMapper.xml b/dl-module-knowledge/src/main/resources/mapper/KnowledgeStatisticsMapper.xml
new file mode 100644
index 00000000..55a6f48a
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/KnowledgeStatisticsMapper.xml
@@ -0,0 +1,208 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.KnowledgeStatisticsMapper">
+    <resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.knowledge.entity.TLaws">
+        <id column="ID" property="id" jdbcType="BIGINT"/>
+        <result column="CODE" property="code" jdbcType="VARCHAR"/>
+        <result column="NAME" property="name" jdbcType="VARCHAR"/>
+        <result column="VERSION" property="version" jdbcType="VARCHAR"/>
+        <result column="FILE_URL" property="fileUrl" jdbcType="VARCHAR"/>
+        <result column="FILE_SIZE" property="fileSize" jdbcType="VARCHAR"/>
+        <result column="FILE_NAME" property="fileName" jdbcType="VARCHAR"/>
+        <result column="FILE_TIME" property="filingTime" jdbcType="DATE"/>
+        <result column="IS_FILING" property="isFiling" jdbcType="INTEGER"/>
+        <result column="DELETED" property="deleted" jdbcType="INTEGER"/>
+        <result column="CREATOR" property="creator" jdbcType="VARCHAR"/>
+        <result column="CREATOR_ID" property="creatorId" jdbcType="BIGINT"/>
+        <result column="CREATE_TIME" property="createTime" jdbcType="DATE"/>
+        <result column="UPDATE_TIME" property="updateTime" jdbcType="DATE"/>
+
+    </resultMap>
+    <sql id="columns">
+        id,template_info_id,template_data_sort,template_data_code,template_data_name,template_data_type,create_people,create_time,update_time,deleted,identity_id,dept_id,tenant_id
+    </sql>
+    <select id="findSum" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeStatisticsvo">
+        SELECT
+                ( SELECT COUNT(*) FROM t_operation_document WHERE deleted = 0 ) AS "operationSum",
+                ( SELECT COUNT(*) FROM t_violation_image WHERE deleted = 0 ) AS "violationSum",
+                ( SELECT COUNT(*) FROM t_laws_records WHERE deleted = 0 ) AS "lawsSum",
+                ( SELECT COUNT(*) FROM t_regulatory_framework_records WHERE deleted = 0 ) AS "rulesSum"
+    </select>
+
+    <select id="findCompare" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeStatisticsvo">
+        SELECT
+            ( SELECT COUNT(*) FROM t_operation_document WHERE DATE_FORMAT( create_time, '%Y-%m' ) = DATE_FORMAT( NOW(), '%Y-%m' ) AND deleted = 0 ) AS "curMonthOperationSum",
+            ( SELECT COUNT(*) FROM t_operation_document WHERE DATE_FORMAT( create_time, '%Y-%m' ) = DATE_FORMAT( NOW() - INTERVAL 1 MONTH, '%Y-%m' ) AND deleted = 0 ) AS "lastMonthOperationSum",
+            ( SELECT COUNT(*) FROM t_violation_image WHERE DATE_FORMAT( create_time, '%Y-%m' ) = DATE_FORMAT( NOW(), '%Y-%m' ) AND deleted = 0 ) AS "curMonthViolationSum",
+            ( SELECT COUNT(*) FROM t_violation_image WHERE DATE_FORMAT( create_time, '%Y-%m' ) = DATE_FORMAT( NOW() - INTERVAL 1 MONTH, '%Y-%m' ) AND deleted = 0 ) AS "lastMonthViolationSum",
+            ( SELECT COUNT(*) FROM t_laws_records WHERE DATE_FORMAT( create_time, '%Y-%m' ) = DATE_FORMAT( NOW(), '%Y-%m' ) AND deleted = 0 ) AS "curMonthLawsSum",
+            ( SELECT COUNT(*) FROM t_laws_records WHERE DATE_FORMAT( create_time, '%Y-%m' ) = DATE_FORMAT( NOW() - INTERVAL 1 MONTH, '%Y-%m' ) AND deleted = 0 ) AS "lastMonthLawsSum",
+            ( SELECT COUNT(*) FROM t_regulatory_framework_records WHERE DATE_FORMAT( create_time, '%Y-%m' ) = DATE_FORMAT( NOW(), '%Y-%m' ) AND deleted = 0 ) AS "curMonthRulesSum",
+            ( SELECT COUNT(*) FROM t_regulatory_framework_records WHERE DATE_FORMAT( create_time, '%Y-%m' ) = DATE_FORMAT( NOW() - INTERVAL 1 MONTH, '%Y-%m' ) AND deleted = 0 ) AS "lastMonthRulesSum"
+    </select>
+
+    <select id="learningProgressCount" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeStatisticsvo">
+        SELECT NOW() AS "date" ,
+               1 AS completed,
+               100 AS notCompleted
+    </select>
+
+    <select id="trainingStatistics" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeStatisticsvo">
+        SELECT
+            10 AS num,
+            100 AS percentOfPass
+    </select>
+
+    <select id="headCardListStatistics" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeHeadCardListStatisticsvo">
+        SELECT
+                ( SELECT COUNT(*) FROM t_course WHERE deleted = 0 ) AS "numberOfCourses",
+                ( SELECT COUNT(*) FROM t_laws_records WHERE deleted = 0 ) AS "numberOfStudents",
+                ( ( SELECT COUNT(*) FROM t_bid_confirmation WHERE deleted = 0)+( SELECT COUNT(*) FROM t_bid_plan WHERE deleted = 0)) AS "numberOfBids",
+                ( SELECT COUNT(*) FROM t_test_paper_answer_sheet WHERE deleted = 0 ) AS "numberOfExams",
+                ( SELECT COUNT(*) FROM t_train_record WHERE deleted = 0 ) AS "numberOfTrainings"
+    </select>
+
+
+    <select id="violationStatistics" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeChartsStatisticsvo">
+        SELECT DATE_FORMAT(months.month, '%m月') AS name,
+               COUNT(t_violation.violation_time) AS value
+        FROM (
+            SELECT DATE_SUB(DATE_FORMAT(CURRENT_DATE(), '%Y-%m-01'), INTERVAL n MONTH) AS month
+            FROM (
+            SELECT 0 AS n UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
+            ) AS months
+            ) AS months
+            LEFT JOIN t_violation ON DATE_FORMAT(t_violation.violation_time, '%Y-%m') = DATE_FORMAT(months.month, '%Y-%m') AND t_violation.deleted = 0
+        GROUP BY DATE_FORMAT(months.month, '%m月')
+        ORDER BY name DESC
+    </select>
+    <select id="lawsStatistics" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeChartsStatisticsvo">
+        SELECT DATE_FORMAT(months.month, '%m月') AS name,
+               COUNT(t_laws.create_time) AS value
+        FROM (
+                 SELECT DATE_SUB(DATE_FORMAT(CURRENT_DATE(), '%Y-%m-01'), INTERVAL n MONTH) AS month
+                 FROM (
+                          SELECT 0 AS n UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
+                      ) AS months
+             ) AS months
+                 LEFT JOIN t_laws ON DATE_FORMAT(t_laws.create_time, '%Y-%m') = DATE_FORMAT(months.month, '%Y-%m') AND t_laws.deleted = 0
+        GROUP BY DATE_FORMAT(months.month, '%m月')
+        ORDER BY name DESC
+    </select>
+    <select id="regulationsStatistics" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeChartsStatisticsvo">
+        SELECT DATE_FORMAT(months.month, '%m月') AS name,
+               COUNT(t_regulatory_framework.create_time) AS value
+        FROM (
+                 SELECT DATE_SUB(DATE_FORMAT(CURRENT_DATE(), '%Y-%m-01'), INTERVAL n MONTH) AS month
+                 FROM (
+                          SELECT 0 AS n UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
+                      ) AS months
+             ) AS months
+                 LEFT JOIN t_regulatory_framework ON DATE_FORMAT(t_regulatory_framework.create_time, '%Y-%m') = DATE_FORMAT(months.month, '%Y-%m') AND t_regulatory_framework.deleted = 0
+        GROUP BY DATE_FORMAT(months.month, '%m月')
+        ORDER BY name DESC
+    </select>
+    <select id="lawsStatisticsNew" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeChartsStatisticsvo">
+        SELECT
+            type_label AS name,
+            type_count AS value
+        FROM
+            (SELECT
+                 CASE
+                     WHEN type = 1 THEN '法律'
+                     WHEN type = 2 THEN '行政法规'
+                     WHEN type = 3 THEN '部门规章'
+                     WHEN type = 4 THEN '地方法规'
+                     WHEN type = 5 THEN '地方规章'
+                     ELSE '其他'
+                     END AS type_label,
+                 COUNT(*) AS type_count
+             FROM t_laws
+             WHERE deleted = 0
+             GROUP BY type_label) AS t
+    </select>
+    <select id="regulationsStatisticsNew" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeChartsStatisticsvo">
+        SELECT
+            type_label AS name,
+            type_count AS value
+        FROM
+            (SELECT
+                 CASE
+                 WHEN type = 1 THEN '安全环保职业健康消防'
+                     WHEN type = 2 THEN '财务与资产管理'
+                     WHEN type = 3 THEN '采购销售'
+                     WHEN type = 4 THEN '党、工、团、纪律监督'
+                     WHEN type = 5 THEN '法律合规内审内控'
+                     WHEN type = 6 THEN '科技与投资'
+                     WHEN type = 7 THEN '企业文化与宣传'
+                     WHEN type = 8 THEN '人力资源'
+                     WHEN type = 9 THEN '社会责任'
+                     WHEN type = 10 THEN '生产管理'
+                     WHEN type = 11 THEN '行政管理'
+                     ELSE '其他'
+                     END AS type_label,
+                 COUNT(*) AS type_count
+             FROM t_regulatory_framework
+             WHERE deleted = 0
+             GROUP BY type_label) AS t
+    </select>
+    <select id="bidConfirmationStatistics" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeChartsStatisticsvo">
+        SELECT DATE_FORMAT(months.month, '%m月') AS name,
+               COUNT(t_bid_confirmation.create_time) AS value
+        FROM (
+                 SELECT DATE_SUB(DATE_FORMAT(CURRENT_DATE(), '%Y-%m-01'), INTERVAL n MONTH) AS month
+                 FROM (
+                          SELECT 0 AS n UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
+                      ) AS months
+             ) AS months
+                 LEFT JOIN t_bid_confirmation ON DATE_FORMAT(t_bid_confirmation.create_time, '%Y-%m') = DATE_FORMAT(months.month, '%Y-%m') AND t_bid_confirmation.deleted = 0
+        GROUP BY DATE_FORMAT(months.month, '%m月')
+        ORDER BY name DESC
+    </select>
+    <select id="bidPlanStatistics" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.KnowledgeChartsStatisticsvo">
+        SELECT DATE_FORMAT(months.month, '%m月') AS name,
+               COUNT(t_bid_plan.create_time) AS value
+        FROM (
+                 SELECT DATE_SUB(DATE_FORMAT(CURRENT_DATE(), '%Y-%m-01'), INTERVAL n MONTH) AS month
+                 FROM (
+                          SELECT 0 AS n UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
+                      ) AS months
+             ) AS months
+                 LEFT JOIN t_bid_plan ON DATE_FORMAT(t_bid_plan.create_time, '%Y-%m') = DATE_FORMAT(months.month, '%Y-%m') AND t_bid_plan.deleted = 0
+        GROUP BY DATE_FORMAT(months.month, '%m月')
+        ORDER BY name DESC
+    </select>
+    <select id="lessonDailyStatistics" resultType="HashMap">
+        SELECT
+            ttpas.score AS score,
+            ttpi.pass_score AS passScore
+        FROM
+            t_test_paper_answer_sheet ttpas
+        LEFT JOIN
+            t_test_paper_info ttpi ON ttpas.test_paper_info_id = ttpi.id
+        WHERE
+              ttpas.deleted = 0
+    </select>
+
+    <select id="lessonDailyCompleteStatistics" resultType="HashMap">
+        SELECT
+            ttpas.score AS score
+        FROM
+            t_test_paper_answer_sheet ttpas
+        WHERE
+              ttpas.deleted = 0
+    </select>
+
+    <select id="lessonDailyCompleteSstatistics" resultType="HashMap">
+        SELECT
+            ttpas.score AS score,
+            ttpi.pass_score AS passScore
+        FROM
+            t_test_paper_answer_sheet ttpas
+                LEFT JOIN
+            t_test_paper_info ttpi ON ttpas.test_paper_info_id = ttpi.id
+        WHERE
+            ttpas.deleted = 0
+    </select>
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/RRfeuTaskFileMapper.xml b/dl-module-knowledge/src/main/resources/mapper/RRfeuTaskFileMapper.xml
new file mode 100644
index 00000000..d092d5bd
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/RRfeuTaskFileMapper.xml
@@ -0,0 +1,76 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.RRfeuTaskFileMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.RRfeuTaskFile" id="rRfeuTaskFileMap">
+            <result property="id" column="id"/>
+            <result property="rRfeuTaskContentId" column="r_rfeu_task_content_id"/>
+            <result property="fileName" column="file_name"/>
+            <result property="fileUrl" column="file_url"/>
+            <result property="tenantId" column="tenant_id"/>
+            <result property="creator" column="creator"/>
+            <result property="creatorId" column="creator_id"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="deptId" column="dept_id"/>
+            <result property="identityId" column="identity_id"/>
+            <result property="fileSize" column="file_size"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,r_rfeu_task_content_id,file_name,file_url,tenant_id,creator,creator_id,create_time,update_time,dept_id,identity_id,file_size
+    </sql>
+    <select id="findList" resultMap="rRfeuTaskFileMap">
+        select
+        <include refid="columns"/>
+        from r_rfeu_task_file
+        <where>
+                    <if test="id != null">
+                        id = #{id}
+                    </if>
+                    <if test="rRfeuTaskContentId != null">
+                        r_rfeu_task_content_id = #{rRfeuTaskContentId}
+                    </if>
+                    <if test="fileName != null and fileName != ''">
+                            file_name = #{fileName}
+                    </if>
+                    <if test="fileUrl != null and fileUrl != ''">
+                            file_url = #{fileUrl}
+                    </if>
+                    <if test="tenantId != null">
+                        tenant_id = #{tenantId}
+                    </if>
+                    <if test="creator != null and creator != ''">
+                            creator = #{creator}
+                    </if>
+                    <if test="creatorId != null and creatorId != ''">
+                            creator_id = #{creatorId}
+                    </if>
+                    <if test="createTime != null">
+                        create_time = #{createTime}
+                    </if>
+                    <if test="updateTime != null">
+                        update_time = #{updateTime}
+                    </if>
+                    <if test="deptId != null and deptId != ''">
+                            dept_id = #{deptId}
+                    </if>
+                    <if test="identityId != null and identityId != ''">
+                            identity_id = #{identityId}
+                    </if>
+                    <if test="fileSize != null">
+                        file_size = #{fileSize}
+                    </if>
+        </where>
+    </select>
+
+    <delete id="deleteByTaskContentId">
+        delete from r_rfeu_task_file where r_rfeu_task_content_id = #{id}
+    </delete>
+
+    <select id="selectByTaskContentId" parameterType="long" resultMap="rRfeuTaskFileMap">
+        select * from r_rfeu_task_file where r_rfeu_task_content_id = #{id}
+    </select>
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/RfeuTaskContentMapper.xml b/dl-module-knowledge/src/main/resources/mapper/RfeuTaskContentMapper.xml
new file mode 100644
index 00000000..c3358f28
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/RfeuTaskContentMapper.xml
@@ -0,0 +1,18 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.RfeuTaskContentMapper">
+
+    <select id="getListBy" resultType="cn.iocoder.yudao.module.knowledge.entity.RfeuTaskContent"
+            parameterType="java.lang.Long">
+        select  rrtc.*,tru.username,trc.file_name from r_rfeu_task_content rrtc
+        inner join t_rfeu_task trt on trt.id = rrtc.task_id and trt.deleted = 0
+        inner join t_rfe_user tru on tru.usercode = trt.user_id and tru.ref_code = rrtc.execution_id and tru.deleted = 0
+        inner join t_rfe_content trc on trc.id = rrtc.content_id
+        where
+            rrtc.deleted = 0
+         and rrtc.execution_id = #{executionId}
+        order by trt.user_id
+
+    </select>
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TArchivesMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TArchivesMapper.xml
new file mode 100644
index 00000000..b1fe3693
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TArchivesMapper.xml
@@ -0,0 +1,192 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TArchivesMapper">
+
+
+    <select id="selectTArchivesList" parameterType="cn.iocoder.yudao.module.knowledge.entity.TArchives"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select
+        base.id,base.parent_id,base.orders,base.code,base.original_filename,base.cur_filename,base.file_url,base.file_size,base.is_dir,base.deleted,base.is_recycled,base.type,base.creator,base.creator_id,base.create_time,base.update_time,base.dept_id,base.identity_id
+        from t_archives base
+        <if test=" param.isRecycled == '0'.toString()">
+            LEFT JOIN t_archives par on par.id = base.parent_id
+        </if>
+        <where>
+            base.deleted = 0
+            <choose>
+                <when test="param.parentId!=null">
+                    and base.parent_id = #{param.parentId}
+                </when>
+                <otherwise>
+                    <choose>
+                        <when test="param.isRecycled == '0'.toString()">
+                            and ( base.parent_id is null or par.is_recycled='1')
+                        </when>
+                        <otherwise>
+                            and base.parent_id is null
+                        </otherwise>
+                    </choose>
+                </otherwise>
+            </choose>
+            <if test="param.type!=null and param.type!=''">
+                and (base.type = #{param.type} or base.type = 0)
+            </if>
+            <if test="param.originalFilename!=null and param.originalFilename!=''">
+                and base.cur_filename like concat('%', #{param.originalFilename},'%')
+            </if>
+
+            and base.is_recycled = #{param.isRecycled}
+
+            order by base.orders desc,base.is_dir,base.create_time desc
+        </where>
+    </select>
+    <select id="selectTArchivesListOfName" parameterType="cn.iocoder.yudao.module.knowledge.entity.TArchives"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select
+        base.id,base.parent_id,base.orders,base.code,base.original_filename,base.cur_filename,base.file_url,base.file_size,base.is_dir,base.deleted,base.is_recycled,base.type,base.creator,base.creator_id,base.create_time,base.update_time,base.dept_id,base.identity_id
+        from t_archives base
+        <where>
+            base.deleted = 0
+            <if test="param.type!=null and param.type!=''">
+                and (base.type = #{param.type} or base.type = 0)
+            </if>
+            <if test="param.originalFilename!=null and param.originalFilename!=''">
+                and base.cur_filename like concat('%', #{param.originalFilename},'%')
+            </if>
+            <if test="param.code!=null and param.code!=''">
+                and base.code like concat(#{param.code},'%')
+            </if>
+            and base.is_recycled = #{param.isRecycled}
+
+            order by base.orders desc, base.is_dir,base.create_time desc
+        </where>
+    </select>
+    <select id="findAllDoc" parameterType="cn.iocoder.yudao.module.knowledge.entity.TArchives"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select
+        base.id,base.parent_id,base.code,base.original_filename,base.cur_filename,base.file_url,base.file_size,base.is_dir,base.deleted,base.is_recycled,base.type,base.creator,base.creator_id,base.create_time,base.update_time,base.dept_id,base.identity_id
+        from t_archives base
+        <where>
+            base.is_dir = 1
+            and base.deleted = 0
+            <if test="param.originalFilename!=null and param.originalFilename!=''">
+                and base.original_filename like concat('%', #{param.originalFilename},'%')
+            </if>
+            <if test="param.parentId!=null and param.parentId!=''">
+                and base.code like concat('%',#{param.parentId},'%')
+            </if>
+            and base.is_recycled = '1'
+            order by base.is_dir,base.create_time desc
+        </where>
+    </select>
+
+    <select id="getParByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        where is_dir = 0
+          and #{code} like concat(code, '%')
+    </select>
+
+    <select id="selectByCondition" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        <where>
+            <if test="param.parentId != null ">and parent_id = #{param.parentId}</if>
+            <if test="param.curFilename != null ">and cur_filename = #{param.curFilename}</if>
+            <if test="param.code != null ">and code = #{param.code}</if>
+        </where>
+    </select>
+
+    <select id="selectOnleByCondition" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        <where>
+            deleted = 0 and is_recycled = 1
+            and parent_id = #{param.parentId}
+            <if test="param.curFilename != null ">and cur_filename = #{param.curFilename}</if>
+        </where>
+        order by create_time desc
+        limit 1
+    </select>
+
+    <select id="selectOneByCondition" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        <where>
+            deleted = 0
+            and parent_id = #{param.parentId}
+            <if test="param.curFilename != null ">and cur_filename = #{param.curFilename}</if>
+            <if test="param.originalFilename != null ">and original_filename = #{param.originalFilename}</if>
+            <if test="param.type != null ">and type = #{param.type}</if>
+        </where>
+        order by create_time desc
+        limit 1
+    </select>
+
+    <select id="selectOnleByConditionDir" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        <where>
+            deleted = 0 and is_recycled = 1
+            and parent_id IS NULL
+            <if test="param.curFilename != null ">and cur_filename = #{param.curFilename}</if>
+            <if test="param.type != null ">and type = #{param.type}</if>
+        </where>
+    </select>
+
+    <select id="findAllDocList" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        <where>
+            deleted = 0
+            and is_dir =1
+            <if test="param.curFilename != null ">and cur_filename like concat('%',#{param.curFilename},'%') </if>
+            <if test="param.originalFilename != null ">and original_filename like concat('%',#{param.originalFilename},'%')</if>
+        </where>
+    </select>
+
+    <select id="selectByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        <where>
+            <if test="code != null ">and code = #{code}</if>
+        </where>
+    </select>
+    <select id="getParentId" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        <where>
+            <if test="id != null ">and id = #{id}</if>
+        </where>
+    </select>
+
+    <select id="selectOneByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        <where>
+            is_dir ='1' and deleted='0'
+            <if test="code != null and code!='' ">and code like concat(#{code},'%')</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectByArchivId" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        where parent_id = (select id from t_archives where parent_id = #{parentId} and cur_filename = '归档')
+          and cur_filename = '2024'
+    </select>
+
+    <select id="selectByArchivParentId" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select * from t_archives where parent_id = #{parentId} and cur_filename = '归档'
+    </select>
+
+    <select id="appFindByParentId" resultType="cn.iocoder.yudao.module.knowledge.entity.TArchives">
+        select *
+        from t_archives
+        where
+            deleted = 0
+            and type =#{param.type}
+            and parent_id = #{param.parentId}
+    </select>
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationCandidateMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationCandidateMapper.xml
new file mode 100644
index 00000000..c017eddc
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationCandidateMapper.xml
@@ -0,0 +1,26 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TBidConfirmationCandidateMapper">
+
+
+    <select id="selectByConfirmId" resultType="cn.iocoder.yudao.module.knowledge.entity.TBidConfirmationCandidate">
+        SELECT
+            id AS id,
+            orders AS orders,
+            tender_offer AS tenderOffer,
+            candidate_name AS candidateName,
+            create_time AS createTime,
+            update_time AS updateTime
+        FROM
+            t_bid_confirmation_candidate
+        WHERE
+            bid_confirmation_id = #{id}
+          AND deleted = 0
+        ORDER BY
+            orders DESC
+    </select>
+
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationMapper.xml
new file mode 100644
index 00000000..41a0452d
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationMapper.xml
@@ -0,0 +1,150 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TBidConfirmationMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TBidConfirmation" id="tBidConfirmationMap">
+        <result property="id" column="id"/>
+        <result property="tag" column="tag"/>
+        <result property="companyName" column="company_name"/>
+        <result property="title" column="title"/>
+        <result property="bigCode" column="big_code"/>
+        <result property="projectName" column="project_name"/>
+        <result property="tenderee" column="tenderee"/>
+        <result property="letterDateYear" column="letter_date_year"/>
+        <result property="letterDateMonth" column="letter_date_month"/>
+        <result property="winBidTime" column="win_bid_time"/>
+        <result property="letterDateDay" column="letter_date_day"/>
+        <result property="winBidDes" column="win_bid_des"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="identityId" column="identity_id"/>
+        <result property="deleted" column="deleted"/>
+    </resultMap>
+
+    <select id="pageAllTag" resultType="cn.iocoder.yudao.module.knowledge.controller.requestdto.BidManagementRequest">
+        SELECT
+            *
+        FROM
+            (
+                (
+                    SELECT
+                        tbc.id AS id,
+                        tbc.tag AS tag,
+                        tbc.title AS title,
+                        tbc.create_time AS createTime,
+                        tbc.file_size AS fileSize,
+                        tbc.file_name AS fileName,
+                        tbc.file_url AS fileUrl
+                    FROM
+                        t_bid_confirmation tbc
+                            LEFT JOIN t_fileinfo tfi ON tfi.bind_id = tbc.id AND tfi.deleted = 0
+                    WHERE
+                        tbc.deleted = 0
+                ) UNION ALL
+                (
+                    SELECT
+                        tbp.id AS id,
+                        tbp.tag AS tag,
+                        tbp.project_name AS title,
+                        tbp.create_time AS createTime,
+                        tbp.file_size AS fileSize,
+                        tbp.file_name AS fileName,
+                        tbp.file_url AS fileUrl
+                    FROM
+                        t_bid_plan tbp
+                            LEFT JOIN t_fileinfo tfi ON tfi.bind_id = tbp.id AND tfi.deleted = 0
+                    WHERE
+                        tbp.deleted = 0
+                )
+            ) AS t
+        <where>
+            <if test="dto.title != '' and dto.title != null">
+                AND t.title LIKE CONCAT( '%',#{dto.title}, '%')
+            </if>
+            <if test="dto.tag != '' and dto.tag != null">
+                AND t.tag = #{dto.tag}
+            </if>
+            <if test="dto.createTime != null">
+                AND DATE(t.createTime) = #{dto.createTime}
+            </if>
+        </where>
+        ORDER BY
+            t.createTime DESC
+    </select>
+
+    <select id="appPage" resultType="cn.iocoder.yudao.module.knowledge.controller.requestdto.BidManagementRequest">
+        SELECT
+        *
+        FROM
+        (
+        (
+        SELECT
+        tbc.id AS id,
+        tbc.tag AS tag,
+        tbc.title AS title,
+        tbc.create_time AS createTime,
+        tbc.file_size AS fileSize,
+        tbc.file_name AS fileName,
+        tbc.file_url AS fileUrl
+        FROM
+        t_bid_confirmation tbc
+        LEFT JOIN t_fileinfo tfi ON tfi.bind_id = tbc.id AND tfi.deleted = 0
+        WHERE
+        tbc.deleted = 0
+        ) UNION ALL
+        (
+        SELECT
+        tbp.id AS id,
+        tbp.tag AS tag,
+        tbp.project_name AS title,
+        tbp.create_time AS createTime,
+        tbp.file_size AS fileSize,
+        tbp.file_name AS fileName,
+        tbp.file_url AS fileUrl
+        FROM
+        t_bid_plan tbp
+        LEFT JOIN t_fileinfo tfi ON tfi.bind_id = tbp.id AND tfi.deleted = 0
+        WHERE
+        tbp.deleted = 0
+        )
+        ) AS t
+        <where>
+            <if test="dto.title != '' and dto.title != null">
+                AND t.title LIKE CONCAT( '%',#{dto.title}, '%')
+            </if>
+            <if test="dto.tag != '' and dto.tag != null">
+                AND t.tag = #{dto.tag}
+            </if>
+            <if test="dto.createTime != null">
+                AND DATE(t.createTime) = #{dto.createTime}
+            </if>
+        </where>
+        ORDER BY
+        t.createTime DESC
+    </select>
+
+    <update id="filling">
+        UPDATE t_bid_confirmation
+        SET
+            is_filing = '1'
+        WHERE id = #{id}
+    </update>
+
+    <select id="judgeIsFilling" resultType="int">
+        SELECT COUNT(1)
+                   is_filing
+        FROM
+            t_bid_confirmation
+        WHERE
+            is_filing = '1'
+          AND
+            id = #{id}
+          AND
+            deleted = 0
+    </select>
+
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TBidPlanMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TBidPlanMapper.xml
new file mode 100644
index 00000000..7021e545
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TBidPlanMapper.xml
@@ -0,0 +1,36 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TBidPlanMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TBidPlan" id="tBidPlanMap">
+        <result property="id" column="id"/>
+        <result property="tag" column="tag"/>
+        <result property="projectName" column="project_name"/>
+        <result property="committee" column="committee"/>
+        <result property="authorizedStrength" column="authorized_strength"/>
+        <result property="audit" column="audit"/>
+        <result property="approval" column="approval"/>
+        <result property="projectDate" column="project_date"/>
+        <result property="auditDate" column="audit_date"/>
+        <result property="stampDate" column="stamp_date"/>
+        <result property="bidTeam" column="bid_team"/>
+        <result property="responsibility" column="responsibility"/>
+        <result property="overview" column="overview"/>
+        <result property="researchSituation" column="research_situation"/>
+        <result property="engineering" column="engineering"/>
+        <result property="equipment" column="equipment"/>
+        <result property="materials" column="materials"/>
+        <result property="service" column="service"/>
+        <result property="rests" column="rests"/>
+    </resultMap>
+
+
+    <update id="filling">
+        UPDATE t_bid_plan
+        SET
+            is_filing = '1'
+        WHERE id = #{id}
+    </update>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TCourseMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TCourseMapper.xml
new file mode 100644
index 00000000..8f9f50f9
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TCourseMapper.xml
@@ -0,0 +1,61 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TCourseMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TCourse" id="tCourseMap">
+        <result property="id" column="id"/>
+        <result property="courseDirectoryId" column="course_directory_id"/>
+        <result property="name" column="name"/>
+        <result property="desrc" column="desrc"/>
+    </resultMap>
+    <update id="updateDirectoryNameByDirectoryId">
+        update t_course
+        set course_directory_name = #{directoryName}
+        where course_directory_id = #{directoryId}
+          and deleted = 0
+    </update>
+    <select id="queryIdsByDirectoryId" resultType="java.lang.Long">
+        select id
+        from t_course
+        where course_directory_id = #{directoryId}
+          and deleted = 0
+    </select>
+    <select id="queryPage" resultType="cn.iocoder.yudao.module.knowledge.entity.TCourse">
+        select *
+        from t_course
+        <where>
+            deleted = 0
+            <if test="tcourseRequest.name != null and tcourseRequest.name != ''">
+                and name like concat('%', #{tcourseRequest.name}, '%')
+            </if>
+            <if test="tcourseRequest.courseDirectoryName != null and tcourseRequest.courseDirectoryName != ''">
+                and course_directory_name = #{tcourseRequest.courseDirectoryName}
+            </if>
+            <if test="tcourseRequest.courseDirectoryIdList != null and tcourseRequest.courseDirectoryIdList.size > 0">
+                and course_directory_id in
+                <foreach collection="tcourseRequest.courseDirectoryIdList" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+    <select id="queryByName" resultType="cn.iocoder.yudao.module.knowledge.entity.TCourse">
+        select *
+        from t_course
+        where name = #{name}
+          and deleted = 0
+    </select>
+    <select id="queryIdsByDirectoryIds" resultType="java.lang.Long">
+        select id from t_course
+        where course_directory_id in
+        <foreach collection="directoryIds" item="item" index="index"
+                 open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and deleted = 0
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TCoursePushMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TCoursePushMapper.xml
new file mode 100644
index 00000000..a9e2bd02
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TCoursePushMapper.xml
@@ -0,0 +1,47 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TCoursePushMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TCoursePush" id="tCoursePushMap">
+            <result property="id" column="id"/>
+            <result property="name" column="name"/>
+            <result property="fileUrl" column="file_url"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="deptId" column="dept_id"/>
+            <result property="identityId" column="identity_id"/>
+            <result property="deleted" column="deleted"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,name,file_url,create_time,update_time,dept_id,identity_id,deleted
+    </sql>
+
+    <select id="findList" resultType="cn.iocoder.yudao.module.knowledge.entity.TCoursePush">
+        select * from t_course_push where deleted = 0 and date(create_time) = curdate()
+    </select>
+
+    <select id="getPushConfig" resultType="cn.iocoder.yudao.module.knowledge.entity.TCoursePush">
+        select * from t_course_push where deleted = 0 and date(create_time) = curdate() limit 1
+    </select>
+
+
+    <select id="findListForApp" resultType="cn.iocoder.yudao.module.knowledge.entity.TCoursePush">
+        select * from t_course_push
+        <where>
+            deleted = 0
+            and status = '1'
+            <if test="params.pushTime != null">
+                and push_time between #{params.pushTimeStart} and #{params.pushTime}
+            </if>
+        </where>
+        order by push_time desc
+    </select>
+
+    <select id="selectTodayCourse" resultType="cn.iocoder.yudao.module.knowledge.entity.TCoursePush">
+        select * from t_course_push where deleted = 0 and date(create_time) = curdate() limit 1
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TCourseRecordsMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TCourseRecordsMapper.xml
new file mode 100644
index 00000000..637e5585
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TCourseRecordsMapper.xml
@@ -0,0 +1,52 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TCourseRecordsMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TCourseRecords" id="tCourseRecordsMap">
+            <result property="id" column="id"/>
+            <result property="userId" column="user_id"/>
+            <result property="courseId" column="course_id"/>
+            <result property="continueTime" column="continue_time"/>
+            <result property="createTime" column="create_time"/>
+            <result property="creator" column="creator"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="deptId" column="dept_id"/>
+            <result property="identityId" column="identity_id"/>
+            <result property="deleted" column="deleted"/>
+            <result property="tenantId" column="tenant_id"/>
+    </resultMap>
+
+    <select id="findList" resultMap="tCourseRecordsMap">
+        select continue_time,create_time
+        from t_course_records
+        <where>
+            deleted = 0
+            and create_time >= CURDATE() - INTERVAL 6 DAY
+            <if test="params.userId != null ">and user_id = #{params.userId}</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="findOne" resultMap="tCourseRecordsMap">
+        select continue_time,create_time
+        from t_course_records
+        <where>
+            deleted = 0
+            and DATE(create_time) = curdate()
+            <if test="userId != null ">and user_id = #{userId}</if>
+        </where>
+    </select>
+
+    <select id="findByCourseAnuserId" resultMap="tCourseRecordsMap">
+        select *
+        from t_course_records
+        <where>
+            deleted = 0
+            and DATE(create_time) = curdate()
+            <if test="params.userId != null ">and user_id = #{params.userId}</if>
+            <if test="params.courseId != null ">and course_id = #{params.courseId}</if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TCoursewareMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TCoursewareMapper.xml
new file mode 100644
index 00000000..b138a16e
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TCoursewareMapper.xml
@@ -0,0 +1,40 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TCoursewareMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TCourseware" id="tCoursewareMap">
+        <result property="id" column="id"/>
+        <result property="courseId" column="course_id"/>
+        <result property="name" column="name"/>
+        <result property="desrc" column="desrc"/>
+        <result property="code" column="code"/>
+        <result property="order" column="order"/>
+        <result property="fileUrl" column="file_url"/>
+        <result property="fileName" column="file_name"/>
+        <result property="fileSize" column="file_size"/>
+    </resultMap>
+    <delete id="deleteByCourseIds">
+        delete from t_courseware where course_id in
+        <foreach collection="courseIdList" item="courseId" open="(" separator="," close=")">
+            #{courseId}
+        </foreach>
+        AND deleted = 0
+    </delete>
+    <select id="queryListByCourseId" resultType="cn.iocoder.yudao.module.knowledge.entity.TCourseware">
+        select * from t_courseware where course_id = #{courseId} and deleted = 0
+    </select>
+
+    <select id="findList" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.TCoursewarevos">
+        select tc.id id,tc.name name,tco.name courseName,tcd.name dirName,tc.file_url
+        from t_courseware tc
+        inner join t_course tco on tc.course_id = tco.id
+        inner join t_course_directory tcd on tco.course_directory_id = tcd.id
+        <where>
+            <if test="params.name != null and params.name != ''">
+                tc.name LIKE CONCAT( '%',#{params.name}, '%')
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TExpertMaintenanceMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TExpertMaintenanceMapper.xml
new file mode 100644
index 00000000..41e7bd49
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TExpertMaintenanceMapper.xml
@@ -0,0 +1,99 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TExpertMaintenanceMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TExpertMaintenance" id="tExpertMaintenanceMap">
+            <result property="id" column="id"/>
+            <result property="tagNum" column="tag_num"/>
+            <result property="tagName" column="tag_name"/>
+            <result property="expertNum" column="expert_num"/>
+            <result property="expertIds" column="expert_ids"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="deptId" column="dept_id"/>
+            <result property="identityId" column="identity_id"/>
+            <result property="deleted" column="deleted"/>
+        <result property="expertNames" column="expert_names"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,tag_num,tag_name,expert_num,expert_ids,create_time,update_time,dept_id,identity_id,deleted
+    </sql>
+    <update id="deleteByid">
+        update t_expert_maintenance set deleted = 1 where id = #{id}
+    </update>
+    <select id="findList" resultMap="tExpertMaintenanceMap">
+        select
+        tem.id,tem.tag_num,tem.tag_name,tem.create_time,tem.update_time,tem.dept_id,tem.identity_id,tem.deleted,GROUP_CONCAT(te.username) as expert_names,sum(IF(te.id is null,0, 1)) as expert_num
+        from t_expert_maintenance tem
+        left join t_expert te on te.domain_expert = tem.id
+        <where>
+            tem.deleted = 0
+                    <if test="params.tagNum != null and params.tagNum != ''">
+                          and  tem.tag_num like CONCAT( '%',#{params.tagNum}, '%')
+                    </if>
+                    <if test="params.tagName != null and params.tagName != ''">
+                        and  tem.tag_name  LIKE CONCAT( '%',#{params.tagName},'%')
+                    </if>
+                    <if test="params.expertNum != null">
+                        and tem.expert_num = #{params.expertNum}
+                    </if>
+                    <if test="params.expertIds != null and params.expertIds != ''">
+                        and   tem.expert_ids like CONCAT( '%',#{params.expertIds}, '%')
+                    </if>
+                    <if test="params.createTime != null">
+                        and tem.create_time = #{params.createTime}
+                    </if>
+                    <if test="params.updateTime != null">
+                        and  tem.update_time = #{params.updateTime}
+                    </if>
+        </where>
+        group by tem.id
+        ORDER BY
+        tem.create_time DESC
+    </select>
+
+    <select id="selectList" resultMap="tExpertMaintenanceMap">
+        select
+        tem.id,tem.tag_num,tem.tag_name,tem.create_time,tem.update_time,tem.dept_id,tem.identity_id,tem.deleted,GROUP_CONCAT(te.username) as expert_names,count(1) as expert_num
+        from t_expert_maintenance tem
+        left join t_expert te on te.domain_expert = tem.id
+        <where>
+            tem.deleted = 0
+            <if test="params.tagNum != null and params.tagNum != ''">
+                and  tem.tag_num like CONCAT( '%',#{params.tagNum}, '%')
+            </if>
+            <if test="params.tagName != null and params.tagName != ''">
+                and  tem.tag_name  LIKE CONCAT( '%',#{params.tagName},'%')
+            </if>
+            <if test="params.expertNum != null">
+                and tem.expert_num = #{params.expertNum}
+            </if>
+            <if test="params.expertIds != null and params.expertIds != ''">
+                and   tem.expert_ids like CONCAT( '%',#{params.expertIds}, '%')
+            </if>
+            <if test="params.createTime != null">
+                and tem.create_time = #{params.createTime}
+            </if>
+            <if test="params.updateTime != null">
+                and  tem.update_time = #{params.updateTime}
+            </if>
+        </where>
+        group by tem.id
+        ORDER BY
+        tem.create_time DESC
+    </select>
+
+    <select id="selectExpertTags" resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.ExpertTags">
+        SELECT
+        t.id
+        ,t.tag_name
+        , substring_index(substring_index(t.expert_ids, ',', b.help_topic_id + 1), ',', - 1) AS expertTagNum
+        FROM t_expert_maintenance t
+        INNER JOIN mysql.help_topic b
+        ON (length(t.expert_ids) - length(REPLACE(t.expert_ids, ',', '')) + 1) > b.help_topic_id  having expertTagNum = #{id}
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TExpertMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TExpertMapper.xml
new file mode 100644
index 00000000..77988324
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TExpertMapper.xml
@@ -0,0 +1,83 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TExpertMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TExpert" id="tExpertMap">
+            <result property="id" column="id"/>
+            <result property="username" column="username"/>
+            <result property="usercode" column="usercode"/>
+            <result property="phone" column="phone"/>
+            <result property="sex" column="sex"/>
+            <result property="headPortrait" column="head_portrait"/>
+            <result property="educationBackground" column="education_background"/>
+            <result property="introduce" column="introduce"/>
+            <result property="domainExpert" column="domain_expert"/>
+            <result property="post" column="post"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="deptId" column="dept_id"/>
+            <result property="identityId" column="identity_id"/>
+            <result property="deleted" column="deleted"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,username,usercode,phone,sex,head_portrait,education_background,introduce,domain_expert,post,create_time,update_time,dept_id,identity_id,deleted
+    </sql>
+    <update id="deleteByid">
+        update t_expert set deleted = 1 where id = #{id}
+    </update>
+    <select id="findList" resultMap="tExpertMap">
+        select
+        <include refid="columns"/>
+        from t_expert
+        <where>
+            deleted = 0
+                    <if test="params.username != null and params.username != ''">
+                        and  username = #{params.username}
+                    </if>
+                    <if test="params.usercode != null and params.usercode != ''">
+                        and  usercode = #{params.usercode}
+                    </if>
+                    <if test="params.phone != null and params.phone != ''">
+                        and   phone = #{params.phone}
+                    </if>
+                    <if test="params.sex != null and params.sex != ''">
+                        and  sex = #{params.sex}
+                    </if>
+                    <if test="params.headPortrait != null and params.headPortrait != ''">
+                        and  head_portrait = #{params.headPortrait}
+                    </if>
+                    <if test="params.educationBackground != null and params.educationBackground != ''">
+                        and   education_background = #{params.educationBackground}
+                    </if>
+                    <if test="params.introduce != null and params.introduce != ''">
+                        and   introduce = #{params.introduce}
+                    </if>
+                    <if test="params.domainExpert != null and params.domainExpert != ''">
+                        and  domain_expert = #{params.domainExpert}
+                    </if>
+                    <if test="params.post != null and params.post != ''">
+                        and  post = #{params.post}
+                    </if>
+                    <if test="params.createTime != null">
+                        and create_time = #{params.createTime}
+                    </if>
+                    <if test="params.updateTime != null">
+                        and update_time = #{params.updateTime}
+                    </if>
+                    <if test="params.deptId != null and params.deptId != ''">
+                        and   dept_id = #{params.deptId}
+                    </if>
+                    <if test="params.identityId != null and params.identityId != ''">
+                        and   identity_id = #{params.identityId}
+                    </if>
+        </where>
+    </select>
+    <select id="selectByUsercode" resultType="cn.iocoder.yudao.module.knowledge.entity.TExpert">
+        select * from t_expert
+        where usercode = #{usercode} and deleted = 0
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCollectionMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCollectionMapper.xml
new file mode 100644
index 00000000..1f245085
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCollectionMapper.xml
@@ -0,0 +1,62 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TExpertZoneCollectionMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TExpertZoneCollection" id="tExpertZoneCollectionMap">
+            <result property="id" column="id"/>
+            <result property="specialistId" column="specialist_id"/>
+            <result property="expertZoneId" column="expert_zone_id"/>
+            <result property="userId" column="user_id"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="deptId" column="dept_id"/>
+            <result property="identityId" column="identity_id"/>
+            <result property="deleted" column="deleted"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,specialist_id,expert_zone_id,user_id,create_time,update_time,dept_id,identity_id,deleted
+    </sql>
+    <select id="findList" resultMap="tExpertZoneCollectionMap">
+        select
+        <include refid="columns"/>
+        from t_expert_zone_collection
+        <where>
+                    <if test="id != null">
+                        id = #{id}
+                    </if>
+                    <if test="specialistId != null">
+                        specialist_id = #{specialistId}
+                    </if>
+                    <if test="expertZoneId != null">
+                        expert_zone_id = #{expertZoneId}
+                    </if>
+                    <if test="userId != null">
+                        user_id = #{userId}
+                    </if>
+                    <if test="createTime != null">
+                        create_time = #{createTime}
+                    </if>
+                    <if test="updateTime != null">
+                        update_time = #{updateTime}
+                    </if>
+                    <if test="deptId != null and deptId != ''">
+                            dept_id = #{deptId}
+                    </if>
+                    <if test="identityId != null and identityId != ''">
+                            identity_id = #{identityId}
+                    </if>
+                    <if test="deleted != null">
+                        deleted = #{deleted}
+                    </if>
+        </where>
+    </select>
+    <select id="selectByUserIdAndZoneId"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TExpertZoneCollection">
+        SELECT * FROM t_expert_zone_collection
+                 WHERE user_id = #{userId} AND expert_zone_id = #{zoneId} AND deleted = 0
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCommentMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCommentMapper.xml
new file mode 100644
index 00000000..69bc67e9
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCommentMapper.xml
@@ -0,0 +1,81 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TExpertZoneCommentMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TExpertZoneComment" id="tExpertZoneCommentMap">
+            <result property="id" column="id"/>
+            <result property="expertZoneId" column="expert_zone_id"/>
+            <result property="commentLevel" column="comment_level"/>
+            <result property="commentContent" column="comment_content"/>
+            <result property="userId" column="user_id"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="deptId" column="dept_id"/>
+            <result property="identityId" column="identity_id"/>
+            <result property="deleted" column="deleted"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,expert_zone_id,comment_level,comment_content,user_id,create_time,update_time,dept_id,identity_id,deleted,comment_type,comment_username
+    </sql>
+    <select id="findList" resultMap="tExpertZoneCommentMap">
+        select
+        <include refid="columns"/>
+        from t_expert_zone_comment
+        <where>
+            deleted = 0
+                    <if test="params.expertZoneId != null">
+                      and  expert_zone_id = #{params.expertZoneId}
+                    </if>
+                    <if test="params.commentLevel != null and params.commentLevel != ''">
+                        and    comment_level = #{params.commentLevel}
+                    </if>
+                    <if test="params.commentContent != null and params.commentContent != ''">
+                        and    comment_content = #{params.commentContent}
+                    </if>
+                    <if test="params.userId != null">
+                        and  user_id = #{params.userId}
+                    </if>
+                    <if test="params.pid == null">
+                        and  pid is NULL
+                    </if>
+                    <if test="params.createTime != null">
+                        and  create_time = #{params.createTime}
+                    </if>
+        </where>
+        ORDER BY create_time ASC
+    </select>
+    <select id="selectTotalByZoneId" resultType="java.lang.Integer">
+        SELECT COUNT(1) FROM t_expert_zone_comment WHERE expert_zone_id = #{zoneId} AND deleted = 0
+    </select>
+    <select id="selectList" resultType="cn.iocoder.yudao.module.knowledge.entity.TExpertZoneComment">
+        select
+        <include refid="columns"/>
+        from t_expert_zone_comment
+        <where>
+            deleted = 0
+            <if test="params.expertZoneId != null">
+                and  expert_zone_id = #{params.expertZoneId}
+            </if>
+            <if test="params.commentLevel != null and params.commentLevel != ''">
+                and    comment_level = #{params.commentLevel}
+            </if>
+            <if test="params.commentContent != null and params.commentContent != ''">
+                and    comment_content = #{params.commentContent}
+            </if>
+            <if test="params.userId != null">
+                and  user_id = #{params.userId}
+            </if>
+            <if test="params.pid != null">
+                and  pid = #{params.pid}
+            </if>
+            <if test="params.createTime != null">
+                and  create_time = #{params.createTime}
+            </if>
+        </where>
+        ORDER BY create_time ASC
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TExpertZoneMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneMapper.xml
new file mode 100644
index 00000000..4558c513
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneMapper.xml
@@ -0,0 +1,66 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TExpertZoneMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TExpertZone" id="tExpertZoneMap">
+            <result property="id" column="id"/>
+            <result property="title" column="title"/>
+            <result property="content" column="content"/>
+            <result property="specialistId" column="specialist_id"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="deptId" column="dept_id"/>
+            <result property="identityId" column="identity_id"/>
+            <result property="deleted" column="deleted"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,title,content,specialist_id,create_time,update_time,dept_id,identity_id,deleted
+    </sql>
+    <update id="deleteByid">
+        update t_expert_zone set deleted = 1 where id = #{id}
+    </update>
+    <select id="findList" resultMap="tExpertZoneMap">
+        select
+        <include refid="columns"/>
+        from t_expert_zone
+        <where>
+            deleted = 0
+                    <if test="params.title != null and params.title != ''">
+                         and   title LIKE CONCAT( '%', #{params.title}, '%')
+                    </if>
+                    <if test="params.content != null and params.content != ''">
+                        and  content LIKE CONCAT( '%', #{params.content}, '%')
+                    </if>
+                    <if test="params.specialistId != null">
+                        and specialist_id = #{params.specialistId}
+                    </if>
+                    <if test="params.createTime != null">
+                        and create_time = #{params.createTime}
+                    </if>
+        </where>
+    </select>
+    <select id="queryAll" resultType="cn.iocoder.yudao.module.knowledge.entity.TExpertZone">
+        select
+        <include refid="columns"/>
+        from t_expert_zone
+        <where>
+            deleted = 0
+            <if test="params.title != null and params.title != ''">
+                and   title LIKE CONCAT( '%', #{params.title}, '%')
+            </if>
+            <if test="params.content != null and params.content != ''">
+                and  content LIKE CONCAT( '%', #{params.content}, '%')
+            </if>
+            <if test="params.specialistId != null">
+                and specialist_id = #{params.specialistId}
+            </if>
+            <if test="params.createTime != null">
+                and create_time = #{params.createTime}
+            </if>
+        </where>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/resources/mapper/TFileInfoMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TFileInfoMapper.xml
new file mode 100644
index 00000000..4d74dd2f
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TFileInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TFileInfoMapper">
+
+
+    <select id="selectByPlanId" resultType="cn.iocoder.yudao.module.knowledge.entity.TFileInfo">
+        SELECT
+            id AS id,
+            `code` AS `code`,
+            file_url AS fileUrl,
+            file_size AS fileSize,
+            file_lenght AS fileLenght,
+            original_name AS originalName,
+            cur_name AS curName,
+            `order` AS `order`,
+            creator AS creator,
+            creator_id AS creatorId,
+            create_time AS createTime,
+            update_time AS updateTime
+        FROM
+            `t_fileinfo`
+        WHERE
+            bind_id = #{id}
+          AND deleted = 0
+    </select>
+
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TLawsMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TLawsMapper.xml
new file mode 100644
index 00000000..2d2e8008
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TLawsMapper.xml
@@ -0,0 +1,148 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TLawsMapper">
+    <resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.knowledge.entity.TLaws">
+        <id column="ID" property="id" jdbcType="BIGINT"/>
+        <result column="CODE" property="code" jdbcType="VARCHAR"/>
+        <result column="NAME" property="name" jdbcType="VARCHAR"/>
+        <result column="VERSION" property="version" jdbcType="VARCHAR"/>
+        <result column="FILE_URL" property="fileUrl" jdbcType="VARCHAR"/>
+        <result column="FILE_SIZE" property="fileSize" jdbcType="VARCHAR"/>
+        <result column="FILE_NAME" property="fileName" jdbcType="VARCHAR"/>
+        <result column="FILE_TIME" property="filingTime" jdbcType="DATE"/>
+        <result column="IS_FILING" property="isFiling" jdbcType="INTEGER"/>
+        <result column="DELETED" property="deleted" jdbcType="INTEGER"/>
+        <result column="CREATOR" property="creator" jdbcType="VARCHAR"/>
+        <result column="CREATOR_ID" property="creatorId" jdbcType="BIGINT"/>
+        <result column="CREATE_TIME" property="createTime" jdbcType="DATE"/>
+        <result column="UPDATE_TIME" property="updateTime" jdbcType="DATE"/>
+
+    </resultMap>
+<sql id="column">
+    id,CODE,NAME,version,file_url,file_size,file_name,filing_time,is_filing,deleted,laws_a,laws_b,creator,creator_id,create_time,update_time,dept_id,identity_id,describe_info,type,tenant_id
+</sql>
+    <update id="updateByLawId">
+        UPDATE t_laws
+        SET
+            code = #{dto.code},
+            version = #{dto.version},
+            file_url = #{dto.fileUrl},
+            file_size = #{dto.fileSize},
+            file_name = #{dto.fileName},
+            describe_info = #{dto.describeInfo}
+
+        WHERE
+            id = #{dto.id}
+    </update>
+
+    <update id="deleteByIds">
+        UPDATE t_laws
+        SET
+            deleted = 0
+        WHERE id = #{id}
+    </update>
+
+    <update id="filling">
+        UPDATE t_laws
+        SET
+            is_filing = '1'
+        WHERE id = #{id}
+    </update>
+
+    <select id="judgeIsFilling" resultType="int">
+        SELECT COUNT(1)
+           is_filing
+        FROM
+            t_laws
+        WHERE
+            is_filing = '1'
+          AND
+            id = #{id}
+          AND
+            deleted = 0
+    </select>
+
+
+    <select id="getListPage" resultType="cn.iocoder.yudao.module.knowledge.entity.TLaws">
+        SELECT
+           <include refid="column"></include>
+        FROM
+            t_laws
+        WHERE
+            deleted = 0 AND is_filing!=1
+            <if test="dto.name != '' and dto.name != null">
+                AND `name` LIKE CONCAT( '%',#{dto.name}, '%')
+            </if>
+        <if test=" dto.createTime != null">
+            AND create_time >= #{dto.createTime}
+            AND DATE(create_time) = #{dto.createTime}
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+    <select id="selectForApp" resultType="cn.iocoder.yudao.module.knowledge.entity.TLaws">
+        SELECT
+        <include refid="column"></include>
+        FROM
+        t_laws
+        WHERE
+        deleted = 0 AND is_filing!=1
+        <if test="dto.name != '' and dto.name != null">
+            AND `name` LIKE CONCAT( '%',#{dto.name}, '%')
+        </if>
+        <if test=" dto.createTime != null">
+            AND create_time >= #{dto.createTime}
+            AND DATE(create_time) = #{dto.createTime}
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+
+    <select id="findAllDocuments" resultType="cn.iocoder.yudao.module.knowledge.entity.TLaws">
+        SELECT * from
+        (select
+        id AS id,
+        NAME AS NAME,
+        file_url AS fileUrl,
+        file_name AS fileName,
+        creator AS creator,
+        create_time AS createTime
+        FROM
+        t_laws
+        WHERE
+        deleted = 0
+        AND is_filing != 1 UNION
+        SELECT
+        id AS id,
+        NAME AS NAME,
+        file_url AS fileUrl,
+        file_name AS fileName,
+        creator AS creator,
+        create_time AS createTime
+        FROM
+        t_regulatory_framework
+        WHERE
+        deleted = 0
+        AND is_filing != 1 UNION
+        SELECT
+        id AS id,
+        cn_name AS NAME,
+        url AS fileUrl,
+        file_name AS fileName,
+        creator AS creator,
+        create_time AS createTime
+        FROM
+        t_operation_document
+        WHERE
+        deleted = 0) doc
+        <where>
+            <if test="dto.name != '' and dto.name != null">
+                AND doc.NAME LIKE CONCAT( '%',#{dto.name}, '%')
+            </if>
+        </where>
+        order by createTime desc
+    </select>
+
+
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TMapImageMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TMapImageMapper.xml
new file mode 100644
index 00000000..62019b6c
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TMapImageMapper.xml
@@ -0,0 +1,31 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TMapImageMapper" >
+
+
+  <select id="selectByMapId" resultType="cn.iocoder.yudao.module.knowledge.entity.TMapImage">
+    SELECT
+    id AS id,
+    filename AS filename,
+    file_size AS fileSize,
+    file_url AS fileUrl,
+    sort AS sort,
+    map_code AS mapCode,
+    dept_id AS deptId,
+    identity_id AS identityId,
+    create_time AS createTime,
+    update_time AS updateTime,
+    creator AS creator,
+    map_id AS mapId
+    FROM
+        t_map_image
+    WHERE
+        map_id = #{id}
+        AND
+          deleted = 0
+    ORDER BY
+      create_time DESC
+  </select>
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TMapMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TMapMapper.xml
new file mode 100644
index 00000000..e38d2b66
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TMapMapper.xml
@@ -0,0 +1,30 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TMapMapper">
+
+
+    <select id="getListPage" resultType="cn.iocoder.yudao.module.knowledge.entity.TMap">
+        SELECT
+        id AS id,
+        `name` AS `name`,
+        model_tag AS modelTag,
+        creator AS creator,
+        creator_id AS creatorId,
+        create_time AS createTime,
+        update_time AS updateTime,
+        map_image AS mapImage
+        FROM
+        t_map
+        WHERE
+        deleted = 0
+        <if test="dto.name != '' and dto.name != null">
+            AND `name` LIKE CONCAT( '%',#{dto.name}, '%')
+        </if>
+        ORDER BY
+            create_time DESC
+    </select>
+
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TMapNodeMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TMapNodeMapper.xml
new file mode 100644
index 00000000..6368f5a2
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TMapNodeMapper.xml
@@ -0,0 +1,32 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TMapNodeMapper">
+
+
+    <select id="selectByMapId" resultType="cn.iocoder.yudao.module.knowledge.entity.TMapNode">
+        SELECT
+            id AS id,
+            orders AS orders,
+            content AS content,
+            parent_id AS parentId,
+            create_time AS createTime,
+            update_time AS updateTime
+        FROM
+            t_map_node
+        WHERE
+            map_id = #{id}
+          AND deleted = 0
+        ORDER BY
+            create_time ASC
+    </select>
+    <update id="deleteByParentId">
+        UPDATE t_map_node
+        SET deleted = 1
+        WHERE
+            parent_id = #{id}
+    </update>
+
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TMonthlyProjectPurchaseMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TMonthlyProjectPurchaseMapper.xml
new file mode 100644
index 00000000..ca778e94
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TMonthlyProjectPurchaseMapper.xml
@@ -0,0 +1,38 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TMonthlyProjectPurchaseMapper" >
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,project_name,procurement_matters,procurement_content,matter_type,purchasing_method,tendering_agency,contract_price_estimated,contract_price,bid_price,purchase_time,contract_signing_time,contract_counterparty,remark,creator,create_time,update_time,deleted,identity_id,dept_id,tenant_id
+    </sql>
+
+    <select id="getListPage" resultType="cn.iocoder.yudao.module.knowledge.entity.TMonthlyProjectPurchase">
+        SELECT
+        <include refid="columns"/>
+        FROM t_monthly_project_purchase
+        WHERE
+        deleted = 0
+        <if test="dto.projectName != '' and dto.projectName != null">
+            AND `project_name` LIKE CONCAT( '%',#{dto.projectName}, '%')
+        </if>
+        <if test="dto.procurementMatters != '' and dto.procurementMatters != null">
+            AND `procurement_matters` LIKE CONCAT( '%',#{dto.procurementMatters}, '%')
+        </if>
+        <if test="dto.procurementContent != '' and dto.procurementContent != null">
+            AND `procurement_content` LIKE CONCAT( '%',#{dto.procurementContent}, '%')
+        </if>
+        <if test="dto.purchasingMethod != '' and dto.purchasingMethod != null">
+            AND `purchasing_method` LIKE CONCAT( '%',#{dto.purchasingMethod}, '%')
+        </if>
+        <if test=" dto.purchaseTime != null">
+            AND DATE(purchase_time) = #{dto.purchaseTime}
+        </if>
+        <if test="dto.bgnTime!=null">
+            AND (purchase_time >= date_format(#{dto.bgnTime},'%y-%m-%d 00:00:00') and purchase_time <![CDATA[<=]]> date_format(#{dto.endTime},'%y-%m-%d 23:59:59'))
+        </if>
+        ORDER BY
+        purchase_time DESC
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TNotProcurementBidMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TNotProcurementBidMapper.xml
new file mode 100644
index 00000000..6418f31b
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TNotProcurementBidMapper.xml
@@ -0,0 +1,32 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TNotProcurementBidMapper">
+
+
+    <select id="selectByPlanId" resultType="cn.iocoder.yudao.module.knowledge.entity.TNotProcurementBid">
+        SELECT
+            id AS id,
+            orders AS orders,
+            type AS "type",
+            purchase_matters AS purchaseMatters,
+            purchase_content AS purchaseContent,
+            estimated_price AS estimatedPrice,
+            plan_time AS planTime,
+            evaluation_method AS evaluationMethod,
+            confirmation_mode AS confirmationMode,
+            creator AS creator,
+            create_time AS createTime,
+            update_time AS updateTime
+        FROM
+            t_not_procurement_bid
+        WHERE
+            bid_plan_id = #{id}
+          AND deleted = 0
+        ORDER BY
+            "order" DESC
+    </select>
+
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TOperaDocMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TOperaDocMapper.xml
new file mode 100644
index 00000000..c8389c3b
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TOperaDocMapper.xml
@@ -0,0 +1,74 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TOperaDocMapper">
+
+    <sql id="column">
+        id,cn_name,en_name,version,file_code,file_name,qr_code,tag,create_time,update_time,url,setx,file_size
+    </sql>
+
+    <select id="selectPageDoc" parameterType="cn.iocoder.yudao.module.knowledge.controller.requestdto.TOperationDocRequest"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TOperationDocument">
+        SELECT
+            <include refid="column"></include>
+        FROM
+            t_operation_document
+        WHERE
+            deleted = 0
+            <if test="docRequest.cnName != '' and docRequest.cnName != null">
+                AND `cn_name` LIKE CONCAT( '%',#{docRequest.cnName}, '%')
+            </if>
+            <if test="docRequest.selTagValue != '' and docRequest.selTagValue != null">
+                AND `tag` = #{docRequest.selTagValue}
+            </if>
+            <if test="docRequest.createTime != null and docRequest.createTime != ''">
+                AND (create_time >= date_format(#{docRequest.createTime},'%y-%m-%d 00:00:00') and create_time <![CDATA[<=]]> date_format(#{docRequest.createTime},'%y-%m-%d 23:59:59'))
+            </if>
+        ORDER BY
+            create_time DESC
+    </select>
+
+    <update id="updateByCode">
+        UPDATE t_product_raw_materials
+        SET
+        deleted = '1'
+        WHERE operation_document_code in
+        <foreach collection="codes" item="cod" index="index" open="(" separator="," close=")">
+            #{cod}
+        </foreach>
+    </update>
+
+    <update id="updateGyByCode">
+        UPDATE t_technology_equipment
+        SET
+        deleted = '1'
+        WHERE operation_document_code in
+        <foreach collection="codes" item="cod" index="index" open="(" separator="," close=")">
+            #{cod}
+        </foreach>
+    </update>
+
+    <select id="selectPRMByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TProductRawMaterials">
+        SELECT
+            *
+        FROM
+            t_product_raw_materials
+        WHERE
+            deleted = 0
+          AND operation_document_code = #{code}
+        LIMIT 1
+    </select>
+
+    <select id="selectTEByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TTechnologyEquipment">
+        SELECT
+            *
+        FROM
+            t_technology_equipment
+        WHERE
+            deleted = 0
+            AND operation_document_code = #{code}
+        LIMIT 1
+    </select>
+
+
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TOperationProCoreMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TOperationProCoreMapper.xml
new file mode 100644
index 00000000..e6e31dd7
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TOperationProCoreMapper.xml
@@ -0,0 +1,29 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TOperationProCoreMapper">
+
+
+<update id="updateByCode">
+        UPDATE t_operation_procedure_core
+        SET
+            deleted = '1'
+        WHERE operation_document_code in
+    <foreach collection="codes" item="cod" index="index" open="(" separator="," close=")">
+        #{cod}
+    </foreach>
+</update>
+
+    <select id="selectByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TOperationProcedureCore">
+        select
+               *
+        from
+             t_operation_procedure_core
+        where
+        <if test="code != '' and code != null">
+            operation_document_code = #{code}
+        </if>
+
+    </select>
+
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TOperationProMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TOperationProMapper.xml
new file mode 100644
index 00000000..082f0518
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TOperationProMapper.xml
@@ -0,0 +1,27 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TOperationProMapper">
+
+<update id="updateByCode">
+        UPDATE t_operation_procedure
+        SET
+            deleted = '1'
+        WHERE operation_document_code in
+    <foreach collection="codes" item="cod" index="index" open="(" separator="," close=")">
+        #{cod}
+    </foreach>
+</update>
+
+    <select id="selectByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TOperationProcedure">
+        select
+               *
+        from
+        t_operation_procedure
+        where
+        <if test="code!=null or code !=''">
+            operation_document_code = #{code}
+        </if>
+    </select>
+
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TOtherArchivesMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TOtherArchivesMapper.xml
new file mode 100644
index 00000000..1570120f
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TOtherArchivesMapper.xml
@@ -0,0 +1,192 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TOtherArchivesMapper">
+
+
+    <select id="selectTArchivesList" parameterType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select
+        base.id,base.parent_id,base.orders,base.code,base.original_filename,base.cur_filename,base.file_url,base.file_size,base.is_dir,base.deleted,base.is_recycled,base.type,base.creator,base.creator_id,base.create_time,base.update_time,base.dept_id,base.identity_id
+        from t_other_archives base
+        <if test=" param.isRecycled == '0'.toString()">
+            LEFT JOIN t_other_archives par on par.id = base.parent_id
+        </if>
+        <where>
+            base.deleted = 0
+            <choose>
+                <when test="param.parentId!=null">
+                    and base.parent_id = #{param.parentId}
+                </when>
+                <otherwise>
+                    <choose>
+                        <when test="param.isRecycled == '0'.toString()">
+                            and ( base.parent_id is null or par.is_recycled='1')
+                        </when>
+                        <otherwise>
+                            and base.parent_id is null
+                        </otherwise>
+                    </choose>
+                </otherwise>
+            </choose>
+            <if test="param.type!=null and param.type!=''">
+                and (base.type = #{param.type} or base.type = 0)
+            </if>
+            <if test="param.originalFilename!=null and param.originalFilename!=''">
+                and base.cur_filename like concat('%', #{param.originalFilename},'%')
+            </if>
+
+            and base.is_recycled = #{param.isRecycled}
+
+            order by base.orders desc,base.is_dir,base.create_time desc
+        </where>
+    </select>
+    <select id="selectTArchivesListOfName" parameterType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select
+        base.id,base.parent_id,base.orders,base.code,base.original_filename,base.cur_filename,base.file_url,base.file_size,base.is_dir,base.deleted,base.is_recycled,base.type,base.creator,base.creator_id,base.create_time,base.update_time,base.dept_id,base.identity_id
+        from t_other_archives base
+        <where>
+            base.deleted = 0
+            <if test="param.type!=null and param.type!=''">
+                and (base.type = #{param.type} or base.type = 0)
+            </if>
+            <if test="param.originalFilename!=null and param.originalFilename!=''">
+                and base.cur_filename like concat('%', #{param.originalFilename},'%')
+            </if>
+            <if test="param.code!=null and param.code!=''">
+                and base.code like concat(#{param.code},'%')
+            </if>
+            and base.is_recycled = #{param.isRecycled}
+
+            order by base.orders desc, base.is_dir,base.create_time desc
+        </where>
+    </select>
+    <select id="findAllDoc" parameterType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select
+        base.id,base.parent_id,base.code,base.original_filename,base.cur_filename,base.file_url,base.file_size,base.is_dir,base.deleted,base.is_recycled,base.type,base.creator,base.creator_id,base.create_time,base.update_time,base.dept_id,base.identity_id
+        from t_other_archives base
+        <where>
+            base.is_dir = 1
+            and base.deleted = 0
+            <if test="param.originalFilename!=null and param.originalFilename!=''">
+                and base.original_filename like concat('%', #{param.originalFilename},'%')
+            </if>
+            <if test="param.parentId!=null and param.parentId!=''">
+                and base.code like concat('%',#{param.parentId},'%')
+            </if>
+            and base.is_recycled = '1'
+            order by base.is_dir,base.create_time desc
+        </where>
+    </select>
+
+    <select id="getParByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        where is_dir = 0
+          and #{code} like concat(code, '%')
+    </select>
+
+    <select id="selectByCondition" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        <where>
+            <if test="param.parentId != null ">and parent_id = #{param.parentId}</if>
+            <if test="param.curFilename != null ">and cur_filename = #{param.curFilename}</if>
+            <if test="param.code != null ">and code = #{param.code}</if>
+        </where>
+    </select>
+
+    <select id="selectOnleByCondition" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        <where>
+            deleted = 0 and is_recycled = 1
+            and parent_id = #{param.parentId}
+            <if test="param.curFilename != null ">and cur_filename = #{param.curFilename}</if>
+        </where>
+        order by create_time desc
+        limit 1
+    </select>
+
+    <select id="selectOneByCondition" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        <where>
+            deleted = 0
+            and parent_id = #{param.parentId}
+            <if test="param.curFilename != null ">and cur_filename = #{param.curFilename}</if>
+            <if test="param.originalFilename != null ">and original_filename = #{param.originalFilename}</if>
+            <if test="param.type != null ">and type = #{param.type}</if>
+        </where>
+        order by create_time desc
+        limit 1
+    </select>
+
+    <select id="selectOnleByConditionDir" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        <where>
+            deleted = 0 and is_recycled = 1
+            and parent_id IS NULL
+            <if test="param.curFilename != null ">and cur_filename = #{param.curFilename}</if>
+            <if test="param.type != null ">and type = #{param.type}</if>
+        </where>
+    </select>
+
+    <select id="findAllDocList" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        <where>
+            deleted = 0
+            and is_dir =1
+            <if test="param.curFilename != null ">and cur_filename like concat('%',#{param.curFilename},'%') </if>
+            <if test="param.originalFilename != null ">and original_filename like concat('%',#{param.originalFilename},'%')</if>
+        </where>
+    </select>
+
+    <select id="selectByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        <where>
+            <if test="code != null ">and code = #{code}</if>
+        </where>
+    </select>
+    <select id="getParentId" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        <where>
+            <if test="id != null ">and id = #{id}</if>
+        </where>
+    </select>
+
+    <select id="selectOneByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        <where>
+            is_dir ='1' and deleted='0'
+            <if test="code != null and code!='' ">and code like concat(#{code},'%')</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectByArchivId" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        where parent_id = (select id from t_other_archives where parent_id = #{parentId} and cur_filename = '归档')
+          and cur_filename = '2024'
+    </select>
+
+    <select id="selectByArchivParentId" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select * from t_other_archives where parent_id = #{parentId} and cur_filename = '归档'
+    </select>
+
+    <select id="appFindByParentId" resultType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives">
+        select *
+        from t_other_archives
+        where
+            deleted = 0
+            and type =#{param.type}
+            and parent_id = #{param.parentId}
+    </select>
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TProcurementBidMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TProcurementBidMapper.xml
new file mode 100644
index 00000000..24d3db01
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TProcurementBidMapper.xml
@@ -0,0 +1,32 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TProcurementBidMapper">
+
+
+    <select id="selectByPlanId" resultType="cn.iocoder.yudao.module.knowledge.entity.TProcurementBid">
+        SELECT
+            id AS id,
+            orders AS "orders",
+            type AS "type",
+            section_name AS sectionName,
+            bid_content AS bidContent,
+            estimated_price AS estimatedPrice,
+            plan_time AS planTime,
+            bid_evaluation_method AS bidEvaluationMethod,
+            scaling_mode AS scalingMode,
+            creator AS creator,
+            create_time AS createTime,
+            update_time AS updateTime
+        FROM
+            t_procurement_bid
+        WHERE
+            bid_plan_id = #{id}
+          AND deleted = 0
+        ORDER BY
+            "order" DESC
+    </select>
+
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TProductRawMaterialsMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TProductRawMaterialsMapper.xml
new file mode 100644
index 00000000..8bd0116e
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TProductRawMaterialsMapper.xml
@@ -0,0 +1,18 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TProductRawMatMapper">
+
+
+    <update id="updateByCode">
+        UPDATE t_product_raw_materials
+        SET
+        deleted = '1'
+        WHERE operation_document_code in
+        <foreach collection="codes" item="cod" index="index" open="(" separator="," close=")">
+            #{cod}
+        </foreach>
+    </update>
+
+
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TQuestionAnswersMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TQuestionAnswersMapper.xml
new file mode 100644
index 00000000..12ab908d
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TQuestionAnswersMapper.xml
@@ -0,0 +1,35 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TQuestionAnswersMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TQuestionAnswers" id="tQuestionAnswersMap">
+        <result property="id" column="id"/>
+        <result property="questionStemId" column="question_stem_id"/>
+        <result property="content" column="content"/>
+        <result property="fileUrl" column="file_url"/>
+        <result property="options" column="options"/>
+    </resultMap>
+
+
+    <update id="deleteByQuestionStemId">
+        update t_question_answers
+        <set>
+            deleted = 1,
+        </set>
+        where question_stem_id = #{aLong}
+    </update>
+
+    <select id="selectByQuestionStemId"
+            parameterType="Long"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TQuestionAnswers">
+        SELECT
+        *
+        FROM
+        t_question_answers
+        <where>
+            <if test="id != null ">and question_stem_id = #{id}</if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TQuestionStemMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TQuestionStemMapper.xml
new file mode 100644
index 00000000..ab9112ed
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TQuestionStemMapper.xml
@@ -0,0 +1,265 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TQuestionStemMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TQuestionStem" id="tQuestionStemMaps">
+        <result property="id" column="id"/>
+        <result property="questionBankId" column="question_bank_id"/>
+        <result property="questionBankName" column="question_bank_name"/>
+        <result property="tqsConntent" column="content"/>
+        <result property="type" column="type"/>
+        <result property="level" column="level"/>
+        <result property="tqsFileUrl" column="file_url"/>
+        <result property="analysisFileUrl" column="analysis_file_url"/>
+        <result property="analysis" column="analysis"/>
+        <result property="rightAnswers" column="right_answers"/>
+    </resultMap>
+
+    <resultMap id="tQuestionStemMap"
+               type="cn.iocoder.yudao.module.knowledge.controller.responsevo.TQuestionStemvo">
+        <!--column通过SQL语句查询出来的字段,property对应的实体属性-->
+        <id column="id" property="id"/>
+        <result property="questionBankId" column="question_bank_id"/>
+        <result property="questionBankName" column="question_bank_name"/>
+        <result property="content" column="tqsConntent"/>
+        <result property="type" column="type"/>
+        <result property="keyContent" column="keyContent"/>
+        <result property="level" column="level"/>
+        <result property="fileUrl" column="tqsFileUrl"/>
+        <result property="analysisFileUrl" column="analysisFileUrl"/>
+        <result property="analysis" column="analysis"/>
+        <result property="rightAnswers" column="right_answers"/>
+    </resultMap>
+    <update id="deleteBatchBy">
+        update t_question_stem set deleted = 0 where question_bank_id in
+        <foreach collection="questionBankIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="findAll"
+            parameterType="cn.iocoder.yudao.module.knowledge.controller.requestdto.TQuestionStemRequest"
+            resultMap="tQuestionStemMap">
+        SELECT
+        tqs.id,
+        tqs.question_bank_id,
+        tqs.question_bank_name,
+        tqs.content tqsConntent,
+        tqs.type,
+        tqs.level,
+        tqs.file_url tqsFileUrl,
+        tqs.analysis_file_url analysisFileUrl,
+        tqs.analysis,
+        tqs.right_answers,
+        tqs.code
+        FROM
+        t_question_stem tqs
+        <where>
+            tqs.deleted = 0
+            <if test="param.content != null  and param.content != ''">and tqs.content like
+                concat('%', #{param.content}, '%')
+            </if>
+            <if test="param.questionBankName != null  and param.questionBankName != ''">and tqs.question_bank_name like
+                concat('%', #{param.questionBankName}, '%')
+            </if>
+            <if test="param.questionBankId != null ">and tqs.question_bank_id = #{param.questionBankId}</if>
+            <if test="param.type != null">and tqs.type = #{param.type}</if>
+            <if test="param.level != null">and tqs.level = #{param.level}</if>
+        </where>
+        order by tqs.create_time desc
+    </select>
+
+
+    <select id="getStemRandom"
+            resultMap="tQuestionStemMap">
+        SELECT DISTINCT
+        tqs.id,
+        tqs.question_bank_id,
+        tqs.question_bank_name,
+        tqs.content tqsConntent,
+        tqs.type,
+        tqs.level,
+        tqs.file_url tqsFileUrl,
+        tqs.analysis_file_url analysisFileUrl,
+        tqs.analysis,
+        tqs.right_answers,
+        tqs.code
+        FROM
+        t_question_stem tqs
+        inner join t_question_bank tqb on tqs.question_bank_id = tqb.id and tqb.deleted = 0
+        <where>
+            tqs.deleted = 0
+            <if test="code != null ">and tqb.id_chain like concat(#{code},'%') </if>
+            <if test="type != null and type != 5">and tqs.type = #{type}</if>
+        </where>
+        ORDER BY RAND()
+        LIMIT #{questionSum}
+    </select>
+
+    <select id="getAppStemRandom"
+            resultMap="tQuestionStemMap">
+        SELECT DISTINCT
+        tqs.id,
+        tqs.question_bank_id,
+        tqs.question_bank_name,
+        tqs.content tqsConntent,
+        tqs.type,
+        tqs.level,
+        tqs.file_url tqsFileUrl,
+        tqs.analysis_file_url analysisFileUrl,
+        tqs.analysis,
+        tqs.right_answers,
+        tqs.code
+        FROM
+        t_question_stem tqs
+        inner join t_question_bank tqb on tqs.question_bank_id = tqb.id and tqb.deleted = 0
+        <where>
+            tqs.deleted = 0
+            <if test="code != null ">and tqb.id_chain like concat(#{code},'%') </if>
+            <if test="content != null ">and tqs.content like concat(#{content},'%') </if>
+            <if test="type != null ">and tqs.type = #{type}</if>
+        </where>
+        ORDER BY RAND()
+    </select>
+
+    <select id="getOneById"
+            resultMap="tQuestionStemMap">
+        SELECT
+        tqs.id,
+        tqs.question_bank_id,
+        tqs.question_bank_name,
+        tqs.content tqsConntent,
+        tqs.type,
+        tqs.level,
+        tqs.file_url tqsFileUrl,
+        tqs.analysis_file_url analysisFileUrl,
+        tqs.analysis,
+        tqs.right_answers,
+        tqs.code
+        FROM
+        t_question_stem tqs
+        <where>
+            tqs.deleted = 0
+            and id = #{id}
+        </where>
+    </select>
+
+
+    <select id="findOne"
+            parameterType="cn.iocoder.yudao.module.knowledge.controller.requestdto.TQuestionStemRequest"
+            resultMap="tQuestionStemMap">
+        SELECT
+        tqs.id,
+        tqs.question_bank_id,
+        tqs.question_bank_name,
+        tqs.content tqsConntent,
+        tqs.type,
+        tqs.level,
+        tqs.key_content keyContent,
+        tqs.file_url tqsFileUrl,
+        tqs.analysis_file_url analysisFileUrl,
+        tqs.analysis,
+        tqs.right_answers,
+        tqs.code
+        FROM
+        t_question_stem tqs
+        <where>
+            tqs.deleted = 0
+            <if test="id != null ">and tqs.id = #{id}</if>
+        </where>
+    </select>
+
+    <select id="getByQuestionBankId"
+            parameterType="cn.iocoder.yudao.module.knowledge.controller.requestdto.TQuestionStemRequest"
+            resultMap="tQuestionStemMap">
+        SELECT
+        tqs.id,
+        tqs.question_bank_id,
+        tqs.question_bank_name,
+        tqs.content tqsConntent,
+        tqs.type,
+        tqs.level,
+        tqs.file_url tqsFileUrl,
+        tqs.analysis_file_url analysisFileUrl,
+        tqs.analysis,
+        tqs.right_answers,
+        tqs.code
+        FROM
+        t_question_stem tqs
+        <where>
+            <if test="id != null ">and tqs.question_bank_id = #{id}</if>
+        </where>
+    </select>
+
+
+    <select id="selectQuestionStemList"
+            parameterType="Long"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TQuestionStem">
+        SELECT
+        *
+        FROM
+        t_question_stem tqs
+        <where>
+            <if test="id != null ">and question_bank_id = #{id}</if>
+        </where>
+    </select>
+    <select id="queryPage" resultType="cn.iocoder.yudao.module.knowledge.entity.TQuestionStem">
+        select * from t_question_stem
+        <where>
+            deleted = 0
+            <if test="params.bankIdList != null and params.bankIdList.size > 0">
+                and question_bank_id in
+                <foreach collection="params.bankIdList" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="params.content != null and params.content != ''">
+                and content like concat ('%',#{params.content}, '%' )
+            </if>
+            <if test="params.type != null and params.type != '' and params.type != 5">
+                and type = #{params.type}
+            </if>
+            <if test="params.level != null and params.level != '' and params.level != 5">
+                and level = #{params.level}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="queryList" resultType="cn.iocoder.yudao.module.knowledge.entity.TQuestionStem">
+        select * from t_question_stem
+        <where>
+            deleted = 0
+            <if test="params.bankIdList != null and params.bankIdList.size > 0">
+                and question_bank_id in
+                <foreach collection="params.bankIdList" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="params.content != null and params.content != ''">
+                and content like concat ('%',#{params.content}, '%' )
+            </if>
+            <if test="params.type != null and params.type != '' and params.type != 5">
+                and type = #{params.type}
+            </if>
+            <if test="params.level != null and params.level != '' and params.level != 5">
+                and level = #{params.level}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <update id="deleteByTquestionbankId" parameterType="Long">
+        update t_question_stem
+        set deleted = 1
+        where question_bank_id = #{childrenId}
+    </update>
+    <update id="updateBankNameByBankId">
+        update t_question_stem
+        set question_bank_name = #{bankName}
+        where question_bank_id = #{bankId}
+          and deleted = 0
+    </update>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRegulartoryFrameworkExecutionMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRegulartoryFrameworkExecutionMapper.xml
new file mode 100644
index 00000000..2f39cfc6
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TRegulartoryFrameworkExecutionMapper.xml
@@ -0,0 +1,95 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TRegulatoryFrameworkExecutionMapper">
+
+
+    <select id="selectPageMonitor" parameterType="cn.iocoder.yudao.module.knowledge.controller.requestdto.MonitorRequestPage"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFrameworkExecution">
+        SELECT
+        t.id,
+        t.CODE,
+        t.NAME,
+        t.state,
+        t.descr,
+        t.deleted,
+        t.creator,
+        t.creator_id,
+        t.create_time,
+        t.update_time,
+        (((
+        SELECT
+        COUNT(*)
+        FROM
+        t_rfeu_task tr
+        WHERE
+        tr.rfec_id = t.id and tr.deleted =0
+        AND tr.status = '2'
+        )/(
+        SELECT
+        COUNT(*)
+        FROM
+        t_rfe_user tr
+        WHERE
+        tr.ref_code = t.id and tr.deleted =0
+        ))* 100
+        ) process_num
+        FROM
+        t_regulatory_framework_execution t
+        WHERE
+            t.deleted = 0
+            <if test="monitorRequestPage.searchKey != '' and monitorRequestPage.searchKey != null">
+                AND t.name LIKE CONCAT( '%',#{monitorRequestPage.searchKey}, '%')
+            </if>
+            <if test="monitorRequestPage.state != '' and monitorRequestPage.state != null">
+                AND t.state = #{monitorRequestPage.state}
+            </if>
+          <if test="monitorRequestPage.bgnTime!=null and monitorRequestPage.bgnTime !=''">
+              AND (t.create_time >= date_format(#{monitorRequestPage.bgnTime},'%y-%m-%d 00:00:00') and t.create_time <![CDATA[<=]]> date_format(#{monitorRequestPage.endTime},'%y-%m-%d 23:59:59'))
+          </if>
+        GROUP BY t.id
+        ORDER BY t.create_time DESC
+
+    </select>
+    <select id="findTask" resultType="cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFrameworkExecution">
+        SELECT
+            t.id,
+            t.code,
+            t.name,
+            t.state,
+            t.descr,
+            t.deleted,
+            t.creator,
+            t.creator_id,
+            t.create_time,
+            t.update_time,
+            trt.status,
+            trt.id as taskId
+        FROM
+            t_regulatory_framework_execution t
+          inner join  t_rfeu_task trt on t.id=rfec_id and trt.deleted=0
+        WHERE
+        t.deleted = 0 and trt.user_id = #{monitorRequestPage.userId}
+        <if test="monitorRequestPage.searchKey != '' and monitorRequestPage.searchKey != null">
+            AND t.name LIKE CONCAT( '%',#{monitorRequestPage.searchKey}, '%')
+        </if>
+        <if test="monitorRequestPage.state != '' and monitorRequestPage.state != null">
+            AND trt.status = #{monitorRequestPage.state}
+        </if>
+        <if test="monitorRequestPage.bgnTime!=null and monitorRequestPage.bgnTime !=''">
+            AND (t.create_time >= date_format(#{monitorRequestPage.bgnTime},'%y-%m-%d 00:00:00') and t.create_time <![CDATA[<=]]> date_format(#{monitorRequestPage.endTime},'%y-%m-%d 23:59:59'))
+        </if>
+        ORDER BY t.create_time DESC
+
+    </select>
+    <select id="findOwn" resultType="cn.iocoder.yudao.module.knowledge.entity.RfeuTaskContent">
+            select  rrc.*,trc.file_name as fileName,trc.file_url as fileUrl  from
+            r_rfeu_task_content rrc
+            inner join t_rfeu_task trt on trt.id = rrc.task_id
+            inner join t_rfe_content trc on trc.id =content_id
+            where rrc.deleted = 0
+            and  execution_id=#{executionId} and trt.user_id = #{userId}
+
+    </select>
+
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRegulatoryFrameworkMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRegulatoryFrameworkMapper.xml
new file mode 100644
index 00000000..2937fc45
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TRegulatoryFrameworkMapper.xml
@@ -0,0 +1,85 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TRegulatoryFrameworkMapper">
+
+    <sql id="column">
+        id,CODE,NAME,version,file_url,file_size,file_name,filing_time,is_filing,deleted,laws_a,laws_b,creator,creator_id,create_time,update_time,dept_id,identity_id,describe_info,tenant_id,type
+    </sql>
+    <update id="updateByLawId">
+        UPDATE t_regulatory_framework
+        SET
+            code = #{dto.code},
+            version = #{dto.version},
+            file_url = #{dto.fileUrl},
+            file_size = #{dto.fileSize},
+            file_name = #{dto.fileName},
+            describe_info = #{dto.describeInfo}
+        WHERE
+            id = #{dto.id}
+    </update>
+
+    <update id="deleteByIds">
+        UPDATE t_regulatory_framework
+        SET
+            deleted = 0
+        WHERE id = #{id}
+    </update>
+
+    <update id="filling">
+        UPDATE t_regulatory_framework
+        SET
+            is_filing = '1'
+        WHERE id = #{id}
+    </update>
+
+    <select id="judgeIsFilling" resultType="int">
+        SELECT COUNT(1)
+                   is_filing
+        FROM
+            t_regulatory_framework
+        WHERE
+            is_filing = '1'
+          AND
+            id = #{id}
+          AND
+            deleted = 0
+    </select>
+
+
+    <select id="getListPage" resultType="cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework">
+        SELECT
+            <include refid="column"></include>
+        FROM
+            t_regulatory_framework
+        WHERE
+            deleted = 0 and is_filing!=1
+            <if test="dto.name != '' and dto.name != null">
+                AND `name` LIKE CONCAT( '%',#{dto.name}, '%')
+            </if>
+            <if test=" dto.createTime != null">
+                AND DATE(create_time) = #{dto.createTime}
+            </if>
+        ORDER BY
+            create_time DESC
+    </select>
+
+    <select id="selectForApp" resultType="cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework">
+        SELECT
+            <include refid="column"></include>
+        FROM
+        t_regulatory_framework
+        WHERE
+        deleted = 0 and is_filing!=1
+        <if test="dto.name != '' and dto.name != null">
+            AND `name` LIKE CONCAT( '%',#{dto.name}, '%')
+        </if>
+        <if test=" dto.createTime != null">
+            AND DATE(create_time) = #{dto.createTime}
+        </if>
+        ORDER BY
+        create_time DESC
+    </select>
+
+
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRevisionMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRevisionMapper.xml
new file mode 100644
index 00000000..fcf2f5dd
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TRevisionMapper.xml
@@ -0,0 +1,29 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TRevisionMapper">
+
+<update id="updateByCode">
+        UPDATE t_revision
+        SET
+            deleted = '1'
+        WHERE operation_document_code in
+    <foreach collection="codes" item="cod" index="index" open="(" separator="," close=")">
+        #{cod}
+    </foreach>
+</update>
+
+    <select id="selectByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TRevision">
+        select
+        *
+        from
+        t_revision
+        where 1=1
+        <if test="code!=null or code !=''">
+          and  operation_document_code = #{code}
+        </if>
+        <if test="type!=null or type !=''">
+            and type = #{type}
+        </if>
+    </select>
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRfeContentMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRfeContentMapper.xml
new file mode 100644
index 00000000..60ed7557
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TRfeContentMapper.xml
@@ -0,0 +1,29 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TRfeContentMapper">
+
+<update id="updateById">
+        UPDATE t_rfe_content
+        SET
+            deleted = '1'
+        WHERE rfe_id = #{rfeId}
+</update>
+
+    <select id="selectByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TRfeContent">
+        select
+        *
+        from t_rfe_content
+        <if test="code !='' and code !=null">
+            where rfe_id = #{code}
+        </if>
+        order by sort
+    </select>
+
+    <select id="selectByRfId" resultType="cn.iocoder.yudao.module.knowledge.entity.TRfeContent">
+        select
+        *
+        from t_rfe_content
+        where rfe_id = #{id}
+    </select>
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRfeUserMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRfeUserMapper.xml
new file mode 100644
index 00000000..8eaa26d7
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TRfeUserMapper.xml
@@ -0,0 +1,24 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TRfeUserMapper">
+
+<update id="updateByCode">
+        UPDATE t_rfe_user
+        SET
+            deleted = '1'
+        WHERE ref_code in
+    <foreach collection="codes" item="code" index="index" open="(" separator="," close=")">
+        #{code}
+    </foreach>
+</update>
+
+    <select id="selectByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TRfeUser">
+        select
+        *
+        from t_rfe_user
+        <if test="code !='' and code !=null">
+            where ref_code = #{code}
+        </if>
+    </select>
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRfeuTaskMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRfeuTaskMapper.xml
new file mode 100644
index 00000000..4cc6228b
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TRfeuTaskMapper.xml
@@ -0,0 +1,24 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TRfeuTaskMapper">
+
+<update id="updateByCode">
+        UPDATE t_rfeu_task
+        SET
+            deleted = '1'
+        WHERE rfec_id = #{id}
+</update>
+
+    <select id="selectByCode" resultType="cn.iocoder.yudao.module.knowledge.entity.TRfeuTask">
+
+-- 可优化，使用字段 比*更好
+        select
+               *
+        from t_rfeu_task
+        <if test="code !='' and code !=null">
+            where rfec_id = #{code}
+        </if>
+        order by id
+    </select>
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TSpecialistMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TSpecialistMapper.xml
new file mode 100644
index 00000000..38079f4a
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TSpecialistMapper.xml
@@ -0,0 +1,55 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TSpecialistMapper">
+
+
+    <select id="selectPageTS" parameterType="cn.iocoder.yudao.module.knowledge.controller.requestdto.ExpertRequestPage"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TSpecialist">
+
+        SELECT
+        ts.*,tem.tag_name as tagName
+        FROM
+        t_specialist ts
+        left join t_expert_maintenance tem on ts.domain_expert = tem.id
+        WHERE ts.deleted = 0
+        <if test="request.searchKey != '' and request.searchKey != null">
+            and (ts.`username` LIKE CONCAT( '%',#{request.searchKey}, '%') or ts.`usercode` LIKE CONCAT( '%',#{request.searchKey}, '%'))
+        </if>
+        ORDER BY
+        ts.create_time DESC
+    </select>
+    <select id="selectByUsercode" resultType="cn.iocoder.yudao.module.knowledge.entity.TSpecialist">
+        select * from t_specialist
+        where usercode = #{usercode} and deleted = 0
+    </select>
+    <select id="selectList" resultType="cn.iocoder.yudao.module.knowledge.entity.TSpecialist">
+        SELECT
+        ts.*,tem.tag_name as tagName
+        FROM
+        t_specialist ts
+        left join t_expert_maintenance tem on ts.domain_expert = tem.id
+        WHERE ts.deleted = 0
+        <if test="request.searchKey != '' and request.searchKey != null">
+            and ts.`username` LIKE CONCAT( '%',#{request.searchKey}, '%')
+        </if>
+        ORDER BY
+        ts.create_time DESC
+    </select>
+
+
+    <select id="findOne" resultType="cn.iocoder.yudao.module.knowledge.entity.TSpecialist">
+        SELECT
+            ts.*,tem.tag_name as tagName
+        FROM
+            t_specialist ts
+                left join t_expert_maintenance tem on ts.domain_expert = tem.id
+        WHERE ts.deleted = 0
+
+          and ts.`id` = #{id}
+
+        ORDER BY
+            ts.create_time DESC
+    </select>
+
+</mapper>
+
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTestPaperAnswerSheetMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTestPaperAnswerSheetMapper.xml
new file mode 100644
index 00000000..e831e714
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TTestPaperAnswerSheetMapper.xml
@@ -0,0 +1,176 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TTestPaperAnswerSheetMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTestPaperAnswerSheet"
+               id="tTestPaperAnswerSheetMap">
+        <result property="id" column="id"/>
+        <result property="testPaperInfoId" column="test_paper_info_id"/>
+        <result property="score" column="score"/>
+        <result property="submitAnswer" column="submit_answer"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="identityId" column="identity_id"/>
+        <result property="deleted" column="deleted"/>
+        <result property="isHand" column="is_hand"/>
+        <result property="examinationNumber" column="examination_number"/>
+        <result property="startDate" column="create_time"/>
+        <result property="paperName" column="name"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id
+        ,test_paper_info_id,score,submit_answer,create_time,update_time,dept_id,identity_id,
+            deleted,examination_number,examination_name
+    </sql>
+    <update id="delByPaperInfoIds">
+        <foreach collection="paperInfoIds" item="item" separator=";">
+            update t_test_paper_answer_sheet set deleted = 1 where test_paper_info_id = #{item}
+            and deleted = 0
+        </foreach>
+    </update>
+    <select id="findList" resultMap="tTestPaperAnswerSheetMap">
+        SELECT
+        ttpa.id,
+        ttpa.examination_number,
+        ttpa.examination_name,
+        ttpa.dept_id,
+        ttpa.score,
+        ttpa.test_paper_info_id,
+        ttpa.pass,
+        ttpa.is_hand,
+        ttpa.create_time
+        FROM
+        t_test_paper_answer_sheet ttpa
+        LEFT JOIN t_test_paper_info ttpi ON ttpi.id = ttpa.test_paper_info_id
+        <where>
+            <if test="params.id != null">
+                and ttpa.id = #{id}
+            </if>
+            <if test="params.testPaperInfoId != null">
+                and ttpa.test_paper_info_id = #{params.testPaperInfoId}
+            </if>
+            <if test="params.submitAnswer != null and params.submitAnswer != ''">
+                and ttpa.submit_answer = #{params.submitAnswer}
+            </if>
+            <if test="params.deptId != null and params.deptId != ''">
+                and ttpa.dept_id = #{params.deptId}
+            </if>
+
+            <if test="params.examinationNumber != null and params.examinationNumber != ''">
+                and ttpa.examination_number = #{params.examinationNumber}
+            </if>
+            <if test="params.examinationName != null and params.examinationName != ''">
+                and ttpa.examination_name like concat('%',#{params.examinationName},'%')
+            </if>
+            <if test="params.identityIdList != null and params.identityIdList.size > 0">
+                and user_id in
+                <foreach collection="params.identityIdList" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by ttpa.create_time desc
+    </select>
+
+
+    <select id="findOwnList" resultMap="tTestPaperAnswerSheetMap">
+        SELECT
+        ttpa.id,
+        ttpa.examination_number,
+        ttpa.examination_name,
+        ttpa.dept_id,
+        ttpa.score,
+        ttpa.test_paper_info_id,
+        ttpa.pass,
+        ttpa.is_hand,
+        ttpa.create_time,
+        ttpi.name
+        FROM
+        t_test_paper_answer_sheet ttpa
+        LEFT JOIN t_test_paper_info ttpi ON ttpi.id = ttpa.test_paper_info_id
+        <where>
+            <if test="params.id != null">
+                and ttpa.id = #{id}
+            </if>
+            <if test="params.testPaperInfoId != null">
+                and ttpa.test_paper_info_id = #{params.testPaperInfoId}
+            </if>
+            <if test="params.submitAnswer != null and params.submitAnswer != ''">
+                and ttpa.submit_answer = #{params.submitAnswer}
+            </if>
+            <if test="params.deptId != null and params.deptId != ''">
+                and ttpa.dept_id = #{params.deptId}
+            </if>
+
+            <if test="params.examinationNumber != null and params.examinationNumber != ''">
+                and ttpa.examination_number = #{params.examinationNumber}
+            </if>
+            <if test="params.examinationName != null and params.examinationName != ''">
+                and ttpa.examination_name like concat('%',#{params.examinationName},'%')
+            </if>
+            <if test="params.userId != null and params.userId != ''">
+                and ttpa.user_id = #{params.userId}
+            </if>
+        </where>
+        order by ttpa.create_time desc
+    </select>
+
+
+    <select id="selectByPaperInfoId" resultMap="tTestPaperAnswerSheetMap">
+        select
+        *
+        from t_test_paper_answer_sheet
+        <where>
+            <if test="params.testPaperInfoId != null">
+                and test_paper_info_id = #{params.testPaperInfoId}
+            </if>
+            <if test="params.userId != null and params.userId != ''">
+                and user_id = #{params.userId}
+            </if>
+        </where>
+    </select>
+
+    <select id="selfDetail" resultMap="tTestPaperAnswerSheetMap">
+        select *
+        from t_test_paper_answer_sheet
+        where
+          test_paper_info_id = #{testPaperInfoId}
+          and user_id = #{userId}
+          and deleted = 0
+        order by create_time desc limit 1
+    </select>
+    <select id="testCount" resultType="java.lang.Integer">
+        select count(*)
+        from t_test_paper_answer_sheet
+        where user_id = #{userId}
+          and test_paper_info_id = #{testPaperInfoId}
+          and deleted = 0
+          and `type` = 1
+    </select>
+    <select id="retake" resultType="java.lang.Integer">
+        select count(*)
+        from t_test_paper_answer_sheet
+        where user_id = #{userId}
+          and deleted = 0
+          and test_paper_info_id =
+              (select test_paper_info_id from t_test_paper_answer_sheet where id = #{id} and deleted = 0 limit 1)
+    </select>
+
+    <select id="retakes" resultType="java.lang.Integer">
+        select count(*)
+        from t_test_paper_answer_sheet
+        where user_id = #{userId}
+          and deleted = 0
+          and test_paper_info_id = #{paperId}
+    </select>
+    <select id="count" resultType="java.lang.Integer">
+        select count(*) from t_test_paper_answer_sheet where user_id = #{userId} and deleted = 0
+        and test_paper_info_id = #{testPaperInfoId}
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTestPaperInfoMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTestPaperInfoMapper.xml
new file mode 100644
index 00000000..2d975331
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TTestPaperInfoMapper.xml
@@ -0,0 +1,103 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TTestPaperInfoMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTestPaperInfo" id="tTestPaperInfoMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="testNum" column="test_num"/>
+        <result property="startDate" column="start_date"/>
+        <result property="duration" column="duration"/>
+        <result property="peopleCount" column="people_count"/>
+        <result property="questionBankName" column="question_bank_name"/>
+        <result property="questionBankId" column="question_bank_id"/>
+        <result property="type" column="type"/>
+        <result property="allScore" column="all_score"/>
+        <result property="passScore" column="pass_score"/>
+        <result property="makeUp" column="make_up"/>
+        <result property="errorCorrection" column="error_correction"/>
+        <result property="allQuestionSum" column="all_question_sum"/>
+        <result property="trainId" column="train_id"/>
+        <result property="setting" column="setting"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="teachCode" column="teach_code"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id
+        ,`name`,test_num,start_date,duration,people_count,train_id, question_bank_name,question_bank_id,`type`,all_score,pass_score,make_up,error_correction,all_question_sum,teach_code,setting
+    </sql>
+    <sql id="columns2">
+        id
+        ,`name`,test_num,start_date,duration,people_count,train_id,pass_score
+    </sql>
+    <select id="findList" resultMap="tTestPaperInfoMap">
+        select
+        *
+        from t_test_paper_info
+        <where>
+            <if test="params.name != null and params.name != ''">
+                name like concat('%',#{params.name},'%')
+            </if>
+            <if test="params.startDate != null">
+                and start_date = #{params.startDate}
+            </if>
+            <if test="params.trainIdList != null and params.trainIdList.size > 0">
+                and train_id in
+                <foreach collection="params.trainIdList" item="trainId" open="(" separator="," close=")">
+                    #{trainId}
+                </foreach>
+            </if>
+            and deleted = 0
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="findListAll" resultMap="tTestPaperInfoMap">
+        select *
+        from t_test_paper_info
+        <where>
+            deleted = 0
+            <if test="params.name != null and params.name != ''">
+                and name like concat('%',#{params.name},'%')
+            </if>
+            <if test="params.startDate != null">
+                and start_date = #{params.startDate}
+            </if>
+            <if test="params.type != null">
+                and type = #{params.type}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="getOneByTrainId" resultMap="tTestPaperInfoMap">
+        select *
+        from t_test_paper_info
+        where train_id = #{id} and deleted = 0
+        order by create_time desc
+        limit 1
+    </select>
+    <select id="queryByIds"
+            resultType="cn.iocoder.yudao.module.knowledge.entity.TTestPaperInfo">
+        select id, pass_score,name from t_test_paper_info
+        <where>
+            deleted = 0
+            and id in
+            <foreach collection="ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </where>
+    </select>
+
+
+    <update id="deleteByTrainId" parameterType="java.lang.Long">
+        update t_test_paper_info
+        set deleted = 1
+        where train_id = #{id}
+    </update>
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTestPaperQuestionStemMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTestPaperQuestionStemMapper.xml
new file mode 100644
index 00000000..0c90d576
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TTestPaperQuestionStemMapper.xml
@@ -0,0 +1,135 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TTestPaperQuestionStemMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTestPaperQuestionStem"
+               id="tTestPaperQuestionStemMap">
+        <result property="id" column="t_question_stem_id"/>
+        <result property="testPaperInfoId" column="test_paper_info_id"/>
+        <result property="fileUrl" column="file_url"/>
+        <result property="content" column="content"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="type" column="type"/>
+        <result property="level" column="level"/>
+        <result property="analysis" column="analysis"/>
+        <result property="rightAnswers" column="right_answers"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="code" column="code"/>
+        <result property="score" column="score"/>
+        <result property="orders" column="orders"/>
+        <result property="usercode" column="usercode"/>
+        <result property="tQuestionStemId" column="t_question_stem_id"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id
+        ,test_paper_id,file_url,content,type,level,analysis,right_answers,code,score,orders,usercode
+    </sql>
+    <update id="deleteByPaperInfoIds">
+        <foreach collection="paperInfoIds" item="item" separator=";">
+            update t_test_paper_question_stem
+            set deleted = 1
+            where test_paper_info_id = #{item} and deleted = 0
+        </foreach>
+    </update>
+
+    <select id="findList" resultMap="tTestPaperQuestionStemMap">
+        select
+        <include refid="columns"/>
+        from t_test_paper_question_stem
+        <where>
+            <if test="id != null">
+                id = #{id}
+            </if>
+            <if test="testPaperId != null">
+                test_paper_id = #{testPaperId}
+            </if>
+            <if test="fileUrl != null and fileUrl != ''">
+                file_url = #{fileUrl}
+            </if>
+            <if test="content != null and content != ''">
+                content = #{content}
+            </if>
+            <if test="type != null and type != ''">
+                type = #{type}
+            </if>
+            <if test="level != null">
+                level = #{level}
+            </if>
+            <if test="analysis != null and analysis != ''">
+                analysis = #{analysis}
+            </if>
+            <if test="rightAnswers != null and rightAnswers != ''">
+                right_answers = #{rightAnswers}
+            </if>
+            <if test="code != null and code != ''">
+                code = #{code}
+            </if>
+            <if test="order != null and order != ''">
+                order = #{order}
+            </if>
+            <if test="usercode != null and usercode != ''">
+                usercode = #{usercode}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectByPaperId"
+            resultType="cn.iocoder.yudao.module.knowledge.controller.responsevo.TQuestionAnswervo">
+        select right_answers, type, orders
+        from t_test_paper_question_stem
+        where test_paper_id = #{testPaperId}
+    </select>
+
+    <select id="queryPaper" resultMap="tTestPaperQuestionStemMap">
+        select id,t_question_stem_id,test_paper_info_id ,content, score,type, level, orders from t_test_paper_question_stem
+        <where>
+            deleted = 0
+            <if test="testPaperInfoId != null">
+                and test_paper_info_id = #{testPaperInfoId}
+            </if>
+            <if test="type != null and type == '1'.toString()">
+                and user_id = #{userId}
+            </if>
+        </where>
+        order by orders asc
+    </select>
+
+    <select id="queryAnswer" resultMap="tTestPaperQuestionStemMap">
+        select id,type, right_answers,score,t_question_stem_id from t_test_paper_question_stem
+        <where>
+            deleted = 0
+            <if test="testPaperInfoId != null">
+                and test_paper_info_id = #{testPaperInfoId}
+            </if>
+            <if test="type != null and type == '1'.toString()">
+                and usercode = #{userId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getOneByTrainId"
+            resultMap="tTestPaperQuestionStemMap">
+        select *
+        from t_test_paper_question_stem
+        where test_paper_info_id = #{id}
+        and deleted = 0
+    </select>
+
+    <update id="deleteByTrainId"
+            parameterType="java.lang.Long">
+        update t_test_paper_question_stem
+        set deleted = 1
+        where train_id = #{id}
+    </update>
+
+    <update id="deleteByPaperInfId"
+            parameterType="java.lang.Long">
+        update t_test_paper_question_stem
+        set deleted = 1
+        where test_paper_info_id = #{id}
+    </update>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainMapper.xml
new file mode 100644
index 00000000..a9a948be
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainMapper.xml
@@ -0,0 +1,144 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TTrainMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrain" id="tTrainMap">
+            <result property="id" column="id"/>
+            <result property="code" column="code"/>
+            <result property="name" column="name"/>
+            <result property="holdUnit" column="hold_unit"/>
+            <result property="holdForm" column="hold_form"/>
+            <result property="plan" column="plan"/>
+            <result property="teacherName" column="teacher_name"/>
+            <result property="teacherEducation" column="teacher_education"/>
+            <result property="jobTitle" column="job_title"/>
+            <result property="teachTime" column="teach_time"/>
+            <result property="handAddress" column="hand_address"/>
+            <result property="startTime" column="start_time"/>
+            <result property="stopTime" column="stop_time"/>
+            <result property="holdApprovalOpinion" column="hold_approval_opinion"/>
+            <result property="coApprovalOpinion" column="co_approval_opinion"/>
+            <result property="desrc" column="desrc"/>
+            <result property="examTime" column="start_date"/>
+        <result property="duration" column="duration"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,code,name,hold_unit,hold_form,plan,teacher_name,teacher_education,job_title,teach_time,hand_address,start_time,stop_time,hold_approval_opinion,co_approval_opinion,desrc
+    </sql>
+    <select id="findList" resultMap="tTrainMap">
+        select
+        <include refid="columns"/>
+        from t_train tt
+        <where>
+            deleted = 0
+                    <if test="params.id != null">
+                        and id = #{params.id}
+                    </if>
+                    <if test="params.code != null and params.code != ''">
+                        and code = #{params.code}
+                    </if>
+                    <if test="params.name != null and params.name != ''">
+                        and name like concat('%', #{params.name},'%')
+                    </if>
+                    <if test="params.holdUnit != null and params.holdUnit != ''">
+                        and hold_unit = #{params.holdUnit}
+                    </if>
+                    <if test="params.holdForm != null">
+                        and hold_form = #{params.holdForm}
+                    </if>
+                    <if test="params.plan != null and params.plan != ''">
+                        and plan = #{params.plan}
+                    </if>
+                    <if test="params.teacherName != null and params.teacherName != ''">
+                        and teacher_name like concat('%', #{params.teacherName}, '%')
+                    </if>
+                    <if test="params.teacherEducation != null and params.teacherEducation != ''">
+                        and  teacher_education = #{params.teacherEducation}
+                    </if>
+                    <if test="params.jobTitle != null and params.jobTitle != ''">
+                        and  job_title = #{params.jobTitle}
+                    </if>
+                    <if test="params.handAddress != null and params.handAddress != ''">
+                        and  hand_address like concat('%', #{params.handAddress},'%')
+                    </if>
+                    <if test="params.startTime != null">
+                        and  start_time <![CDATA[<=]]> #{params.startTime}
+                        and stop_time  <![CDATA[>=]]> #{params.startTime}
+                    </if>
+
+                    <if test="params.holdApprovalOpinion != null and params.holdApprovalOpinion != ''">
+                        and  hold_approval_opinion = #{params.holdApprovalOpinion}
+                    </if>
+                    <if test="params.coApprovalOpinion != null and params.coApprovalOpinion != ''">
+                        and co_approval_opinion = #{params.coApprovalOpinion}
+                    </if>
+                    <if test="params.desrc != null and params.desrc != ''">
+                        and   desrc = #{params.desrc}
+                    </if>
+        </where>
+         order by create_time desc
+    </select>
+
+    <select id="findListByUser" resultMap="tTrainMap">
+        select
+        distinct tt.id,tt.code,tt.name,tt.hold_unit,tt.hold_form,tt.plan,
+        tt.teacher_name,tt.teacher_education,tt.job_title,tt.teach_time,tt.hand_address,
+        tt.start_time,tt.stop_time,tt.hold_approval_opinion,tt.co_approval_opinion,tt.desrc,
+        ttp.duration,ttp.start_date,tt.create_time
+        from t_train tt
+        left join t_test_paper_info ttp on ttp.train_id = tt.id and ttp.deleted = 0
+        inner join t_train_user ttu on tt.id = ttu.train_id and ttu.deleted = 0
+        <where>
+            tt.deleted = 0 and ttu.usercode = #{params.usercode}
+            <if test="params.id != null">
+                and tt.id = #{params.id}
+            </if>
+            <if test="params.code != null and params.code != ''">
+                and tt.code = #{params.code}
+            </if>
+            <if test="params.name != null and params.name != ''">
+                and tt.name like concat('%', #{params.name},'%')
+            </if>
+            <if test="params.holdUnit != null and params.holdUnit != ''">
+                and tt.hold_unit = #{params.holdUnit}
+            </if>
+            <if test="params.holdForm != null">
+                and tt.hold_form = #{params.holdForm}
+            </if>
+            <if test="params.plan != null and params.plan != ''">
+                and tt.plan = #{params.plan}
+            </if>
+            <if test="params.teacherName != null and params.teacherName != ''">
+                and tt.teacher_name like concat('%', #{params.teacherName}, '%')
+            </if>
+            <if test="params.teacherEducation != null and params.teacherEducation != ''">
+                and  tt.teacher_education = #{params.teacherEducation}
+            </if>
+            <if test="params.jobTitle != null and params.jobTitle != ''">
+                and  tt.job_title = #{params.jobTitle}
+            </if>
+            <if test="params.handAddress != null and params.handAddress != ''">
+                and  tt.hand_address like concat('%', #{params.handAddress},'%')
+            </if>
+            <if test="params.startTime != null">
+                and  tt.start_time <![CDATA[<=]]> #{params.startTime}
+                and tt.stop_time  <![CDATA[>=]]> #{params.startTime}
+            </if>
+
+            <if test="params.holdApprovalOpinion != null and params.holdApprovalOpinion != ''">
+                and  tt.hold_approval_opinion = #{params.holdApprovalOpinion}
+            </if>
+            <if test="params.coApprovalOpinion != null and params.coApprovalOpinion != ''">
+                and tt.co_approval_opinion = #{params.coApprovalOpinion}
+            </if>
+            <if test="params.desrc != null and params.desrc != ''">
+                and   tt.desrc = #{params.desrc}
+            </if>
+        </where>
+        order by tt.create_time desc
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainMaterialMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainMaterialMapper.xml
new file mode 100644
index 00000000..dc6baf18
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainMaterialMapper.xml
@@ -0,0 +1,59 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TTrainMaterialMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainMaterial" id="tTrainMaterialMap">
+            <result property="id" column="id"/>
+            <result property="order" column="order"/>
+            <result property="coursewareId" column="courseware_id"/>
+            <result property="teachCode" column="teach_code"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,order,courseware_id,teach_code
+    </sql>
+    <select id="findList" resultMap="tTrainMaterialMap">
+        select
+        <include refid="columns"/>
+        from t_train_material
+        <where>
+                    <if test="id != null">
+                        id = #{id}
+                    </if>
+                    <if test="order != null">
+                        order = #{order}
+                    </if>
+                    <if test="coursewareId != null">
+                        courseware_id = #{coursewareId}
+                    </if>
+                    <if test="teachCode != null and teachCode != ''">
+                            teach_code = #{teachCode}
+                    </if>
+        </where>
+    </select>
+
+    <select id="getMaterials" resultMap="tTrainMaterialMap">
+        select
+        <include refid="columns"/>
+        from t_train_material
+        <where>
+            <if test="params.coursewareId != null">
+                courseware_id = #{params.coursewareId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getOneByTrainId" resultType="cn.iocoder.yudao.module.knowledge.entity.TTrainMaterial">
+        select *
+        from t_train_material
+        where train_id = #{trainId}
+         and deleted = 0
+    </select>
+
+    <update id="deleteByTrainId"
+              parameterType="java.lang.Long">
+        update t_train_material set deleted = 1 where train_id = #{id}
+    </update>
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainRecordMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainRecordMapper.xml
new file mode 100644
index 00000000..741a2942
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainRecordMapper.xml
@@ -0,0 +1,163 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TTrainRecordMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainRecord" id="tTrainRecordMap">
+            <result property="id" column="id"/>
+            <result property="name" column="name"/>
+            <result property="trainId" column="train_id"/>
+            <result property="startTime" column="start_time"/>
+            <result property="userId" column="user_id"/>
+            <result property="paperInfoId" column="paperInfoId"/>
+             <result property="userName" column="user_name"/>
+    </resultMap>
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainRecord" id="tTrainRecordMapss">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="userName" column="user_name"/>
+        <result property="holdUnit" column="hold_unit"/>
+        <result property="handAddress" column="hand_address"/>
+        <result property="startTime" column="start_time"/>
+        <result property="content" column="content"/>
+    </resultMap>
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainRecord" id="tTrainRecordMaps">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="trainId" column="train_id"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="userId" column="user_id"/>
+        <result property="paperInfoId" column="paperInfoId"/>
+        <result property="allScore" column="all_score"/>
+        <result property="passScore" column="pass_score"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,name,train_id,start_time,user_id
+    </sql>
+    <select id="findList" resultMap="tTrainRecordMap">
+        SELECT
+        distinct ttr.id,
+        ttr.train_id,
+        ttr.start_time,
+        ttr.NAME,
+        ttr.user_id userId,
+        ttpi.id paperInfoId,
+        ttr.create_time,
+        ttr.user_name
+        FROM
+        t_train_record ttr
+        LEFT JOIN t_test_paper_info ttpi ON ttr.train_id = ttpi.train_id
+        <where>
+            ttr.deleted = 0
+            <if test="params.name!=null and params.name!=''">
+               and (ttr.name like concat('%',#{params.name},'%') or  ttr.user_name like concat('%',#{params.name},'%'))
+            </if>
+            <if test="params.userId!=null and params.userId!=''">
+                and ttr.user_id = #{params.userId}
+            </if>
+            <if test="params.startTime!=null">
+                and ttr.start_time like concat(#{params.startTime},'%')
+            </if>
+        </where>
+
+        order by ttr.create_time desc
+    </select>
+
+    <select id="findListAll" resultMap="tTrainRecordMapss">
+        SELECT
+        tt.id,
+        tt.name,
+        ttr.user_name,
+        tt.hold_unit,
+        tt.hand_address,
+        tt.start_time,
+        ttr.content
+        FROM
+        t_train_record ttr
+        left join  t_train tt on tt.id = ttr.train_id
+        <where>
+            ttr.deleted = 0 	AND ttr.paper_info_id IS NULL
+            <if test="params.name!=null and params.name!=''">
+                and ttr.name like concat('%',#{params.name},'%')
+            </if>
+
+            <if test="params.userName!=null and params.userName!=''">
+                and ttr.username like concat('%',#{params.userName},'%')
+            </if>
+        </where>
+        group by tt.id,ttr.user_id
+        order by ttr.create_time desc
+    </select>
+
+<!--    <select id="findListOwn" resultMap="tTrainRecordMaps">-->
+<!--        SELECT-->
+<!--        distinct ttr.id,-->
+<!--        ttpi.start_date,-->
+<!--        ttpi.end_date,-->
+<!--        ttpi.NAME,-->
+<!--        ttr.user_id userId,-->
+<!--        ttpi.id paperInfoId,-->
+<!--        ttpi.all_score,-->
+<!--        ttr.create_time-->
+<!--        FROM-->
+<!--        t_train_record ttr-->
+<!--        LEFT JOIN t_test_paper_info ttpi ON ttr.paper_info_id = ttpi.id-->
+<!--        <where>-->
+<!--            ttr.deleted = 0-->
+<!--            <if test="params.name!=null and params.name!=''">-->
+<!--                and ttr.name like concat('%',#{params.name},'%')-->
+<!--            </if>-->
+<!--            <if test="params.userId!=null and params.userId!=''">-->
+<!--                and ttr.user_id = #{params.userId}-->
+<!--            </if>-->
+<!--            <if test="params.startTime!=null">-->
+<!--                and ttpi.start_date like concat(#{params.startTime},'%')-->
+<!--            </if>-->
+<!--        </where>-->
+
+<!--        order by ttr.create_time desc-->
+<!--    </select>-->
+
+
+    <select id="findListOwn" resultMap="tTrainRecordMaps">
+        select
+        ttpi.id paperInfoId,
+        ttpi.all_score,
+        ttpi.start_date,
+        ttpi.end_date,
+        ttpi.NAME,
+        ttpi.pass_score,
+        ttu.usercode userId
+        from t_train_user ttu
+        LEFT JOIN t_test_paper_info ttpi ON ttu.paper_info_id = ttpi.id
+        <where>
+            ttpi.deleted = 0
+            <if test="params.name!=null and params.name!=''">
+                and ttpi.name like concat('%',#{params.name},'%')
+            </if>
+            <if test="params.userId!=null and params.userId!=''">
+                and ttu.usercode = #{params.userId}
+            </if>
+            <if test="params.startTime!=null">
+                and #{params.startTime} between ttpi.start_date and ttpi.end_date
+            </if>
+        </where>
+
+        order by ttpi.create_time desc
+    </select>
+
+    <select id="selectByTrainId" resultMap="tTrainRecordMaps">
+        select
+        *
+        from t_train_record
+        where
+            deleted = 0
+            and train_id = #{trainId}
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainReportMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainReportMapper.xml
new file mode 100644
index 00000000..6f8e4e5c
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainReportMapper.xml
@@ -0,0 +1,74 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TTrainReportMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainReport" id="tTrainReportMap">
+        <result property="id" column="id"/>
+        <result property="trainId" column="train_id"/>
+        <result property="name" column="name"/>
+        <result property="holdUnit" column="hold_unit"/>
+        <result property="purpose" column="purpose"/>
+        <result property="content" column="content"/>
+        <result property="studentsum" column="studentSum"/>
+        <result property="attendance" column="attendance"/>
+        <result property="holdForm" column="hold_form"/>
+        <result property="examForm" column="exam_form"/>
+        <result property="passSum" column="pass_sum"/>
+        <result property="failSum" column="fail_sum"/>
+        <result property="competencyRate" column="competency_rate"/>
+        <result property="appointmentRate" column="appointment_rate"/>
+        <result property="teacherName" column="teacher_name"/>
+        <result property="teacherEducation" column="teacher_education"/>
+        <result property="jobTitle" column="job_title"/>
+        <result property="isNote" column="is_note"/>
+        <result property="isFinishPlan" column="is_finish_plan"/>
+        <result property="teachLevel" column="teach_level"/>
+        <result property="teachMethod" column="teach_method"/>
+        <result property="evaluateOne" column="evaluate_one"/>
+        <result property="evaluateTwo" column="evaluate_two"/>
+        <result property="evaluateThree" column="evaluate_three"/>
+        <result property="isAchievePurpose" column="is_achieve_purpose"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="identityId" column="identity_id"/>
+        <result property="deleted" column="deleted"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id
+        ,train_id,name,hold_unit,purpose,content,studentSum,attendance,hold_form,exam_form,pass_sum,fail_sum,competency_rate,appointment_rate,teacher_name,teacher_education,job_title,is_note,is_finish_plan,teach_level,teach_method,evaluate_one,evaluate_two,evaluate_three,is_achieve_purpose,create_time,update_time,dept_id,identity_id,deleted
+    </sql>
+
+    <select id="findList" resultMap="tTrainReportMap">
+        select
+        ttr.*
+        from t_train_report ttr
+        inner join t_train tt on ttr.train_id = tt.id and tt.deleted = 0
+        <where>
+            ttr.deleted = 0
+            <if test="params.name != '' and params.name != null">
+                AND ttr.`name` LIKE CONCAT( '%',#{params.name}, '%')
+            </if>
+            <if test="params.startTime != '' and params.startTime != null">
+                AND ttr.`update_time` LIKE CONCAT(#{params.startTime}, '%')
+            </if>
+        </where>
+        order by update_time desc
+    </select>
+
+    <select id="selectByTrainId" resultMap="tTrainReportMap">
+        select
+        *
+        from t_train_report
+        <where>
+            deleted = 0
+            and train_id = #{trainId}
+        </where>
+        order by update_time desc
+        limit 1
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainTeacherMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainTeacherMapper.xml
new file mode 100644
index 00000000..9598e7f3
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainTeacherMapper.xml
@@ -0,0 +1,43 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TTrainTeacherMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainTeacher" id="tTrainTeacherMap">
+            <result property="teacherName" column="teacher_name"/>
+            <result property="professional" column="professional"/>
+            <result property="educationalBackground" column="educational_background"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        teacher_name,professional,educational_background
+    </sql>
+    <select id="findList" resultMap="tTrainTeacherMap">
+        select
+        <include refid="columns"/>
+        from t_train_teacher
+        <where>
+                    <if test="teacherName != null and teacherName != ''">
+                            teacher_name = #{teacherName}
+                    </if>
+                    <if test="professional != null and professional != ''">
+                            professional = #{professional}
+                    </if>
+                    <if test="educationalBackground != null and educationalBackground != ''">
+                            educational_background = #{educationalBackground}
+                    </if>
+        </where>
+    </select>
+
+    <select id="findOneByName" resultType="cn.iocoder.yudao.module.knowledge.entity.TTrainTeacher">
+        select *
+        from t_train_teacher
+        <where>
+            <if test="teacherName != null and teacherName != ''">
+                teacher_name = #{teacherName}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainUserMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainUserMapper.xml
new file mode 100644
index 00000000..ceb38d8f
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainUserMapper.xml
@@ -0,0 +1,113 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TTrainUserMapper">
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainUser" id="tTrainUserMap">
+        <result property="id" column="id"/>
+        <result property="username" column="username"/>
+        <result property="trainId" column="train_id"/>
+        <result property="teachCode" column="teach_code"/>
+    </resultMap>
+
+    <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainUser" id="tTrainUserMaps">
+        <result property="id" column="id"/>
+        <result property="username" column="username"/>
+        <result property="paperInfoId" column="paper_info_id"/>
+        <result property="teachCode" column="teach_code"/>
+    </resultMap>
+
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id
+        ,username,usercode,teach_code
+    </sql>
+    <select id="paperInfList" resultMap="tTrainUserMaps">
+        select
+        <include refid="columns"/>
+        from t_train_user
+        <where>
+            <if test="params.id != null">
+                id = #{params.id}
+            </if>
+            <if test="params.username != null and params.username != ''">
+                username = #{params.username}
+            </if>
+            <if test="params.usercode != null and params.usercode != ''">
+                usercode = #{params.usercode}
+            </if>
+            <if test="params.teachCode != null and params.teachCode != ''">
+                teach_code = #{params.teachCode}
+            </if>
+            <if test="params.paperInfoId != null">
+                paper_info_id = #{params.paperInfoId}
+            </if>
+        </where>
+    </select>
+
+    <select id="findList" resultMap="tTrainUserMap">
+        select
+        <include refid="columns"/>
+        from t_train_user
+        <where>
+            <if test="params.id != null">
+                id = #{params.id}
+            </if>
+            <if test="params.username != null and params.username != ''">
+                username = #{params.username}
+            </if>
+            <if test="params.usercode != null and params.usercode != ''">
+                usercode = #{params.usercode}
+            </if>
+            <if test="params.teachCode != null and params.teachCode != ''">
+                teach_code = #{params.teachCode}
+            </if>
+            <if test="params.trainId != null">
+                train_id = #{params.trainId}
+            </if>
+            <if test="params.trainIdList != null and params.trainIdList.size() > 0">
+                train_id in
+                <foreach collection="params.trainIdList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="getOneByTrainId" resultType="cn.iocoder.yudao.module.knowledge.entity.TTrainUser">
+        select *
+        from t_train_user
+        <where>
+            train_id = #{id}
+        </where>
+    </select>
+
+    <select id="getOneByPaperInfoId" resultType="cn.iocoder.yudao.module.knowledge.entity.TTrainUser">
+        select *
+        from t_train_user
+        <where>
+            paper_info_id = #{id}
+        </where>
+    </select>
+    <select id="findListByUserId" resultType="cn.iocoder.yudao.module.knowledge.entity.TTrainUser">
+        select *
+        from t_train_user
+        where deleted = 0
+          and usercode = #{userId}
+    </select>
+
+    <delete id="deleteByTrainId"
+            parameterType="java.lang.Long">
+        delete
+        from t_train_user
+        where train_id = #{id}
+    </delete>
+
+    <delete id="deleteBypaperInfId"
+            parameterType="java.lang.Long">
+        delete
+        from t_train_user
+        where paper_info_id = #{id}
+    </delete>
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TViolationImageMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TViolationImageMapper.xml
new file mode 100644
index 00000000..af79b8b1
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TViolationImageMapper.xml
@@ -0,0 +1,51 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TViolationImageMapper" >
+
+
+  <select id="selectByViolationId" resultType="cn.iocoder.yudao.module.knowledge.entity.TViolationImage">
+    SELECT
+    id AS id,
+    filename AS filename,
+    file_size AS fileSize,
+    file_url AS fileUrl,
+    sort AS sort,
+    violation_code AS violationCode,
+    dept_id AS deptId,
+    identity_id AS identityId,
+    create_time AS createTime,
+    update_time AS updateTime,
+    creator AS creator,
+    violation_id AS violationId
+    FROM t_violation_image
+    WHERE
+          violation_id = #{id}
+      AND deleted = 0
+    ORDER BY
+      create_time DESC
+  </select>
+
+  <select id="findOneForApp" resultType="cn.iocoder.yudao.module.knowledge.entity.TViolationImage">
+    SELECT
+      id AS id,
+      filename AS filename,
+      file_size AS fileSize,
+      file_url AS fileUrl,
+      sort AS sort,
+      violation_code AS violationCode,
+      dept_id AS deptId,
+      identity_id AS identityId,
+      create_time AS createTime,
+      update_time AS updateTime,
+      creator AS creator,
+      violation_id AS violationId
+    FROM t_violation_image
+    WHERE
+      violation_id = #{id}
+      AND deleted = 0
+    ORDER BY
+      create_time DESC
+  </select>
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TViolationMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TViolationMapper.xml
new file mode 100644
index 00000000..0a904964
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/TViolationMapper.xml
@@ -0,0 +1,104 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.TViolationMapper" >
+  <resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.knowledge.entity.TViolation" >
+    <id property="id" column="id" jdbcType="BIGINT" />
+    <result property="title" column="filename" jdbcType="VARCHAR" />
+    <result property="type" column="type" jdbcType="VARCHAR" />
+    <result property="violator" column="violator" jdbcType="VARCHAR" />
+    <result property="descr" column="descr" jdbcType="VARCHAR" />
+    <result property="code" column="violation_code" jdbcType="VARCHAR" />
+    <result property="violationTime" column="violation_time" jdbcType="TIMESTAMP" />
+    <result property="lastPushTime" column="last_push_time" jdbcType="TIMESTAMP" />
+
+    <result property="violationB" column="file_url" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <insert id="saveRelatedImgInfo" parameterType="List">
+    INSERT INTO t_violation_image (
+      filename,
+      file_size,
+      file_url,
+      sort,
+      violation_code,
+    )
+    VALUES
+    <foreach collection="paramList" item="item" separator=",">
+      (
+      #{item.filename},
+      #{item.fileSize},
+      #{item.fileUrl},
+      #{item.sort},
+      #{item.violationCode}
+      )
+    </foreach>
+
+  </insert>
+
+  <select id="getListPage" resultType="cn.iocoder.yudao.module.knowledge.entity.TViolation">
+    SELECT
+      id AS id,
+      CODE AS CODE,
+      title AS title,
+      type AS type,
+      violator AS violator,
+      descr AS descr,
+      code AS code,
+      violation_time AS violationTime,
+      last_push_time AS lastPushTime,
+      creator AS creator,
+      violation_b AS violationB,
+      dept_id AS deptId,
+      identity_id AS identityId
+    FROM t_violation
+    WHERE
+        deleted = 0
+    <if test="dto.title != '' and dto.title != null">
+      AND `title` LIKE CONCAT( '%',#{dto.title}, '%')
+    </if>
+    <if test=" dto.violationTime != null">
+      AND DATE(violation_time) = #{dto.violationTime}
+    </if>
+    <if test="dto.bgnTime!=null">
+      AND (violation_time >= date_format(#{dto.bgnTime},'%y-%m-%d 00:00:00') and violation_time <![CDATA[<=]]> date_format(#{dto.endTime},'%y-%m-%d 23:59:59'))
+    </if>
+    ORDER BY
+        violation_time DESC
+  </select>
+
+  <select id="appFindAll" resultType="cn.iocoder.yudao.module.knowledge.entity.TViolation">
+    SELECT
+    id AS id,
+    CODE AS CODE,
+    title AS title,
+    type AS type,
+    violator AS violator,
+    descr AS descr,
+    code AS code,
+    violation_time AS violationTime,
+    last_push_time AS lastPushTime,
+    creator AS creator,
+    violation_b AS violationB,
+    dept_id AS deptId,
+    identity_id AS identityId
+    FROM t_violation
+    WHERE
+    deleted = 0
+    <if test="dto.title != '' and dto.title != null">
+      AND `title` LIKE CONCAT( '%',#{dto.title}, '%')
+    </if>
+    <if test=" dto.violationTime != null">
+      AND DATE(violation_time) = #{dto.violationTime}
+    </if>
+    <if test=" dto.violator != null">
+      AND `violator` LIKE CONCAT( '%',#{dto.violator}, '%')
+    </if>
+    <if test="dto.bgnTime!=null">
+      AND (violation_time >= date_format(#{dto.bgnTime},'%y-%m-%d 00:00:00') and violation_time <![CDATA[<=]]> date_format(#{dto.endTime},'%y-%m-%d 23:59:59'))
+    </if>
+    ORDER BY
+    violation_time DESC
+  </select>
+
+
+</mapper>
diff --git a/dl-module-knowledge/src/main/resources/mapper/UserInfoMapper.xml b/dl-module-knowledge/src/main/resources/mapper/UserInfoMapper.xml
new file mode 100644
index 00000000..ec16add2
--- /dev/null
+++ b/dl-module-knowledge/src/main/resources/mapper/UserInfoMapper.xml
@@ -0,0 +1,96 @@
+<?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="cn.iocoder.yudao.module.knowledge.mapper.UserInfoMapper" >
+  <resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.knowledge.entity.UserInfo" >
+    <id column="ID" property="id" jdbcType="DECIMAL" />
+    <result column="USERNAME" property="username" jdbcType="VARCHAR" />
+    <result column="PASSWORD" property="password" jdbcType="VARCHAR" />
+    <result column="AGE" property="age" jdbcType="INTEGER" />
+    <result column="MOBILE" property="mobile" jdbcType="VARCHAR" />
+    <result column="SEX" property="sex" jdbcType="TINYINT" />
+    <result column="BIRTHDAY" property="birthday" jdbcType="TIMESTAMP" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="DEPT_ID" jdbcType="DECIMAL" property="deptId" />
+    <result column="IDENTITY_ID" jdbcType="VARCHAR" property="identityId" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    ID, USERNAME, PASSWORD, AGE, MOBILE , SEX, BIRTHDAY,CREATE_TIME, UPDATE_TIME,IDENTITY_ID,DEPT_ID,DELETED
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from USER_INFO
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+
+<!--  <select id="selectById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >-->
+<!--    select-->
+<!--    <include refid="Base_Column_List" />-->
+<!--    from USER_INFO-->
+<!--    where ID = #{id,jdbcType=DECIMAL}-->
+<!--  </select>-->
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from USER_INFO
+    where id = #{id,jdbcType=DECIMAL}
+  </delete>
+  <insert id="insert" parameterType="cn.iocoder.yudao.module.knowledge.entity.UserInfo" useGeneratedKeys="true" keyProperty="id">
+    insert into USER_INFO ( ID, USERNAME, PASSWORD, AGE, MOBILE , SEX, BIRTHDAY, CREATE_TIME, UPDATE_TIME,IDENTITY_ID,DEPT_ID,DELETED)
+    values (#{id,jdbcType=DECIMAL}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
+      #{age,jdbcType=INTEGER}, #{mobile,jdbcType=VARCHAR}, #{sex,jdbcType=TINYINT},
+      #{birthday,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
+            #{deptId,jdbcType=DECIMAL},
+            #{deleted,jdbcType=DECIMAL},
+            #{identityId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertUser"  parameterType="cn.iocoder.yudao.module.knowledge.entity.UserInfo">
+    insert into USER_INFO ( USERNAME, PASSWORD, AGE, MOBILE , SEX, BIRTHDAY, CREATE_TIME, UPDATE_TIME,IDENTITY_ID,DEPT_ID,DELETED)
+    values ( #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
+            #{age,jdbcType=INTEGER}, #{mobile,jdbcType=VARCHAR}, #{sex,jdbcType=TINYINT},
+            #{birthday,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
+            #{identityId,jdbcType=VARCHAR},
+            #{deptId,jdbcType=DECIMAL},
+            #{deleted,jdbcType=DECIMAL}
+          )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="cn.iocoder.yudao.module.knowledge.entity.UserInfo" >
+    update USER_INFO
+    set USERNAME = #{username,jdbcType=VARCHAR},
+        PASSWORD = #{password,jdbcType=VARCHAR},
+        AGE = #{age,jdbcType=INTEGER},
+        MOBILE = #{mobile,jdbcType=VARCHAR},
+        SEX = #{sex,jdbcType=TINYINT},
+        BIRTHDAY = #{birthday,jdbcType=TIMESTAMP},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      DEPT_ID = #{deptId,jdbcType=DECIMAL},
+      IDENTITY_ID = #{identityId,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateAge"  parameterType="cn.iocoder.yudao.module.knowledge.entity.UserInfo">
+    update USER_INFO
+    set AGE = #{age,jdbcType=INTEGER} , UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByName" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from USER_INFO
+    where USERNAME = #{username,jdbcType=VARCHAR}
+  </select>
+  <select id="getMyById" resultType="cn.iocoder.yudao.module.knowledge.entity.UserInfo">
+    select
+    <include refid="Base_Column_List" />
+    from USER_INFO
+    where ID = #{id,jdbcType=DECIMAL}
+
+  </select>
+  <select id="selectPageVo" resultType="cn.iocoder.yudao.module.knowledge.entity.UserInfo">
+    select
+    <include refid="Base_Column_List" />
+    from USER_INFO
+    where  USERNAME = #{username,jdbcType=VARCHAR}
+  </select>
+</mapper>
diff --git a/pom.xml b/pom.xml
index 0d2f935c..836e3d7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
         <module>dl-module-company</module>
         <!-- Server 主项目 -->
         <module>yudao-server</module>
+        <module>dl-module-knowledge</module>
 
         <!--        <module>yudao-module-ai</module>-->
     </modules>
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/CommonStr.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/CommonStr.java
index 8941219c..f8bb053e 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/CommonStr.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/CommonStr.java
@@ -8,4 +8,6 @@ package cn.iocoder.yudao.framework.common.config;
 public interface CommonStr {
     /** 默认点亮科技租户 --1 */
     Long TENANT_ID=1L;
+    /** 默认超级管理员id --1 */
+    Long SUPER_ADMIN_ID=1L;
 }
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java
index ff9087a8..1f6809e6 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java
@@ -16,6 +16,17 @@ public final class PageResult<T> implements Serializable {
 
     @Schema(description = "总量", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long total;
+    @Schema(
+            description = "当前页数据量",
+            requiredMode = Schema.RequiredMode.REQUIRED
+    )
+    private Integer currentSize;
+    @Schema(
+            description = "当前页数",
+            requiredMode = Schema.RequiredMode.REQUIRED
+    )
+    private Integer currentPage;
+
 
     public PageResult() {
     }
@@ -29,7 +40,12 @@ public final class PageResult<T> implements Serializable {
         this.list = new ArrayList<>();
         this.total = total;
     }
-
+    public PageResult(List<T> list, Long total, Integer currentSize, Integer currentPage) {
+        this.list = list;
+        this.total = total;
+        this.currentPage = currentSize;
+        this.currentSize = currentPage;
+    }
     public static <T> PageResult<T> empty() {
         return new PageResult<>(0L);
     }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java
index fcb776a3..38ca80c4 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java
@@ -54,7 +54,7 @@ public class DeptDataPermissionRule implements DataPermissionRule {
     protected static final String CONTEXT_KEY = DeptDataPermissionRule.class.getSimpleName();
 
     private static final String DEPT_COLUMN_NAME = "dept_id";
-    private static final String USER_COLUMN_NAME = "user_id";
+    private static final String USER_COLUMN_NAME = "creator";
 
     static final Expression EXPRESSION_NULL = new NullValue();
 
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatConversationController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatConversationController.java
index 5142cde4..bafc4c44 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatConversationController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatConversationController.java
@@ -16,7 +16,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatMessageController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatMessageController.java
index 357dbec5..5086e575 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatMessageController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatMessageController.java
@@ -21,7 +21,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/conversation/AiChatConversationUpdateMyReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/conversation/AiChatConversationUpdateMyReqVO.java
index f9ce64ba..408e01bc 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/conversation/AiChatConversationUpdateMyReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/conversation/AiChatConversationUpdateMyReqVO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.ai.controller.admin.chat.vo.conversation;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 聊天对话更新【我的】 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java
index 89a84bcb..06020dde 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.chat.vo.message;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java
index de12ee1e..2c2d76c2 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java
@@ -19,7 +19,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageDrawReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageDrawReqVO.java
index a38935ef..b78c53c7 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageDrawReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageDrawReqVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.image.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.springframework.ai.openai.OpenAiImageOptions;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageUpdateReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageUpdateReqVO.java
index 45df0101..acc4ec41 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageUpdateReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageUpdateReqVO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.ai.controller.admin.image.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 绘画修改 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyActionReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyActionReqVO.java
index 28803a05..2da7355a 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyActionReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyActionReqVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.image.vo.midjourney;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 绘图操作（Midjourney） Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyImagineReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyImagineReqVO.java
index b9088263..b52fff87 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyImagineReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyImagineReqVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.image.vo.midjourney;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 绘画生成（Midjourney） Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/AiMindMapController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/AiMindMapController.java
index 01518026..3b58b0af 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/AiMindMapController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/AiMindMapController.java
@@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/vo/AiMindMapGenerateReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/vo/AiMindMapGenerateReqVO.java
index 08404bb0..e924033a 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/vo/AiMindMapGenerateReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/vo/AiMindMapGenerateReqVO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.ai.controller.admin.mindmap.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 思维导图生成 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiApiKeyController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiApiKeyController.java
index 2bc19005..0e617024 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiApiKeyController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiApiKeyController.java
@@ -14,7 +14,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatModelController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatModelController.java
index 08a53b28..fb15148b 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatModelController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatModelController.java
@@ -12,7 +12,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java
index 02f698b9..a76d3f56 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java
@@ -14,7 +14,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/AiMusicController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/AiMusicController.java
index 6c09e4b3..32a1774a 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/AiMusicController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/AiMusicController.java
@@ -11,7 +11,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateMyReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateMyReqVO.java
index 45767011..00589c91 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateMyReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateMyReqVO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.ai.controller.admin.music.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 修改我的音乐 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateReqVO.java
index 447bc976..2eab0e05 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateReqVO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.ai.controller.admin.music.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 音乐修改 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiSunoGenerateReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiSunoGenerateReqVO.java
index f72d2b54..437c79de 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiSunoGenerateReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiSunoGenerateReqVO.java
@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.ai.controller.admin.music.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/AiWriteController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/AiWriteController.java
index d27204d2..c42a285d 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/AiWriteController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/AiWriteController.java
@@ -13,7 +13,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/vo/AiWriteGenerateReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/vo/AiWriteGenerateReqVO.java
index 21c60420..6d077d06 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/vo/AiWriteGenerateReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/vo/AiWriteGenerateReqVO.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.write.vo;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
 import cn.iocoder.yudao.module.ai.enums.write.AiWriteTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 写作生成 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageService.java
index 716c7ea8..0908018e 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageService.java
@@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageUpdateReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.image.vo.midjourney.AiMidjourneyActionReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.image.vo.midjourney.AiMidjourneyImagineReqVO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.image.AiImageDO;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.util.List;
 
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiApiKeyService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiApiKeyService.java
index fe8fdd19..ff4afa54 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiApiKeyService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiApiKeyService.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.apikey.AiApiKeyPageReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.apikey.AiApiKeySaveReqVO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiApiKeyDO;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.image.ImageModel;
 
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelService.java
index f83ac73c..111e4267 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelService.java
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.chatModel.AiChatModelPageReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.chatModel.AiChatModelSaveReqVO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatModelDO;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatRoleService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatRoleService.java
index 81c8d259..147e362c 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatRoleService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatRoleService.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.ai.controller.admin.model.vo.chatRole.AiChatRoleP
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.chatRole.AiChatRoleSaveMyReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.chatRole.AiChatRoleSaveReqVO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatRoleDO;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/music/AiMusicService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/music/AiMusicService.java
index 49f8332d..a4b117bd 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/music/AiMusicService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/music/AiMusicService.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.ai.service.music;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.ai.controller.admin.music.vo.*;
 import cn.iocoder.yudao.module.ai.dal.dataobject.music.AiMusicDO;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.util.List;
 
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
index 8b2ce4fa..9125b5d9 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
@@ -46,6 +46,20 @@ public class FileController {
         return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));
     }
 
+    /**
+     * 返回详细版
+     * @param uploadReqVO
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/uploadDetail")
+    @Operation(summary = "上传文件", description = "模式一：后端上传文件")
+    public CommonResult<FileDO> uploadDetail(FileUploadReqVO uploadReqVO) throws Exception {
+        MultipartFile file = uploadReqVO.getFile();
+        String path = uploadReqVO.getPath();
+        return success(fileService.createFileDetail(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));
+    }
+
     @GetMapping("/presigned-url")
     @Operation(summary = "获取文件预签名地址", description = "模式二：前端上传文件：用于前端直接上传七牛、阿里云 OSS 等文件存储器")
     public CommonResult<FilePresignedUrlRespVO> getFilePresignedUrl(@RequestParam("path") String path) throws Exception {
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java
index 3ca9a241..cf40e74e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java
@@ -30,7 +30,7 @@ public interface FileService {
      * @return 文件路径
      */
     String createFile(String name, String path, byte[] content);
-
+    FileDO createFileDetail(String name, String path, byte[] content);
     /**
      * 创建文件
      *
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
index 8efa5fe6..85aa8121 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
@@ -70,6 +70,37 @@ public class FileServiceImpl implements FileService {
         return url;
     }
 
+    @Override
+    @SneakyThrows
+    public FileDO createFileDetail(String name, String path, byte[] content) {
+        // 计算默认的 path 名
+        String type = FileTypeUtils.getMineType(content, name);
+        if (StrUtil.isEmpty(path)) {
+            path = FileUtils.generatePath(content, name);
+        }
+        // 如果 name 为空，则使用 path 填充
+        if (StrUtil.isEmpty(name)) {
+            name = path;
+        }
+
+        // 上传到文件存储器
+        FileClient client = fileConfigService.getMasterFileClient();
+        Assert.notNull(client, "客户端(master) 不能为空");
+        String url = client.upload(content, path, type);
+
+        // 保存到数据库
+        FileDO file = new FileDO();
+        file.setConfigId(client.getId());
+        file.setName(name);
+        file.setPath(path);
+        file.setUrl(url);
+        file.setType(type);
+        file.setSize(content.length);
+        fileMapper.insert(file);
+        return file;
+    }
+
+
     @Override
     public Long createFile(FileCreateReqVO createReqVO) {
         FileDO file = BeanUtils.toBean(createReqVO, FileDO.class);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
index da3df783..efb27ec6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
@@ -3,12 +3,13 @@ package cn.iocoder.yudao.module.system.service.permission;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleSaveReqVO;
@@ -32,6 +33,7 @@ import org.springframework.util.StringUtils;
 import javax.annotation.Resource;
 import java.util.*;
 
+import static cn.iocoder.yudao.framework.common.config.CommonStr.SUPER_ADMIN_ID;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
@@ -181,7 +183,12 @@ public class RoleServiceImpl implements RoleService {
         }
         // 内置角色，不允许删除
         if (RoleTypeEnum.SYSTEM.getType().equals(role.getType())) {
-            throw exception(ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE);
+            /* 获取当前登录用户的信息 */
+            LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            if (loginUser != null && !SUPER_ADMIN_ID.equals(loginUser.getId())) {
+                //只有admin可以编辑
+                throw exception(ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE);
+            }
         }
         return role;
     }
diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml
index e2cf2bbc..8a937e53 100644
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -43,6 +43,12 @@
             <artifactId>dl-module-company</artifactId>
             <version>${revision}</version>
         </dependency>
+        <!-- 知识库包 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>dl-module-knowledge</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <!-- 会员中心。默认注释，保证编译速度 -->
 <!--        <dependency>-->
 <!--            <groupId>cn.iocoder.boot</groupId>-->
diff --git a/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java b/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java
index 57db3f94..75124921 100644
--- a/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java
+++ b/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java
@@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author 芋道源码
  */
 @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package}
-@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module"})
+@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module", "${yudao.info.base-package}"})
 public class YudaoServerApplication {
 
     public static void main(String[] args) {
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 9f10ab39..9f27aad7 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -177,6 +177,7 @@ logging:
     org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示
     cn.iocoder.yudao.module.custom.mapper: debug #
     cn.iocoder.yudao.module.company.mapper: debug #
+    cn.iocoder.yudao.module.staff.mapper: debug #
 
 debug: false
 
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index 8ea7f758..c2c46353 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -7,6 +7,7 @@ spring:
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
+    allow-bean-definition-overriding: true #允许bean的重复命名
 
   # Servlet 配置
   servlet:
@@ -83,6 +84,7 @@ mybatis-plus:
   mapper-locations:
     - classpath*:mapper/*/*.xml # 扫描子模块下的 mapper.xml文件
     - classpath:mapper/*/*.xml # 扫描当前模块下的 mapper.xml 文件
+    - classpath*:mapper/*.xml
   encryptor:
     password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成