From 5a3e2279ab9a9cfb3b2b06f1ff245e7b8700506e Mon Sep 17 00:00:00 2001
From: renzexin <renzexin@163.com>
Date: Wed, 21 Aug 2024 09:51:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/project/service/WrkProjectService.java      | 7 +++++++
 .../src/main/resources/mapper/WrkProjectMapper.xml         | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
index 7bd9a98..494a23d 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
@@ -440,6 +440,13 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
     public void exportDispatchPage(HttpServletResponse response, ProjectQuery query) {
         WrapperUtils.buildSql(query);
         List<ProjectExportVO> records = baseMapper.exportDispatchPage(query);
+        for (ProjectExportVO record : records) {
+            if(record.getProjectEffect().equals("0")||record.getProjectEffect()=="0"){
+                record.setProjectEffect("到期");
+            }else if (record.getProjectEffect().equals("1")||record.getProjectEffect()=="1"){
+                record.setProjectEffect("正常");
+            }
+        }
         ExcelUtils.exportList(response, ProjectExportVO.class, records, "导出");
     }
 }
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml
index 52d3ad5..e84bd17 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.chushang.inspection.project.mapper.WrkProjectMapper">
 
     <select id="exportDispatchPage" resultType="com.chushang.inspection.project.vo.ProjectExportVO">
-        select project_name,dept_name,project_concat,project_phone,create_time from wrk_project
+        select project_name,dept_name,project_concat,project_phone,create_time,project_effect from wrk_project where del_state = 0
     </select>
 <!--    project_name,dept_name-->
 </mapper>