From 40fda3defd5ba660345aa9a7dd6b45a7bfcfb8ca Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 13 Dec 2024 10:56:41 +0800
Subject: [PATCH] bugfix

---
 .../declaration/entity/vo/BmsDeclarationRecordsQueryVo.java  | 5 +++++
 .../mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml   | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java
index d689902..30c94f6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java
@@ -99,6 +99,11 @@ public class BmsDeclarationRecordsQueryVo implements Serializable {
     @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审驳回,9=终审不通过，10=退回修改")
     private Long status;
 
+    @ApiModelProperty(value = "在线模板状态")
+    @Excel(name = "在线模板状态", readConverterExp = " 0=未开始 1=过期 2=有效 3=长期有效")
+    private Long  templateRecordStatus;
+
+
 
     /**
      * 对应模板json
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
index d44e4ff..ad4a22a 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
@@ -172,7 +172,8 @@
         a.remark,
         b.qymc as enterpriseName,
         f.road,
-        f.enterprise_directory
+        f.enterprise_directory,
+        f.status as templateRecordStatus
         FROM
         bms_declaration_records AS a
         LEFT JOIN bms_enterprise_basic_info b ON a.credit_code = b.tyshxydm