From e3d58e56601ba052a488c2b320ec5e017cd25d79 Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Fri, 26 Dec 2025 17:49:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ComUsrpowerMapper.java             |  7 ++++++
 .../pojo/dto}/ComUsrpowerDTO.java             |  2 +-
 .../resources/mapper/ComUsrpowerMapper.xml    | 19 ++++++++++++++
 .../xtwh/ComUsrpowerController.java           |  2 +-
 .../mapper/xtwh/ComUsrpowerMapper.java        | 13 ----------
 .../liswork/service/ComUsrpowerService.java   |  2 +-
 .../impl/xtwh/ComUsrpowerServiceImpl.java     |  5 ++--
 .../resources/mapper/ComUsrpowerMapper.xml    | 25 -------------------
 8 files changed, 31 insertions(+), 44 deletions(-)
 rename {liswork/src/main/java/com/czlis/liswork/pojo/DTO => lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/dto}/ComUsrpowerDTO.java (90%)
 delete mode 100644 liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComUsrpowerMapper.java
 delete mode 100644 liswork/src/main/resources/mapper/ComUsrpowerMapper.xml

diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrpowerMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrpowerMapper.java
index 52c1736..8352ed2 100644
--- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrpowerMapper.java
+++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrpowerMapper.java
@@ -1,7 +1,14 @@
 package com.czlis.interfaceCommon.mapper;
 
+import com.czlis.interfaceCommon.pojo.dto.ComUsrpowerDTO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface ComUsrpowerMapper {
     String getUserPower(@Param("yq")String yq,@Param("yhdh")String yhdh);
+    List<ComUsrpowerDTO> query(ComUsrpowerDTO comUsrpowerDTO);
+    void insert(ComUsrpowerDTO comUsrpowerDTO);
+    void update(ComUsrpowerDTO comUsrpowerDTO);
+    void delete(ComUsrpowerDTO comUsrpowerDTO);
 }
diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/ComUsrpowerDTO.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/dto/ComUsrpowerDTO.java
similarity index 90%
rename from liswork/src/main/java/com/czlis/liswork/pojo/DTO/ComUsrpowerDTO.java
rename to lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/dto/ComUsrpowerDTO.java
index a1dfe60..6ada37b 100644
--- a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/ComUsrpowerDTO.java
+++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/dto/ComUsrpowerDTO.java
@@ -1,4 +1,4 @@
-package com.czlis.liswork.pojo.DTO;
+package com.czlis.interfaceCommon.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/lis-interfaceCommon/src/main/resources/mapper/ComUsrpowerMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/ComUsrpowerMapper.xml
index ac2a39a..614629f 100644
--- a/lis-interfaceCommon/src/main/resources/mapper/ComUsrpowerMapper.xml
+++ b/lis-interfaceCommon/src/main/resources/mapper/ComUsrpowerMapper.xml
@@ -7,6 +7,25 @@
         select yhqx from com_usrpower where yhdh = #{yhdh} and yq = #{yq} and xtdh = 'LIS'
     </select>
 
+    <select id="query" resultType="com.czlis.interfaceCommon.pojo.dto.ComUsrpowerDTO">
+        select b.*,a.yq as instr_yq,a.yqmc,(case when isnull(b.yhdh,'') = '' then '0' else '1' end) as syqx,a.useflag from  lab_instr a left join com_usrpower b on (a.yq = b.yq and b.yhdh = #{yhdh} and b.xtdh = 'LIS')
+        <where>
+            <if test="yq != null and yq = ''"> and yq = #{yq}</if>
+        </where>
+    </select>
+
+    <insert id ="insert">
+        insert into  com_usrpower (yhdh, yq, xtdh, yhqx)
+        values ( #{yhdh},#{yq},#{xtdh},#{yhqx})
+    </insert>
+
+    <update id="update">
+        update com_usrpower set yhqx = #{yhqx} where yhdh = #{yhdh} and yq = #{yq} and xtdh = #{xtdh}
+    </update>
+
+    <delete id="delete">
+        delete from com_usrpower where yhdh = #{yhdh} and yq = #{yq} and xtdh = #{xtdh}
+    </delete>
 
 
 
diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComUsrpowerController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComUsrpowerController.java
index 8cfdbe6..badf642 100644
--- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComUsrpowerController.java
+++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComUsrpowerController.java
@@ -2,7 +2,7 @@ package com.czlis.liswork.controller.xtwh;
 
 
 import com.czlis.common.core.domain.Result;
-import com.czlis.liswork.pojo.DTO.ComUsrpowerDTO;
+import com.czlis.interfaceCommon.pojo.dto.ComUsrpowerDTO;
 import com.czlis.liswork.service.ComUsrpowerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComUsrpowerMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComUsrpowerMapper.java
deleted file mode 100644
index 51bb723..0000000
--- a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComUsrpowerMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.czlis.liswork.mapper.xtwh;
-
-import com.czlis.liswork.pojo.DTO.ComUsrpowerDTO;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ComUsrpowerMapper {
-    List<ComUsrpowerDTO> query(ComUsrpowerDTO comUsrpowerDTO);
-    void insert(ComUsrpowerDTO comUsrpowerDTO);
-    void update(ComUsrpowerDTO comUsrpowerDTO);
-    void delete(ComUsrpowerDTO comUsrpowerDTO);
-}
diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComUsrpowerService.java b/liswork/src/main/java/com/czlis/liswork/service/ComUsrpowerService.java
index e93a4fb..21f1918 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/ComUsrpowerService.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/ComUsrpowerService.java
@@ -1,7 +1,7 @@
 package com.czlis.liswork.service;
 
 import com.czlis.common.core.domain.Result;
-import com.czlis.liswork.pojo.DTO.ComUsrpowerDTO;
+import com.czlis.interfaceCommon.pojo.dto.ComUsrpowerDTO;
 
 import java.util.List;
 
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComUsrpowerServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComUsrpowerServiceImpl.java
index 33dfb28..7b3a571 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComUsrpowerServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComUsrpowerServiceImpl.java
@@ -1,14 +1,13 @@
 package com.czlis.liswork.service.impl.xtwh;
 
 import com.czlis.common.core.domain.Result;
-import com.czlis.liswork.mapper.xtwh.ComUsrpowerMapper;
-import com.czlis.liswork.pojo.DTO.ComUsrpowerDTO;
+import com.czlis.interfaceCommon.mapper.ComUsrpowerMapper;
+import com.czlis.interfaceCommon.pojo.dto.ComUsrpowerDTO;
 import com.czlis.liswork.service.ComUsrpowerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class ComUsrpowerServiceImpl implements ComUsrpowerService {
diff --git a/liswork/src/main/resources/mapper/ComUsrpowerMapper.xml b/liswork/src/main/resources/mapper/ComUsrpowerMapper.xml
deleted file mode 100644
index 94b72bf..0000000
--- a/liswork/src/main/resources/mapper/ComUsrpowerMapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.czlis.liswork.mapper.xtwh.ComUsrpowerMapper">
-    <select id="query" resultType="com.czlis.liswork.pojo.DTO.ComUsrpowerDTO">
-        select b.*,a.yq as instr_yq,a.yqmc,(case when isnull(b.yhdh,'') = '' then '0' else '1' end) as syqx,a.useflag from  lab_instr a left join com_usrpower b on (a.yq = b.yq and b.yhdh = #{yhdh} and b.xtdh = 'LIS')
-        <where>
-            <if test="yq != null and yq = ''"> and yq = #{yq}</if>
-        </where>
-    </select>
-
-    <insert id ="insert">
-        insert into  com_usrpower (yhdh, yq, xtdh, yhqx)
-        values ( #{yhdh},#{yq},#{xtdh},#{yhqx})
-    </insert>
-
-    <update id="update">
-        update com_usrpower set yhqx = #{yhqx} where yhdh = #{yhdh} and yq = #{yq} and xtdh = #{xtdh}
-    </update>
-
-    <delete id="delete">
-        delete from com_usrpower where yhdh = #{yhdh} and yq = #{yq} and xtdh = #{xtdh}
-    </delete>
-
-</mapper>