From 10282de5ef1f9498609358b32f5e1d120730c185 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 2 Aug 2024 09:25:14 +0800
Subject: [PATCH] numlog

---
 .../mapper/system/BmNumLogsMapper.xml         | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml
index cf23d3be..9face5e5 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml
@@ -7,15 +7,19 @@
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="model_title" jdbcType="VARCHAR" property="modelTitle" />
     <result column="method" jdbcType="VARCHAR" property="method" />
-    <result column="task" jdbcType="VARCHAR" property="task" />
+    <result column="task_id" jdbcType="VARCHAR" property="taskId" />
     <result column="task_name" jdbcType="VARCHAR" property="taskName" />
     <result column="type_id" jdbcType="INTEGER" property="typeId" />
     <result column="type_name" jdbcType="VARCHAR" property="typeName" />
     <result column="type_parent_name" jdbcType="VARCHAR" property="typeParentName" />
-    <result column="num" jdbcType="VARCHAR" property="num" />
+    <result column="pre_num" jdbcType="VARCHAR" property="preNum" />
+    <result column="audit_num" jdbcType="VARCHAR" property="auditNum" />
+    <result column="pre_store_num" jdbcType="VARCHAR" property="preStoreNum" />
+    <result column="in_num" jdbcType="VARCHAR" property="inNum" />
+    <result column="out_num" jdbcType="VARCHAR" property="outNum" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="json_result" jdbcType="VARCHAR" property="jsonResult" />
-    <result column="time" jdbcType="TIMESTAMP" property="time" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="creator" jdbcType="VARCHAR" property="creator" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="status" jdbcType="TINYINT" property="status" />
@@ -29,23 +33,25 @@
 
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
-    bnl.id, bnl.model_title, bnl.`method`, bnl.task, bnl.type_id, bnl.num, bnl.`description`, bnl.json_result, bnl.`time`, bnl.creator,
+    bnl.id, bnl.model_title, bnl.`method`, bnl.task_id, bnl.type_id, bnl.pre_num, bnl.audit_num, bnl.pre_store_num, bnl.in_num, bnl.out_num,
+    bnl.`description`, bnl.json_result, bnl.create_time, bnl.creator, bnl.manage_type,
     bnl.remark, bnl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name
     from bm_num_logs bnl
     left join ma_type mt on bnl.type_id = mt.type_id
     inner join ma_type mt1 on mt.parent_id = mt1.type_id
-    left join tm_task tt on bnl.task = tt.task_id
+    left join tm_task tt on bnl.task_id = tt.task_id
     where id = #{id,jdbcType=INTEGER}
   </select>
 
   <select id="selectAll" resultMap="BaseResultMap">
     select
-      bnl.id, bnl.model_title, bnl.`method`, bnl.task, bnl.type_id, bnl.num, bnl.`description`, bnl.json_result, bnl.`time`, bnl.creator,
+      bnl.id, bnl.model_title, bnl.`method`, bnl.task_id, bnl.type_id, bnl.pre_num, bnl.audit_num, bnl.pre_store_num, bnl.in_num, bnl.out_num,
+      bnl.`description`, bnl.json_result, bnl.create_time, bnl.creator, bnl.manage_type,
       bnl.remark, bnl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name
     from bm_num_logs bnl
     left join ma_type mt on bnl.type_id = mt.type_id
     inner join ma_type mt1 on mt.parent_id = mt1.type_id
-    left join tm_task tt on bnl.task = tt.task_id
+    left join tm_task tt on bnl.task_id = tt.task_id
     <where>
       <if test="modelTitle != null and modelTitle != ''">
         and bnl.model_title like concat('%', #{modelTitle}, '%')