From b4d83a922cf63a8f33cfb6fc00a6b4d7817ee0c3 Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Tue, 6 May 2025 11:48:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=87=AA=E6=9F=A5=E8=87=AA=E8=AF=84?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/com/ruoyi/EncFactory.java        |  2 +-
 .../system/domain/check/dto/TdCheckReportDTO.java  | 14 +++++++++++---
 .../system/domain/check/dto/TdCheckTypeDTO.java    | 14 ++++++++++----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java b/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java
index cd25fb8b..d39ee40d 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java
@@ -6,7 +6,7 @@ import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
 public class EncFactory {
     public static void main(String[] args) {
         String securityKey = "BUSINESS"; // 加密秘钥
-        String data = "123456"; // 需要加密的字符串
+        String data = "Admin@9000"; // 需要加密的字符串
 
         PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
         SimpleStringPBEConfig config = new SimpleStringPBEConfig();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckReportDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckReportDTO.java
index 853b618c..2f01d593 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckReportDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckReportDTO.java
@@ -1,10 +1,9 @@
 package com.ruoyi.system.domain.check.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+
 
 import java.io.Serializable;
 import java.util.Date;
@@ -25,21 +24,25 @@ public class TdCheckReportDTO implements Serializable {
     /**
      * 报告人员
      */
+    @Excel(name = "检查人员")
     private String adduser;
 
     /**
      * 报告人单位
      */
+    @Excel(name = "检查单位")
     private String depart;
 
     /**
      * 检查开始时间
      */
+    @Excel(name = "检查开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date checkStartTime;
 
     /**
      * 检查结束时间
      */
+    @Excel(name = "检查结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date checkEndTime;
 
     /**
@@ -50,11 +53,13 @@ public class TdCheckReportDTO implements Serializable {
     /**
      * 地区
      */
+    @Excel(name = "所属市州")
     private String area;
 
     /**
      * 市州
      */
+    @Excel(name = "所属区县")
     private String framework;
 
     /**
@@ -76,16 +81,19 @@ public class TdCheckReportDTO implements Serializable {
     /**
      * 实有项目总分
      */
+    @Excel(name = "实有项目总分")
     private String totalScore;
 
     /**
      * 实有项目得分
      */
+    @Excel(name = "实有项目得分")
     private String realScore;
 
     /**
      * 得分占比
      */
+    @Excel(name = "得分占比")
     private String percentageScore;
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckTypeDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckTypeDTO.java
index c5bc03ff..f7b38a0e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckTypeDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckTypeDTO.java
@@ -1,15 +1,14 @@
 package com.ruoyi.system.domain.check.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+
 
 import java.io.Serializable;
 
 /**
- * 
+ *
  * @author 13560
  * @TableName td_check_type
  */
@@ -28,12 +27,14 @@ public class TdCheckTypeDTO implements Serializable {
     /**
      * 自查类
      */
+
     private String checkType;
 
 
     /**
      * 自查类名称
      */
+    @Excel(name = "自查类")
     private String typeName;
 
     /**
@@ -45,23 +46,27 @@ public class TdCheckTypeDTO implements Serializable {
     /**
      * 自查项
      */
+    @Excel(name = "自查项")
     private String checkItems;
 
     /**
      * 自查内容
      */
+    @Excel(name = "自查内容")
     private String typeContent;
 
 
     /**
      * 分值
      */
+    @Excel(name = "分值")
     private String score;
 
 
     /**
      * 得分
      */
+    @Excel(name = "得分")
     private String realScore;
 
     /**
@@ -73,6 +78,7 @@ public class TdCheckTypeDTO implements Serializable {
     /**
      * 扣分标准
      */
+    @Excel(name = "扣分标准")
     private String deductionCriteria;
 
     /**