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

---
 .../mybatis/mapper/auth/SysDictTypeMapper.xml    |  6 ------
 .../mybatis/mapper/basic/BasicCorpDao.xml        |  5 -----
 .../mybatis/mapper/basic/UdiProductDao.xml       |  9 ---------
 .../mapper/collect/IoSplitDesOrderMapper.xml     |  3 ---
 .../mapper/dev/DeviceChangeOrderMapper.xml       | 16 ----------------
 src/main/resources/schemas/schema_v2.4.sql       |  3 ++-
 6 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml b/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml
index 6f2f3a8f3..e43dc701d 100644
--- a/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml
+++ b/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml
@@ -43,12 +43,6 @@
         WHERE dict_id = #{dictId}
     </select>
 
-    <delete id="deleteById" parameterType="java.lang.Long">
-        delete
-        from sys_dict_type
-        where dict_id = #{dictId}
-    </delete>
-
 
     <delete id="deleteBatchIds" parameterType="java.util.List"
     >
diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
index 81eb6001f..0a24162e4 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
@@ -64,11 +64,6 @@
         order by updateTime desc
     </select>
 
-
-
-
-
-
     <select id="filterList2" parameterType="com.glxp.api.req.basic.BasicUnitMaintainFilterRequest"
             resultType="com.glxp.api.entity.basic.BasicCorpEntity">
         SELECT *
diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
index 7aa94279c..974fbef2a 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -1015,15 +1015,6 @@
         </foreach>
     </select>
 
-
-    <select id="batchSelectByOriginUuid" resultType="com.glxp.api.entity.basic.UdiRelevanceEntity">
-        select *
-        from basic_products where originUuid in
-        <foreach collection="uuids" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-    </select>
-
     <select id="selectPackLevel" resultType="java.lang.Integer">
         select packLevel
         from basic_products
diff --git a/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml
index 65f17110f..e8d6cd98b 100644
--- a/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml
@@ -8,9 +8,6 @@
         FROM io_split_des_order isdo
         left join sys_workplace sw on isdo.workPlaceCode = sw.workplaceId
         left join sys_workplace_document swd on isdo.busType = swd.documentTypeCode
-
-#         left join thr_bustype_origin on isdo.busType = thr_bustype_origin.action
-#         left join basic_bussiness_type on isdo.busType = basic_bussiness_type.action
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo LIKE concat('%', #{billNo}, '%')
diff --git a/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml
index e14ec8e35..60d669eda 100644
--- a/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml
@@ -66,8 +66,6 @@
     </select>
 
     <select id="detailByUser" resultType="com.glxp.api.entity.dev.DeviceChangeOrderItemEntity">
-<!--        <choose>-->
-<!--            <when test="param.type==@com.glxp.api.enums.dev.DeviceChangeTypeEnum@ADD">-->
                 select oi.* from device_change_order_item oi
                 inner join device_change_order o on o.orderId = oi.orderId
                 <where>
@@ -75,19 +73,5 @@
                     and (o.deptCode = #{user.locDeptCode} or o.toDeptCode = #{user.locDeptCode})
                 </where>
                 order by oi.deviceCode
-<!--            </when>-->
-<!--            <otherwise>-->
-<!--                select oi.orderId, oi.deviceCode, oi.productId, info.udi, info.nameCode, info.productName, info.ggxh,-->
-<!--                info.batchNo, info.serialNo, info.productionDate, info.expireDate, info.manufactory, info.measname,-->
-<!--                info.zczbhhzbapzbh, info.supId, info.supName from device_change_order_item oi-->
-<!--                inner join device_change_order o on o.orderId = oi.orderId-->
-<!--                left join device_info info on info.deviceCode = oi.deviceCode-->
-<!--                <where>-->
-<!--                    oi.orderId = #{param.orderId} and o.type = #{param.type}-->
-<!--                    and (o.deptCode = #{user.locDeptCode} or o.toDeptCode = #{user.locDeptCode})-->
-<!--                </where>-->
-<!--                order by oi.deviceCode-->
-<!--            </otherwise>-->
-<!--        </choose>-->
     </select>
 </mapper>
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 06268e7b3..56947aa1c 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4931,8 +4931,9 @@ ALTER TABLE io_collect_order_backup
 
 
 
+
 CALL Pro_Temp_ColumnWork('sys_workplace_document', 'autoHandle',
-                         ' tinyint NULL DEFAULT NULL COMMENT ''是否自动处理''',
+                         ' tinyint NULL DEFAULT b''0''COMMENT ''是否自动处理''',
                          1);
 INSERT ignore INTO `sys_scheduled` (`id`, `cronName`, `cron`, `customerId`, `remark`)
 VALUES (158, 'ioCollectOrderFinishTask', '0 */30 * * * ?', NULL, '自动完成第三方处方单');