From b4d23d40c6ba77b028538ccebf8b757b5491aa90 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 10:33:11 +0800
Subject: [PATCH] 1、流程bug修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
index 2543c55..ca007be 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
@@ -21,6 +21,7 @@
<result property="returnTime" column="return_time"/>
<result property="returnStatus" column="return_status"/>
<result property="caseTaskId" column="case_task_id"/>
+ <result property="caseTaskType" column="case_task_type"/>
<result property="auditUnitId" column="audit_unit_id"/>
<result property="auditUnitName" column="audit_unit_name"/>
<result property="auditUserId" column="audit_user_id"/>
@@ -28,7 +29,7 @@
<result property="auditTime" column="audit_time"/>
<result property="auditResult" column="audit_result"/>
<result property="auditResultName" column="audit_result_name"/>
- <result property="audit_content" column="audit__content"/>
+ <result property="auditContent" column="audit_content"/>
<result property="deleteStatus" column="delete_status"/>
<result property="custId" column="cust_id"/>
<result property="createTime" column="create_time"/>
@@ -48,6 +49,7 @@
return_time,
return_status,
case_task_id,
+ case_task_type,
audit_unit_id,
audit_unit_name,
audit_user_id,
@@ -55,7 +57,7 @@
audit_time,
audit_result,
audit_result_name,
- audit__content,
+ audit_content,
delete_status,
cust_id,
create_time,
@@ -72,6 +74,7 @@
<if test="entity.returnTime != null">return_time = #{entity.returnTime},</if>
<if test="entity.returnStatus != null">return_status = #{entity.returnStatus},</if>
<if test="entity.caseTaskId != null">case_task_id = #{entity.caseTaskId},</if>
+ <if test="entity.caseTaskType != null">case_task_type = #{entity.caseTaskType},</if>
<if test="entity.auditUnitId != null">audit_unit_id = #{entity.auditUnitId},</if>
<if test="entity.auditUnitName != null">audit_unit_name = #{entity.auditUnitName},</if>
<if test="entity.auditUserId != null">audit_user_id = #{entity.auditUserId},</if>
@@ -79,7 +82,7 @@
<if test="entity.auditTime != null">audit_time = #{entity.auditTime},</if>
<if test="entity.auditResult != null">audit_result = #{entity.auditResult},</if>
<if test="entity.auditResultName != null">audit_result_name = #{entity.auditResultName},</if>
- <if test="entity.audit_content != null">audit__content = #{entity.audit_content},</if>
+ <if test="entity.auditContent != null">audit_content = #{entity.auditContent},</if>
<if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
<if test="entity.custId != null">cust_id = #{entity.custId},</if>
<if test="entity.createTime != null">create_time = #{entity.createTime},</if>
@@ -119,6 +122,9 @@
<if test="terms.caseTaskId != null and terms.caseTaskId !=''">
and case_task_id = #{terms.caseTaskId}
</if>
+ <if test="terms.caseTaskType != null and terms.caseTaskType !=''">
+ and case_task_type = #{terms.caseTaskType}
+ </if>
<if test="terms.auditUnitId != null and terms.auditUnitId !=''">
and audit_unit_id = #{terms.auditUnitId}
</if>
@@ -140,8 +146,8 @@
<if test="terms.auditResultName != null and terms.auditResultName !=''">
and audit_result_name = #{terms.auditResultName}
</if>
- <if test="terms.audit_content != null and terms.audit_content !=''">
- and audit__content = #{terms.audit_content}
+ <if test="terms.auditContent != null and terms.auditContent !=''">
+ and audit_content = #{terms.auditContent}
</if>
<if test="terms.deleteStatus = null and terms.deleteStatus =''">
and delete_status = 0
@@ -278,7 +284,7 @@
and DATE_FORMAT(t1.return_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
</select>
@@ -299,7 +305,7 @@
and DATE_FORMAT(t1.return_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
--
Gitblit v1.8.0