From f729ee763c74992dc0d6697930068309e46536dc Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 12 Dec 2023 15:46:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BB=B6=E6=9C=9F=E6=95=B0=E6=8D=AE=EF=BC=88?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EnterpriseStandardInspectController.java  | 4 ++--
 .../service/EnterpriseStandardInspectService.java        | 4 ++--
 .../impl/EnterpriseStandardInspectServiceImpl.java       | 9 ++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java
index 8b0404db..4d9834e0 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java
@@ -159,8 +159,8 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
 	@AutoLog(value = "企标稽查-导出延期数据")
 	@ApiOperation(value="企标稽查-导出延期数据", notes="企标稽查-导出延期数据")
 	@GetMapping("/exportDataWithDelay")
-	public void exportDataWithDelay(HttpServletResponse response, ESQueryCommonDTO esQueryCommonDTO) {
-		esInspectService.exportDataWithDelay(response, esQueryCommonDTO, "企标稽查-延期数据", "企标稽查-延期数据");
+	public void exportDataWithDelay(HttpServletResponse response, EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
+		esInspectService.exportDataWithDelay(response, enterpriseStandardInspectVo, "企标稽查-延期数据", "企标稽查-延期数据");
 	}
 
 	@RequiresPermissions("enterpriseStandardLibrary:check:exportRectificationPlan")
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java
index a19c8102..89b2d414 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java
@@ -38,11 +38,11 @@ public interface EnterpriseStandardInspectService extends IService<EnterpriseSta
     /**
      * 企标稽查-导出
      * @param response
-     * @param esQueryCommonDTO
+     * @param enterpriseStandardInspectVo
      * @param fileName
      * @param sheetName
      */
-    void exportDataWithDelay(HttpServletResponse response, ESQueryCommonDTO esQueryCommonDTO, String fileName, String sheetName);
+    void exportDataWithDelay(HttpServletResponse response, EnterpriseStandardInspectVo enterpriseStandardInspectVo, String fileName, String sheetName);
 
     /**
      * 企标稽查-导出整改计划
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
index 4eb7431c..9f673097 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
@@ -90,10 +90,17 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
     }
 
     @Override
-    public void exportDataWithDelay(HttpServletResponse response, ESQueryCommonDTO esQueryCommonDTO, String fileName, String sheetName) {
+    public void exportDataWithDelay(HttpServletResponse response, EnterpriseStandardInspectVo enterpriseStandardInspectVo, String fileName, String sheetName) {
         try {
             // 获取数据
             IPage<EnterpriseStandardInspectDelayVo> page = new Page<>(1, Integer.MAX_VALUE);
+            // 查询参数转换
+            ESQueryCommonDTO esQueryCommonDTO = new ESQueryCommonDTO();
+            esQueryCommonDTO.setStandardNo(enterpriseStandardInspectVo.getInspectNo());
+            esQueryCommonDTO.setStandardName(enterpriseStandardInspectVo.getInspectName());
+            esQueryCommonDTO.setInspectStatus(enterpriseStandardInspectVo.getInspectStatus());
+            esQueryCommonDTO.setInspectDept(enterpriseStandardInspectVo.getBelongDept());
+            // TODO 时间范围查询 等待VO添加对应参数后再添加
             IPage<EnterpriseStandardInspectDelayVo> enterpriseStandardInspectDelayVoIPage = esInspectMapper.pageWithDelay(page, esQueryCommonDTO);
             List<EnterpriseStandardInspectDelayVo> records = enterpriseStandardInspectDelayVoIPage.getRecords();