From 718479acd8f78ee69dd94205b049c72f98fceb10 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 3 Jan 2025 16:38:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/Archives/ArchivesMapper.xml      | 248 ++++++++++++++++++
 .../mapper/material/app/AppOcrMapper.xml      | 241 +----------------
 2 files changed, 249 insertions(+), 240 deletions(-)
 create mode 100644 bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml
new file mode 100644
index 00000000..9ae4c9c7
--- /dev/null
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml
@@ -0,0 +1,248 @@
+<?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.bonus.material.archives.mapper.ArchivesMapper">
+
+    <select id="getTypeList" resultType="com.bonus.common.biz.domain.TreeNode">
+        select info_id as id, archives_name as label, parent_id as parentId,
+        level as level
+        from archives_record_info
+        where del_flag = '0'
+        <if test="keyWord != null and keyWord != ''">
+            and archives_name like concat('%', #{keyWord}, '%')
+        </if>
+    </select>
+
+    <select id="selectByName" resultType="com.bonus.material.archives.domain.ArchivesInfo">
+        select info_id       as infoId,
+               archives_name as archivesName,
+               parent_id     as parentId,
+               level         as level
+        from archives_record_info
+        where archives_name = #{archivesName}
+          and parent_id = #{parentId}
+          and del_flag = '0'
+    </select>
+
+    <select id="getListById" resultType="com.bonus.material.archives.domain.ArchivesInfo">
+        SELECT
+            info_id as infoId,
+            archives_name AS label,
+            parent_id AS parentId,
+            level AS level
+        FROM
+            archives_record_info
+        WHERE
+            del_flag = '0' and parent_id = #{infoId}
+    </select>
+
+    <select id="selectDetailsList" resultType="com.bonus.material.archives.domain.ArchivesDetails">
+        select
+        details_id as detailsId,
+        info_id as infoId,
+        parent_id as parentId,
+        level as level,
+        doc_name as docName,
+        doc_type as docType,
+        doc_url as docUrl,
+        doc_size as docSize,
+        type_id as typeId,
+        YEAR(create_time) as year,
+        create_by as createBy,
+        create_time as createTime,
+        update_by as updateBy,
+        update_time as updateTime
+        FROM
+        archives_record_details
+        WHERE
+        del_flag = '0'
+        <if test="infoId != null">
+            and (info_id = #{infoId} and level = '1')
+        </if>
+        <if test="detailsId != null">
+            and parent_id = #{detailsId}
+        </if>
+        <if test="keyWord != null  and keyWord != ''">
+            and (
+            doc_name like concat('%', #{keyWord}, '%') or
+            doc_type like concat('%', #{keyWord}, '%') or
+            create_by like concat('%', #{keyWord}, '%') or
+            )
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            <![CDATA[and DATE_FORMAT( update_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
+        </if>
+    </select>
+
+    <select id="selectDetailsByName" resultType="com.bonus.material.archives.domain.ArchivesDetails">
+        select
+        details_id as detailsId,
+        info_id as infoId,
+        doc_name as docName,
+        doc_type as docType,
+        doc_url as docUrl,
+        doc_size as docSize,
+        type_id as typeId,
+        YEAR(create_time) as year,
+        create_by as createBy,
+        create_time as createTime,
+        update_by as updateBy,
+        update_time as updateTime
+        FROM
+        archives_record_details
+       WHERE
+         del_flag = '0'
+         and doc_name = #{docName}
+        <if test="infoId != null">
+            and info_id = #{infoId}
+        </if>
+        <if test="level != null">
+            and level = #{level}
+        </if>
+        <if test="detailsId != null">
+            and parent_id = #{detailsId}
+        </if>
+    </select>
+
+    <select id="selectDetails" resultType="com.bonus.material.archives.domain.ArchivesDetails">
+        select
+        details_id as detailsId,
+        info_id as infoId,
+        parent_id as parentId,
+        level as level,
+        doc_name as docName,
+        doc_type as docType,
+        doc_url as docUrl,
+        doc_size as docSize,
+        type_id as typeId,
+        YEAR(create_time) as year,
+        create_by as createBy,
+        create_time as createTime,
+        update_by as updateBy,
+        update_timeas updateTime
+        FROM
+        archives_record_details
+        WHERE
+        del_flag = '0'
+        and details_id in
+        <foreach item="id" collection="list" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="selectDetailsUpdateName" resultType="com.bonus.material.archives.domain.ArchivesDetails">
+        select
+        details_id as detailsId,
+        info_id as infoId,
+        doc_name as docName,
+        doc_type as docType,
+        doc_url as docUrl,
+        doc_size as docSize,
+        type_id as typeId,
+        YEAR(create_time) as year,
+        create_by as createBy,
+        create_time as createTime,
+        update_by as updateBy,
+        update_time as updateTime
+        FROM
+        archives_record_details
+        WHERE
+        del_flag = '0'
+        and doc_name = #{docName}
+        <if test="parentId != null">
+            and parent_id = #{parentId}
+        </if>
+    </select>
+
+    <insert id="insertInfo">
+        insert into archives_record_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="archivesName != null and archivesName != ''">archives_name,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="level != null and level != ''">level,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            del_flag
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="archivesName != null and archivesName != ''">#{archivesName},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="level != null and level != ''">#{level},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            0
+        </trim>
+    </insert>
+
+    <insert id="insertDetails">
+        insert into archives_record_details
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="infoId != null">info_id,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="level != null and level != ''">level,</if>
+            <if test="docName != null and docName != ''">doc_name,</if>
+            <if test="docType != null and docType != ''">doc_type,</if>
+            <if test="docUrl != null and docUrl != ''">doc_url,</if>
+            <if test="docSize != null and docSize != ''">doc_size,</if>
+            <if test="typeId != null">type_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createTime != null">update_time,</if>
+            del_flag
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="infoId != null">#{infoId},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="level != null and level != ''">#{level},</if>
+            <if test="docName != null and docName != ''">#{docName},</if>
+            <if test="docType != null and docType != ''">#{docType},</if>
+            <if test="docUrl != null and docUrl != ''">#{docUrl},</if>
+            <if test="docSize != null and docSize != ''">#{docSize},</if>
+            <if test="typeId != null">#{typeId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            0
+        </trim>
+    </insert>
+
+    <update id="updateInfo">
+        update archives_record_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="archivesName != null and archivesName != ''">archives_name = #{archivesName},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="level != null and level != ''">level = #{level},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where info_id = #{infoId}
+    </update>
+
+    <update id="updateDetails">
+        update archives_record_details
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="docName != null and docName != ''">doc_name = #{docName},</if>
+            <if test="docType != null and docType != ''">doc_type = #{docType},</if>
+            <if test="docUrl != null and docUrl != ''">doc_url = #{docUrl},</if>
+            <if test="docSize != null and docSize != ''">doc_size = #{docSize},</if>
+            <if test="typeId != null">type_id = #{typeId},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where details_id = #{detailsId}
+    </update>
+
+    <delete id="deleteInfo">
+        update archives_record_info
+        set del_flag = '1'
+        where info_id = #{infoId}
+    </delete>
+
+    <delete id="deleteDetails">
+        update archives_record_details
+        set del_flag = '1'
+        where details_id = #{detailsId}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/app/AppOcrMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/app/AppOcrMapper.xml
index 731bb7ed..ab3e68d2 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/app/AppOcrMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/app/AppOcrMapper.xml
@@ -4,157 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.material.app.mapper.AppOcrMapper">
 
-    <select id="getTypeList" resultType="com.bonus.common.biz.domain.TreeNode">
-        select info_id as id, archives_name as label, parent_id as parentId,
-        level as level
-        from archives_record_info
-        where del_flag = '0'
-        <if test="keyWord != null and keyWord != ''">
-            and archives_name like concat('%', #{keyWord}, '%')
-        </if>
-    </select>
-
-    <select id="selectByName" resultType="com.bonus.material.archives.domain.ArchivesInfo">
-        select info_id       as infoId,
-               archives_name as archivesName,
-               parent_id     as parentId,
-               level         as level
-        from archives_record_info
-        where archives_name = #{archivesName}
-          and parent_id = #{parentId}
-          and del_flag = '0'
-    </select>
-
-    <select id="getListById" resultType="com.bonus.material.archives.domain.ArchivesInfo">
-        SELECT
-            info_id as infoId,
-            archives_name AS label,
-            parent_id AS parentId,
-            level AS level
-        FROM
-            archives_record_info
-        WHERE
-            del_flag = '0' and parent_id = #{infoId}
-    </select>
-
-    <select id="selectDetailsList" resultType="com.bonus.material.archives.domain.ArchivesDetails">
-        select
-        details_id as detailsId,
-        info_id as infoId,
-        parent_id as parentId,
-        level as level,
-        doc_name as docName,
-        doc_type as docType,
-        doc_url as docUrl,
-        doc_size as docSize,
-        type_id as typeId,
-        YEAR(create_time) as year,
-        create_by as createBy,
-        create_time as createTime,
-        update_by as updateBy,
-        update_time as updateTime
-        FROM
-        archives_record_details
-        WHERE
-        del_flag = '0'
-        <if test="infoId != null">
-            and (info_id = #{infoId} and level = '1')
-        </if>
-        <if test="detailsId != null">
-            and parent_id = #{detailsId}
-        </if>
-        <if test="keyWord != null  and keyWord != ''">
-            and (
-            doc_name like concat('%', #{keyWord}, '%') or
-            doc_type like concat('%', #{keyWord}, '%') or
-            create_by like concat('%', #{keyWord}, '%') or
-            )
-        </if>
-        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            <![CDATA[and DATE_FORMAT( update_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
-        </if>
-    </select>
-
-    <select id="selectDetailsByName" resultType="com.bonus.material.archives.domain.ArchivesDetails">
-        select
-        details_id as detailsId,
-        info_id as infoId,
-        doc_name as docName,
-        doc_type as docType,
-        doc_url as docUrl,
-        doc_size as docSize,
-        type_id as typeId,
-        YEAR(create_time) as year,
-        create_by as createBy,
-        create_time as createTime,
-        update_by as updateBy,
-        update_time as updateTime
-        FROM
-        archives_record_details
-       WHERE
-         del_flag = '0'
-         and doc_name = #{docName}
-        <if test="infoId != null">
-            and info_id = #{infoId}
-        </if>
-        <if test="level != null">
-            and level = #{level}
-        </if>
-        <if test="detailsId != null">
-            and parent_id = #{detailsId}
-        </if>
-    </select>
-
-    <select id="selectDetails" resultType="com.bonus.material.archives.domain.ArchivesDetails">
-        select
-        details_id as detailsId,
-        info_id as infoId,
-        parent_id as parentId,
-        level as level,
-        doc_name as docName,
-        doc_type as docType,
-        doc_url as docUrl,
-        doc_size as docSize,
-        type_id as typeId,
-        YEAR(create_time) as year,
-        create_by as createBy,
-        create_time as createTime,
-        update_by as updateBy,
-        update_timeas updateTime
-        FROM
-        archives_record_details
-        WHERE
-        del_flag = '0'
-        and details_id in
-        <foreach item="id" collection="list" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-
-    <select id="selectDetailsUpdateName" resultType="com.bonus.material.archives.domain.ArchivesDetails">
-        select
-        details_id as detailsId,
-        info_id as infoId,
-        doc_name as docName,
-        doc_type as docType,
-        doc_url as docUrl,
-        doc_size as docSize,
-        type_id as typeId,
-        YEAR(create_time) as year,
-        create_by as createBy,
-        create_time as createTime,
-        update_by as updateBy,
-        update_time as updateTime
-        FROM
-        archives_record_details
-        WHERE
-        del_flag = '0'
-        and doc_name = #{docName}
-        <if test="parentId != null">
-            and parent_id = #{parentId}
-        </if>
-    </select>
-
     <select id="findByPage" resultType="com.bonus.material.app.domain.MachineOcrBean">
         SELECT id as id,
         model as model,
@@ -289,109 +138,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where mt2.type_id in(36)
     </select>
 
-    <insert id="insertInfo">
-        insert into archives_record_info
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="archivesName != null and archivesName != ''">archives_name,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="level != null and level != ''">level,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            del_flag
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="archivesName != null and archivesName != ''">#{archivesName},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="level != null and level != ''">#{level},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            0
-        </trim>
-    </insert>
-    <insert id="insertDetails">
-        insert into archives_record_details
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="infoId != null">info_id,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="level != null and level != ''">level,</if>
-            <if test="docName != null and docName != ''">doc_name,</if>
-            <if test="docType != null and docType != ''">doc_type,</if>
-            <if test="docUrl != null and docUrl != ''">doc_url,</if>
-            <if test="docSize != null and docSize != ''">doc_size,</if>
-            <if test="typeId != null">type_id,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createTime != null">update_time,</if>
-            del_flag
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="infoId != null">#{infoId},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="level != null and level != ''">#{level},</if>
-            <if test="docName != null and docName != ''">#{docName},</if>
-            <if test="docType != null and docType != ''">#{docType},</if>
-            <if test="docUrl != null and docUrl != ''">#{docUrl},</if>
-            <if test="docSize != null and docSize != ''">#{docSize},</if>
-            <if test="typeId != null">#{typeId},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createTime != null">#{createTime},</if>
-            0
-        </trim>
-    </insert>
-
     <insert id="addOcrRecord">
         INSERT into ma_ocr_record(model,code,result,create_by,create_time)
         values (#{model},#{code},#{result}, #{createBy}, now())
     </insert>
 
-    <update id="updateInfo">
-        update archives_record_info
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="archivesName != null and archivesName != ''">archives_name = #{archivesName},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="level != null and level != ''">level = #{level},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where info_id = #{infoId}
-    </update>
-
-    <update id="updateDetails">
-        update archives_record_details
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="docName != null and docName != ''">doc_name = #{docName},</if>
-            <if test="docType != null and docType != ''">doc_type = #{docType},</if>
-            <if test="docUrl != null and docUrl != ''">doc_url = #{docUrl},</if>
-            <if test="docSize != null and docSize != ''">doc_size = #{docSize},</if>
-            <if test="typeId != null">type_id = #{typeId},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where details_id = #{detailsId}
-    </update>
-
     <update id="updateStorageData">
         UPDATE ma_type
         SET storage_num = (IFNULL(storage_num, 0) - #{outNum})
         WHERE type_id = #{typeId}
     </update>
+
     <update id="updateStorageDataBack">
         UPDATE ma_type
         SET storage_num = (IFNULL(storage_num, 0) + #{backNum})
         WHERE type_id = #{typeId}
     </update>
 
-    <delete id="deleteInfo">
-        update archives_record_info
-        set del_flag = '1'
-        where info_id = #{infoId}
-    </delete>
-
-    <delete id="deleteDetails">
-        update archives_record_details
-        set del_flag = '1'
-        where details_id = #{detailsId}
-    </delete>
 </mapper>
\ No newline at end of file