20250123 更新

src/main/resources/mapper/EntrustAlterApplyMapper.xml

@@ -31,7 +31,12 @@
 
 <!--    连接委托表查询委托案件名称-->
     <sql id="getVOSQL">
-        SELECT eaa.*, ce.case_name, ce.id as case_id FROM
+        SELECT
+            eaa.*,
+            ce.case_name,
+            ce.id as case_id,
+            e.entrustment_type
+        FROM
             b_entrust_alter_apply eaa
                 LEFT JOIN b_entrustment e ON eaa.entrust_id = e.id
                 LEFT JOIN b_case_event ce ON ce.id = e.case_id

src/main/resources/mapper/EntrustApproveRecordMapper.xml

@@ -0,0 +1,50 @@
+<?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="digital.laboratory.platform.entrustment.mapper.EntrustApproveRecordMapper">
+
+    <resultMap id="BaseResultMap" type="digital.laboratory.platform.entrustment.entity.EntrustApproveRecord">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="entrustId" column="entrust_id" jdbcType="VARCHAR"/>
+            <result property="approveType" column="approve_type" jdbcType="TINYINT"/>
+            <result property="comments" column="comments" jdbcType="VARCHAR"/>
+            <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+            <result property="orgId" column="org_id" jdbcType="VARCHAR"/>
+            <result property="approveTime" column="approve_time" jdbcType="TIMESTAMP"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ear.id,
+        ear.entrust_id,
+        ear.approve_type,
+        ear.comments,
+        ear.user_id,
+        ear.org_id,
+        ear.approve_time,
+        ear.create_time,
+        ear.create_by,
+        ear.update_time,
+        ear.update_by
+    </sql>
+
+    <sql id="EntrustApproveRecordVOSQL">
+        SELECT
+            <include refid="Base_Column_List"></include>,
+            c.case_name,
+            e.client_org_name,
+            e.entrustment_type
+        FROM b_entrust_approve_record ear
+            LEFT JOIN b_entrustment e ON e.id = ear.entrust_id
+            LEFT JOIN b_case_event c on e.case_id = c.id
+    </sql>
+
+    <select id="voPage" resultType="digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO">
+        <include refid="EntrustApproveRecordVOSQL"></include>
+        ${ew.customSqlSegment}
+    </select>
+</mapper>

src/main/resources/mapper/EntrustmentMapper.xml

@@ -121,8 +121,7 @@
     <result property="updateTime" column="update_time"/>
     <result property="updateBy" column="update_by"/>
     <result property="returnOrNot" column="return_or_not"/>
-
-
+    <result property="type" column="type"/>
   </resultMap>
 
   <resultMap id="entrustmentVO" type="digital.laboratory.platform.entrustment.vo.EntrustmentVO" extends="entrustmentMap">