From bbfcbea1c54d344b6f9efa87f68354659faf3419 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 May 2023 10:13:22 +0800
Subject: [PATCH] 巡检报表sql删除本地模式名
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml | 0
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/service/impl/ManageProtectRecordServiceImpl.java | 3 +--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 8 ++++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml | 0
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.java | 4 +++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/impl/SchedulingRecordServiceImpl.java | 2 +-
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.java
index ca5d2a8..c445dca 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.java
@@ -17,5 +17,5 @@
* @DATE: 2023/5/27 10:09
*/
public interface ManageProtectRecordMapper extends BaseMapper<ManageProtectRecord> {
- IPage<ManageProtectRecordVO> selectRecordPage(IPage<ManageProtectRecordVO> page, @Param("record") ManageProtectRecordVO manageProtectRecordVO);
+ List<ManageProtectRecordVO> selectRecordPage(IPage<ManageProtectRecordVO> page, @Param("record") ManageProtectRecordVO manageProtectRecordVO);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecord.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecord.xml
rename to skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/service/impl/ManageProtectRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/service/impl/ManageProtectRecordServiceImpl.java
index dde17d1..bf0781a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/service/impl/ManageProtectRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/service/impl/ManageProtectRecordServiceImpl.java
@@ -23,9 +23,8 @@
@Service
public class ManageProtectRecordServiceImpl extends BaseServiceImpl<ManageProtectRecordMapper, ManageProtectRecord> implements IManageProtectRecordService {
-
@Override
public IPage<ManageProtectRecordVO> selectPage(IPage<ManageProtectRecordVO> page, ManageProtectRecordVO manageProtectRecordVO) {
- return baseMapper.selectRecordPage(page,manageProtectRecordVO);
+ return page.setRecords(baseMapper.selectRecordPage(page,manageProtectRecordVO));
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
index 1b7d95e..6e08c47 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -221,7 +221,7 @@
COUNT(*) AS need,
SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish,
SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo
- FROM SK002.SM_PATROL_TASK t
+ FROM SM_PATROL_TASK t
LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id
LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000')
WHERE
@@ -253,7 +253,7 @@
COUNT(*) AS need,
SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish,
SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo
- FROM SK002.SM_PATROL_TASK t
+ FROM SM_PATROL_TASK t
LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id
LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000')
where t.is_deleted = 0 AND aab."p_ad_code" != '420000000000'
@@ -305,7 +305,7 @@
COUNT(*) AS need,
SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish,
SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo
- FROM SK002.SM_PATROL_TASK t
+ FROM SM_PATROL_TASK t
LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id
LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000')
WHERE
@@ -337,7 +337,7 @@
COUNT(*) AS need,
SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish,
SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo
- FROM SK002.SM_PATROL_TASK t
+ FROM SM_PATROL_TASK t
LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id
LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000')
where t.is_deleted = 0 AND aab."p_ad_code" != '420000000000'
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.java
index a27deea..0804794 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.java
@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* @PROJECT_NAME: skjcmanager
* @DESCRIPTION:
@@ -15,5 +17,5 @@
* @DATE: 2023/5/27 15:25
*/
public interface SchedulingRecordMapper extends BaseMapper<SchedulingRecord> {
- IPage<SchedulingRecordVO> selectRecordPage(IPage<SchedulingRecordVO> page, @Param("record") SchedulingRecordVO schedulingRecordVO);
+ List<SchedulingRecordVO> selectRecordPage(IPage<SchedulingRecordVO> page, @Param("record") SchedulingRecordVO schedulingRecordVO);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecord.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecord.xml
rename to skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/impl/SchedulingRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/impl/SchedulingRecordServiceImpl.java
index ffd994b..1445255 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/impl/SchedulingRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/impl/SchedulingRecordServiceImpl.java
@@ -20,6 +20,6 @@
@Override
public IPage<SchedulingRecordVO> selectPage(IPage<SchedulingRecordVO> page, SchedulingRecordVO schedulingRecordVO) {
- return baseMapper.selectRecordPage(page,schedulingRecordVO);
+ return page.setRecords(baseMapper.selectRecordPage(page,schedulingRecordVO));
}
}
--
Gitblit v1.9.3