From 8f4ff09767f834db8d7a6d6bf874f39ce61f63df Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 4 Mar 2025 09:12:33 +0800
Subject: [PATCH] =?UTF-8?q?3/4=20basic=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dao/basic/BasicBussinessTypeDao.java  |  1 -
 .../dao/basic/CompanyProductRelevanceDao.java |  2 -
 .../glxp/api/dao/basic/ProductInfoDao.java    |  6 ---
 .../com/glxp/api/dao/basic/UdiProductDao.java |  5 ---
 .../glxp/api/dao/basic/UdiRelevanceDao.java   |  6 ---
 .../basic/CompanyProductRelevanceDao.xml      | 18 ---------
 .../mybatis/mapper/basic/ProductInfoDao.xml   | 28 -------------
 .../mybatis/mapper/basic/UdiRelevanceDao.xml  | 39 -------------------
 8 files changed, 105 deletions(-)

diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java
index 3aec53d7..b4f2478e 100644
--- a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java
+++ b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java
@@ -13,7 +13,6 @@ import java.util.List;
 @Mapper
 public interface BasicBussinessTypeDao extends BaseMapperPlus<BasicBussinessTypeDao, BasicBussinessTypeEntity, BasicBussinessTypeEntity> {
 
-
     /**
      * 查询单据类型列表
      *
diff --git a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java
index 3e0f627b..8c103ba5 100644
--- a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java
+++ b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java
@@ -17,8 +17,6 @@ public interface CompanyProductRelevanceDao extends BaseMapperPlus<CompanyProduc
 
     boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
 
-    boolean importCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity);
-
     boolean deleteById(String id);
 
     boolean deleteByRlId(String id);
diff --git a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java
index a7932086..eeffbcc6 100644
--- a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java
+++ b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java
@@ -37,24 +37,18 @@ public interface ProductInfoDao {
 
     boolean updateProductByUuid(ProductInfoEntity productInfoEntity);
 
-    List<String> findAllUuids(ListPageRequest listPageRequest);
-
     List<ProductInfoEntity> selectByUuid(@Param("uuid") String uuid);
 
     List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
-
     List<ProductInfoEntity> filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest);
 
     Long filterUdiNoPageCount(ProductInfoFilterRequest productInfoFilterRequest);
 
-
     List<ProductInfoEntity> syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
     List<String> filterUuidByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);
 
     List<ProductInfoEntity> selectAllByUuid(@Param("ids") List<String> ids);
 
-    List<String> findAllTyshxyh();
-
 }
diff --git a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java
index 76a64a8a..1e6f91bb 100644
--- a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java
+++ b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java
@@ -58,11 +58,6 @@ public interface UdiProductDao extends BaseMapperPlus<UdiProductDao, UdiProductE
     List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiRelRequest filterUdiRelRequest);
 
 
-    /**
-     * 导入医疗器械信息
-     */
-    void importUdiInfo(@Param("udiInfoEntities") List<UdiProductEntity> udiInfoEntities);
-
     /**
      * 查询包装层级
      *
diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
index b68a4f87..70212d0d 100644
--- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
+++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
@@ -62,12 +62,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
 
     List<UdiRelevanceEntity> batchSelectByIds(@Param("ids") List<String> ids);
 
-    /**
-     * 批量导入数据
-     *
-     * @param udiRelevanceEntities
-     */
-    void importUdiRelevance(@Param("udiRelevanceEntities") List<UdiRelevanceEntity> udiRelevanceEntities);
 
     /**
      * /**
diff --git a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml
index 7834a4c3..c642ee2a 100644
--- a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml
@@ -21,24 +21,6 @@
     </insert>
 
 
-    <insert id="importCompanyProductRelevance"
-            parameterType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity">
-        replace
-                INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId,
-                                               create_time, update_time, auditStatus, productUuid, udiRlIdFk, unitFk,
-                                               price)
-        values (#{id},
-                #{customerId},
-                #{productId},
-                #{enterpriseId},
-                #{registrationId},
-                #{create_time},
-                #{update_time},
-                #{auditStatus},
-                #{productUuid},
-                #{udiRlIdFk},
-                #{unitFk}, #{price})
-    </insert>
 
     <delete id="deleteById" parameterType="Map">
         DELETE
diff --git a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
index 98c625ab..ebc69ceb 100644
--- a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
@@ -126,7 +126,6 @@
         </where>
         GROUP BY nameCode
     </select>
-
     <select id="selectAllByUuid" parameterType="java.util.List"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
         select *
@@ -138,8 +137,6 @@
         </foreach>
         )
     </select>
-
-
     <select id="selectByUuid" parameterType="Map"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
         select *
@@ -176,8 +173,6 @@
             </if>
         </where>
     </select>
-
-
     <select id="filterUdiByNewest" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
         SELECT *
@@ -200,7 +195,6 @@
             </if>
         </where>
     </select>
-
     <select id="filterUuidByCreditNo" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="java.lang.String">
         select p.uuid from productinfo p
@@ -271,8 +265,6 @@
             </if>
         </where>
     </select>
-
-
     <select id="filterUdiNoPage" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
         select *
@@ -319,8 +311,6 @@
         </where>
         limit #{page},#{limit}
     </select>
-
-
     <select id="filterUdiNoPageCount" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="java.lang.Long">
         select count(0)
@@ -366,8 +356,6 @@
             </if>
         </where>
     </select>
-
-
     <select id="selectByUpdateTime"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
         select *
@@ -414,7 +402,6 @@
         limit #{page},#{limit}
     </select>
 
-
     <insert id="insertProductInfo"
             parameterType="com.glxp.api.entity.basic.ProductInfoEntity">
         REPLACE
@@ -478,7 +465,6 @@
                 #{mjfs}, #{categoryName})
     </insert>
 
-
     <insert id="insertProductInfos"
             parameterType="com.glxp.api.entity.basic.ProductInfoEntity">
         REPLACE INTO productinfo
@@ -744,18 +730,4 @@
         </set>
         WHERE uuid = #{uuid}
     </update>
-
-
-    <!--测试专用-->
-    <select id="findAllUuids" parameterType="com.glxp.api.util.page.ListPageRequest" resultType="java.lang.String">
-        SELECT uuid
-        from device
-        group by uuid
-        limit #{page}, #{limit}
-    </select>
-    <select id="findAllTyshxyh" resultType="java.lang.String">
-        SELECT tyshxydm
-        from productinfo
-        group by tyshxydm
-    </select>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index dafb7b11..2d491768 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -1321,45 +1321,6 @@
         </foreach>
     </select>
 
-    <insert id="importUdiRelevance" parameterType="java.util.List">
-        replace
-            into basic_udirel
-        (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
-         isLock,
-         lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime,
-         updateTime, modifyTime,
-         createUser,
-         updateUser,
-         remark, useExpireTime, dispatch, groupBuy, needCert, isStack)
-        values
-
-        <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
-            (#{item.id},
-             #{item.uuid},
-             #{item.mainId},
-             #{item.thirdId},
-             #{item.thirdId1},
-             #{item.thirdId2},
-             #{item.thirdId3},
-             #{item.thirdId4},
-             #{item.udplatCode},
-             #{item.isUseDy},
-             #{item.isDisable},
-             #{item.isLock},
-             #{item.lockStatus},
-             #{item.isAdavence}, #{item.purType}, #{item.attributeType}, #{item.hcType},
-             #{item.useMuti},
-             #{item.useNum},
-             #{item.supName},
-             #{item.createTime},
-             #{item.updateTime},
-             #{item.modifyTime},
-             #{item.createUser},
-             #{item.updateUser},
-             #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert},
-             #{item.isStack})
-        </foreach>
-    </insert>
 
     <select id="selectGroupByNameCode" parameterType="java.lang.String"
             resultType="com.glxp.api.res.basic.UdiRelevanceResponse">