From 7cef74aa2496be2e5cc722374d65f561d04b8b8d Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Mon, 29 Apr 2024 16:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84LOG=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/system/api/domain/BmNumLogs.java     | 15 +++++++++
 .../controller/BmNumLogsController.java       |  4 +--
 .../sgzb/system/mapper/BmNumLogsMapper.java   |  2 +-
 .../system/service/impl/BmNumLogsService.java |  4 +--
 .../mapper/system/BmNumLogsMapper.xml         | 31 ++++++++++++++-----
 5 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java
index 840ffbf4..0a4ef93a 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java
@@ -44,12 +44,27 @@ public class BmNumLogs extends BaseEntity {
     @Excel(name = "实例/任务")
     private String task;
 
+    /**
+     * 任务名称
+     */
+    private String taskName;
+
     /**
     * 规格id
     */
     @Excel(name = "规格id")
     private Integer typeId;
 
+    /**
+     * 规格名称
+     */
+    private String typeName;
+
+    /**
+     * 父级规格名称
+     */
+    private String typeParentName;
+
     /**
      * 数量
      */
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java
index 15e4947d..a2a19dbf 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java
@@ -27,9 +27,9 @@ public class BmNumLogsController extends BaseController {
     private BmNumLogsService bmNumLogsService;
 
     @GetMapping("/list")
-    public TableDataInfo list() {
+    public TableDataInfo list(BmNumLogs record) {
         startPage();
-        List<BmNumLogs> list = bmNumLogsService.selectAll();
+        List<BmNumLogs> list = bmNumLogsService.selectAll(record);
         return getDataTable(list);
     }
 
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java
index 62b9dfb5..3e8bbe1d 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java
@@ -15,7 +15,7 @@ public interface BmNumLogsMapper {
 
     BmNumLogs selectByPrimaryKey(Integer id);
 
-    List<BmNumLogs> selectAll();
+    List<BmNumLogs> selectAll(BmNumLogs record);
 
     int updateByPrimaryKeySelective(BmNumLogs record);
 
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java
index d6fc772a..60d0845a 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java
@@ -24,8 +24,8 @@ public class BmNumLogsService{
         return bmNumLogsMapper.insert(record);
     }
 
-    public List<BmNumLogs> selectAll() {
-        return bmNumLogsMapper.selectAll();
+    public List<BmNumLogs> selectAll(BmNumLogs record) {
+        return bmNumLogsMapper.selectAll(record);
     }
 
     public int insertSelective(BmNumLogs record) {
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 9d8460e1..862f1c4f 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
@@ -8,7 +8,10 @@
     <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_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="description" jdbcType="VARCHAR" property="description" />
     <result column="json_result" jdbcType="VARCHAR" property="jsonResult" />
@@ -25,18 +28,32 @@
   </sql>
 
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--@mbg.generated-->
-    select 
-    <include refid="Base_Column_List" />
-    from bm_num_logs
+    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.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
     where id = #{id,jdbcType=INTEGER}
   </select>
 
-
   <select id="selectAll" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />
-    from bm_num_logs
+      bnl.id, bnl.model_title, bnl.`method`, bnl.task, bnl.type_id, bnl.num, bnl.`description`, bnl.json_result, bnl.`time`, bnl.creator,
+      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
+    <where>
+      <if test="modelTitle != null and modelTitle != ''">
+        and bnl.model_title like concat('%', #{modelTitle}, '%')
+      </if>
+      <if test="typeName != null and typeName != ''">
+        and mt1.type_name like concat('%', #{typeName}, '%')
+      </if>
+    </where>
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">