From dbbdbab62839ce6ba271d2144e37ab6b05f42c78 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 16 Jul 2022 08:48:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
new file mode 100644
index 0000000..a54cc03
--- /dev/null
+++ b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
@@ -0,0 +1,33 @@
+<?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="org.springblade.modules.process.mapper.ProcessMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="processResultMap" type="org.springblade.modules.process.vo.ProcessVO">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="strain_id" property="strainId"/>
+        <result column="sale_time" property="saleTime"/>
+        <result column="sale_num" property="saleNum"/>
+        <result column="process_id" property="processId"/>
+        <result column="process_num" property="processNum"/>
+        <result column="land_id" property="landId"/>
+    </resultMap>
+
+
+    <select id="selectProcessPage" resultMap="processResultMap">
+        SELECT p.*,
+               m.machining_type as processName,
+               m.machining_tp   AS tpurl
+        FROM sys_process p
+                 LEFT JOIN sys_machining m ON m.id = p.process_id
+        WHERE p.is_deleted = 0
+    </select>
+
+</mapper>

--
Gitblit v1.9.3