From ff2cf0a05b7f7c2e6676542217ab2f169858a492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 12 Mar 2024 10:39:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=B2=B3=E5=8C=97pms?=
 =?UTF-8?q?=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81=E4=B8=BB=E9=85=8D=E7=BD=91?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=202.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../harmonic/mapper/mysql/line/ThsOverRunLogMapper.java       | 2 +-
 .../harmonic/mapper/mysql/line/ThsSuperviseMapper.java        | 4 ++--
 .../harmonic/mapper/mysql/line/ThsWarnStrategyMapper.java     | 3 +--
 .../harmonic/mapper/mysql/line/mapping/ThsSuperviseMapper.xml | 2 +-
 .../mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml       | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsOverRunLogMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsOverRunLogMapper.java
index b046ffd7b..fe6eed4a1 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsOverRunLogMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsOverRunLogMapper.java
@@ -2,7 +2,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.line;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog;
+import com.njcn.process.pojo.po.ThsOverRunLog;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsSuperviseMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsSuperviseMapper.java
index b79ed0c91..9bb01bd95 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsSuperviseMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsSuperviseMapper.java
@@ -4,8 +4,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto;
-import com.njcn.prepare.harmonic.pojo.po.ThsSupervise;
-import com.njcn.prepare.harmonic.pojo.vo.SuperviseVo;
+import com.njcn.process.pojo.po.ThsSupervise;
+import com.njcn.process.pojo.vo.SuperviseVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsWarnStrategyMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsWarnStrategyMapper.java
index e59847ea1..2726fd6a9 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsWarnStrategyMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsWarnStrategyMapper.java
@@ -3,8 +3,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.line;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.harmonic.pojo.vo.ThsStrategyVo;
-import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto;
-import com.njcn.prepare.harmonic.pojo.param.SuperviseParam;
+import com.njcn.process.pojo.param.SuperviseParam;
 import com.njcn.process.pojo.po.ThsWarnStrategy;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsSuperviseMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsSuperviseMapper.xml
index 1286ca613..47c42f912 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsSuperviseMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsSuperviseMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.ThsSuperviseMapper">
     <!--查询技术监督列表-->
     <select id="querySuperviseList" parameterType="com.njcn.prepare.harmonic.pojo.dto.SuperviseDto"
-            resultType="com.njcn.prepare.harmonic.pojo.vo.SuperviseVo">
+            resultType="com.njcn.process.pojo.vo.SuperviseVo">
         select ts.* from ths_supervise ts where 1=1
         <if test="param.searchBeginTime != null and param.searchBeginTime != ''">
             AND DATE_FORMAT(ts.create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{param.searchBeginTime}, '%Y-%m-%d')
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml
index 162daf7dd..d20736282 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.line.ThsWarnStrategyMapper">
 
     <!--查询策略的集合-->
-    <select id="selectStrategyList" parameterType="com.njcn.prepare.harmonic.pojo.param.SuperviseParam"
+    <select id="selectStrategyList" parameterType="com.njcn.process.pojo.param.SuperviseParam"
             resultType="com.njcn.harmonic.pojo.vo.ThsStrategyVo">
         select
         tws.id,