From 4fc063496e8ffeb7294cead0a07027b97f311458 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 19 Dec 2023 09:31:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=A8=BD=E6=9F=A5=E7=A8=BD=E6=9F=A5):=2079?=
 =?UTF-8?q?424?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EnterpriseStandardInspectController.java       | 2 --
 .../enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml | 4 +++-
 2 files changed, 3 insertions(+), 3 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 02161c04..f62f5ed6 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
@@ -79,7 +79,6 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
 	@AutoLog(value = "企标稽查-分页列表查询2")
 	@ApiOperation(value="企标稽查-分页列表查询2", notes="企标稽查-分页列表查询2")
 	@GetMapping(value = "/queryByPage")
-//	@Translation
 	public Result<IPage<EnterpriseStandardInspectVo>> queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo,
 								 @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1")  Integer pageNo,
 								 @ApiParam("每页条数")  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
@@ -95,7 +94,6 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
 	@AutoLog(value = "企标稽查-列表查询2")
 	@ApiOperation(value="企标稽查-列表查询2", notes="企标稽查-列表查询2")
 	@GetMapping(value = "/queryByList")
-//	@Translation
 	public Result<List<EnterpriseStandardInspectVo>> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
 		return Result.OK(esInspectService.queryByList(enterpriseStandardInspectVo));
 	}
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
index bfe9753e..ce9fce52 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
@@ -195,10 +195,12 @@
                      complete_date,
                      actual_inspect_user,
                      inspect_status,
-                     group_concat(lesio.plan_inspect_object separator ',')                  plan_inspect_object
+                     group_concat(lesio.plan_inspect_object separator ',')                  plan_inspect_object,
+                     (IF(lesid.id IS NOT NULL, TRUE, FALSE))                                delay_flag
               from laws_enterprise_standard_inspect lesi
                        left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0'
                        left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id
+                       left join laws_enterprise_standard_inspect_delay lesid on lesi.id = lesid.inspect_id
               group by lesi.id) t
             ${ew.customSqlSegment}
     </sql>