From 0d10bc99eec75672b049339399e4f762fbd9746e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 11 九月 2026 11:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml | 241 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 241 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
index a7c9511..79943e7 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
@@ -53,11 +53,42 @@
<result property="pid" column="pid"/>
<result property="categoryid" column="categoryid"/>
<result property="templateType" column="template_type"/>
+ <result property="isMydException" column="is_myd_exception"/>
+ <result property="dimension" column="dimension"/>
+ <result property="dutyDeptPersonName" column="duty_dept_person_name"/>
+ <result property="dutyDeptPersonCode" column="duty_dept_person_code"/>
+ <result property="reportDeptPersonCode" column="report_dept_person_name"/>
+ <result property="reportDeptPersonName" column="report_dept_person_code"/>
+ <result property="circulationDeptPersonCode" column="circulation_dept_person_code"/>
+ <result property="circulationDeptPersonName" column="circulation_dept_person_name"/>
+ <result property="circulationDeptCode" column="circulation_dept_code"/>
+ <result property="circulationDeptName" column="circulation_dept_name"/>
+ <result property="circulationExplain" column="circulation_explain"/>
+ <result property="circulationTime" column="circulation_time"/>
+ <result property="circulationStatus" column="circulation_status"/>
+ <result property="circulationPersonName" column="circulation_person_name"/>
+ <result property="circulationPersonCode" column="circulation_person_code"/>
+
</resultMap>
<sql id="selectServiceSubtaskDetailTtraceVo">
select id,
+ circulation_status,
+ circulation_person_name,
+ circulation_person_code,
+ duty_dept_person_name,
+ duty_dept_person_code,
+ report_dept_person_name,
+ report_dept_person_code,
+ circulation_dept_person_code,
+ circulation_dept_person_name,
+ circulation_dept_code,
+ circulation_dept_name,
+ circulation_explain,
+ circulation_time,
detail_id,
+ is_myd_exception,
+ dimension,
template_type,
sub_id,
taskid,
@@ -247,6 +278,52 @@
<if test="type != null and type != ''">
and type = #{type}
</if>
+ <if test="dimension != null and dimension != ''">
+ and dimension = #{dimension}
+ </if>
+ <if test="isMydException != null ">
+ and is_myd_exception = #{isMydException}
+ </if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">
+ and duty_dept_person_name like concat('%', #{dutyDeptPersonName}, '%')
+ </if>
+ <if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">
+ and duty_dept_person_code like concat('%', #{dutyDeptPersonCode}, '%')
+ </if>
+ <if test="reportDeptPersonName != null and reportDeptPersonName != ''">
+ and report_dept_person_name like concat('%', #{reportDeptPersonName}, '%')
+ </if>
+ <if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">
+ and report_dept_person_code like concat('%', #{reportDeptPersonCode}, '%')
+ </if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">
+ and circulation_dept_person_code like concat('%', #{circulationDeptPersonCode}, '%')
+ </if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">
+ and circulation_dept_person_name like concat('%', #{circulationDeptPersonName}, '%')
+ </if>
+ <if test="circulationDeptCode != null and circulationDeptCode != ''">
+ and circulation_dept_code like concat('%', #{circulationDeptCode}, '%')
+ </if>
+ <if test="circulationDeptName != null and circulationDeptName != ''">
+ and circulation_dept_name like concat('%', #{circulationDeptName}, '%')
+ </if>
+ <if test="circulationExplain != null and circulationExplain != ''">
+ and circulation_explain like concat('%', #{circulationExplain}, '%')
+ </if>
+ <if test="circulationTime != null ">
+ and circulation_time = #{circulationTime}
+ </if>
+ <if test="circulationStatus != null ">
+ and circulation_status = #{circulationStatus}
+ </if>
+ <if test="circulationPersonName != null and circulationPersonName != ''">
+ and circulation_person_name like concat('%', #{circulationPersonName}, '%')
+ </if>
+ <if test="circulationPersonCode != null and circulationPersonCode != ''">
+ and circulation_person_code =#{circulationPersonCode}
+ </if>
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<select id="tracedeallist" parameterType="com.smartor.domain.VO.DetailTraceDealVO"
@@ -276,6 +353,51 @@
</if>
<if test="templateType != null">
and template_type = #{templateType}
+ </if>
+ <if test="isMydException != null ">
+ and is_myd_exception = #{isMydException}
+ </if>
+ <if test="dimension != null and dimension != ''">
+ and dimension = #{dimension}
+ </if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">
+ and duty_dept_person_name like concat('%', #{dutyDeptPersonName}, '%')
+ </if>
+ <if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">
+ and duty_dept_person_code like concat('%', #{dutyDeptPersonCode}, '%')
+ </if>
+ <if test="reportDeptPersonName != null and reportDeptPersonName != ''">
+ and report_dept_person_name like concat('%', #{reportDeptPersonName}, '%')
+ </if>
+ <if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">
+ and report_dept_person_code like concat('%', #{reportDeptPersonCode}, '%')
+ </if>
+ <if test="circulationDeptPersonCode != null and circulationDeptPersonCode != ''">
+ and circulation_dept_person_code like concat('%', #{circulationDeptPersonCode}, '%')
+ </if>
+ <if test="circulationDeptPersonName != null and circulationDeptPersonName != ''">
+ and circulation_dept_person_name like concat('%', #{circulationDeptPersonName}, '%')
+ </if>
+ <if test="circulationDeptCode != null and circulationDeptCode != ''">
+ and circulation_dept_code like concat('%', #{circulationDeptCode}, '%')
+ </if>
+ <if test="circulationDeptName != null and circulationDeptName != ''">
+ and circulation_dept_name like concat('%', #{circulationDeptName}, '%')
+ </if>
+ <if test="circulationExplain != null and circulationExplain != ''">
+ and circulation_explain like concat('%', #{circulationExplain}, '%')
+ </if>
+ <if test="circulationTime != null ">
+ and circulation_time = #{circulationTime}
+ </if>
+ <if test="circulationStatus != null ">
+ and circulation_status = #{circulationStatus}
+ </if>
+ <if test="circulationPersonName != null and circulationPersonName != ''">
+ and circulation_person_name like concat('%', #{circulationPersonName}, '%')
+ </if>
+ <if test="circulationPersonCode != null and circulationPersonCode != ''">
+ and circulation_person_code =#{circulationPersonCode}
</if>
</select>
@@ -386,6 +508,43 @@
</if>
<if test="templateType != null">template_type,
</if>
+ <if test="dimension != null">dimension,
+ </if>
+ <if test="isMydException != null">is_myd_exception,
+ </if>
+ <if test="dutyDeptPersonName != null">duty_dept_person_name,
+ </if>
+ <if test="dutyDeptPersonCode != null">duty_dept_person_code,
+ </if>
+ <if test="reportDeptPersonName != null">report_dept_person_name,
+ </if>
+ <if test="reportDeptPersonCode != null">report_dept_person_code,
+ </if>
+ <if test="circulationDeptPersonCode != null">circulation_dept_person_code,
+ </if>
+ <if test="circulationDeptPersonName != null">circulation_dept_person_name,
+ </if>
+ <if test="circulationDeptCode != null ">
+ circulation_dept_code,
+ </if>
+ <if test="circulationDeptName != null">
+ circulation_dept_name,
+ </if>
+ <if test="circulationExplain != null ">
+ circulation_explain,
+ </if>
+ <if test="circulationTime != null ">
+ circulation_time,
+ </if>
+ <if test="circulationStatus != null ">
+ circulation_status,
+ </if>
+ <if test="circulationPersonName != null and circulationPersonName != ''">
+ circulation_person_name,
+ </if>
+ <if test="circulationPersonCode != null and circulationPersonCode != ''">
+ circulation_person_code,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="detailId != null">#{detailId},
@@ -483,6 +642,43 @@
<if test="type != null">#{type},
</if>
<if test="templateType != null">#{templateType},
+ </if>
+ <if test="dimension != null">#{dimension},
+ </if>
+ <if test="isMydException != null">#{isMydException},
+ </if>
+ <if test="dutyDeptPersonName != null">#{dutyDeptPersonName},
+ </if>
+ <if test="dutyDeptPersonCode != null">#{dutyDeptPersonCode},
+ </if>
+ <if test="reportDeptPersonName != null">#{reportDeptPersonName},
+ </if>
+ <if test="reportDeptPersonCode != null">#{reportDeptPersonCode},
+ </if>
+ <if test="circulationDeptPersonCode != null">#{circulationDeptPersonCode},
+ </if>
+ <if test="circulationDeptPersonName != null">#{circulationDeptPersonName},
+ </if>
+ <if test="circulationDeptCode != null">
+ #{circulationDeptCode},
+ </if>
+ <if test="circulationDeptName != null">
+ #{circulationDeptName},
+ </if>
+ <if test="circulationExplain != null">
+ #{circulationExplain},
+ </if>
+ <if test="circulationTime != null ">
+ #{circulationTime},
+ </if>
+ <if test="circulationStatus != null ">
+ #{circulationStatus},
+ </if>
+ <if test="circulationPersonName != null and circulationPersonName != ''">
+ #{circulationPersonName},
+ </if>
+ <if test="circulationPersonCode != null and circulationPersonCode != ''">
+ #{circulationPersonCode},
</if>
</trim>
</insert>
@@ -634,6 +830,51 @@
<if test="templateType != null">template_type =
#{templateType},
</if>
+ <if test="dimension != null">dimension =
+ #{dimension},
+ </if>
+ <if test="isMydException != null">is_myd_exception =
+ #{isMydException},
+ </if>
+ <if test="dutyDeptPersonName != null">duty_dept_person_name =
+ #{dutyDeptPersonName},
+ </if>
+ <if test="dutyDeptPersonCode != null">duty_dept_person_code =
+ #{dutyDeptPersonCode},
+ </if>
+ <if test="reportDeptPersonName != null">report_dept_person_name =
+ #{reportDeptPersonName},
+ </if>
+ <if test="reportDeptPersonCode != null">report_dept_person_code =
+ #{reportDeptPersonCode},
+ </if>
+ <if test="circulationDeptPersonCode != null">circulation_dept_person_code =
+ #{circulationDeptPersonCode},
+ </if>
+ <if test="circulationDeptPersonName != null">circulation_dept_person_name =
+ #{circulationDeptPersonName},
+ </if>
+ <if test="circulationDeptCode != null">circulation_dept_code =
+ #{circulationDeptCode},
+ </if>
+ <if test="circulationDeptName != null">circulation_dept_name =
+ #{circulationDeptName},
+ </if>
+ <if test="circulationExplain != null">circulation_explain =
+ #{circulationExplain},
+ </if>
+ <if test="circulationTime != null">circulation_time =
+ #{circulationTime},
+ </if>
+ <if test="circulationStatus != null ">
+ circulation_status = #{circulationStatus},
+ </if>
+ <if test="circulationPersonName != null and circulationPersonName != ''">
+ circulation_person_name =#{circulationPersonName},
+ </if>
+ <if test="circulationPersonCode != null and circulationPersonCode != ''">
+ circulation_person_code =#{circulationPersonCode},
+ </if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3