From f4b8a5e28bf2e239d929241034d37187fe5379f5 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 30 Jan 2024 16:11:02 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5):=2079?= =?UTF-8?q?729?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml | 3 ++- .../impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml index 17be1cb5..7d0ea3c4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml @@ -46,7 +46,8 @@ (concat(u.realname,'(',u.username,')')) AS responseUser, irp.plan_complete_date, irp.actual_complete_date, - irp.rectify_status + irp.rectify_status, + irp.inspect_report_id FROM `laws_enterprise_standard_inspect_rectify_plan` AS irp LEFT JOIN sys_user AS u ON u.id = irp.response_user diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java index 0691c6bd..fa290656 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java @@ -56,6 +56,7 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl public IPage getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); esInspectRectifyPlanMapper.page(page, inspectId); + setProperty(page.getRecords()); return page; }