From 6b0f12933ba31f9e4c9724556a1475b1d10d3b1c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 25 Dec 2023 15:22:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5-=E4=BC=81=E6=A0=87Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ESRecheckController.java       | 23 +++++++++++++++++++
 .../vo/EnterpriseStandardRecheckPlanVo.java   |  4 ++++
 .../EnterpriseStandardRecheckPlanMapper.xml   |  1 +
 3 files changed, 28 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
index d4dc75b2..21be113b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.process.esRecheck.controller;
 
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
@@ -10,10 +11,13 @@ import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
 import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
+import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,6 +43,9 @@ public class ESRecheckController {
     @Resource
     private ActFlowCommonService actFlowCommonService;
 
+    @Resource
+    private EnterpriseStandardRecheckPlanService recheckPlanService;
+
     /**
      * 企标复审申请
      *
@@ -126,4 +133,20 @@ public class ESRecheckController {
         return Result.OK();
     }
 
+    /**
+     * 分页列表查询
+     *
+     * @return
+     */
+    @AutoLog(value = "企标复审流程-分页列表查询")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value="企标复审流程-分页列表查询", notes="企标复审流程-分页列表查询")
+    @GetMapping(value = "/page")
+    public Result<?> queryPageList(ESQueryCommonDTO esDeclare,
+                                   @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo,
+                                   @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) {
+        return Result.OK(recheckPlanService.queryPageList(esDeclare, pageNo, pageSize));
+    }
+
+
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java
index f4101069..78c56738 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java
@@ -26,6 +26,10 @@ public class EnterpriseStandardRecheckPlanVo {
     @ApiModelProperty(value = "主键ID")
     private String id;
 
+    /**企标Id*/
+    @ApiModelProperty(value = "企标Id")
+    private String standardId;
+
     /**企标编号*/
     @ApiModelProperty(value = "企标编号")
     private String standardNo;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml
index 5a7dc0e0..adf61b8b 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml
@@ -26,6 +26,7 @@
     <select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo">
         SELECT
             p.id,
+            s.id AS standardId,
             s.standard_number AS standardNo,
             s.standard_name AS standardName,
             s.release_date AS releaseDate,