From 031c3f247dc71727f74f26cf835e065fad500e08 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Tue, 10 Sep 2024 11:42:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
index 73cfc8e..61bd449 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-09-06 15:50:06
+ * @time:2024-09-09 22:10:33
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.cases.dao.mapper.CaseTaskMapper">
@@ -39,10 +39,13 @@
<result property="signUserName" column="sign_user_name"/>
<result property="expireTime" column="expire_time"/>
<result property="status" column="status"/>
+ <result property="handleUnitId" column="handle_unit_id"/>
+ <result property="handleUnitName" column="handle_unit_name"/>
<result property="handleUserId" column="handle_user_id"/>
<result property="handleUserName" column="handle_user_name"/>
<result property="handleResult" column="handle_result"/>
<result property="handleContent" column="handle_content"/>
+ <result property="handleIllust" column="handle_illust"/>
<result property="handleTime" column="handle_time"/>
<result property="deleteStatus" column="delete_status"/>
<result property="custId" column="cust_id"/>
@@ -81,10 +84,13 @@
sign_user_name,
expire_time,
status,
+ handle_unit_id,
+ handle_unit_name,
handle_user_id,
handle_user_name,
handle_result,
handle_content,
+ handle_illust,
handle_time,
delete_status,
cust_id,
@@ -120,10 +126,13 @@
<if test="entity.signUserName != null">sign_user_name = #{entity.signUserName},</if>
<if test="entity.expireTime != null">expire_time = #{entity.expireTime},</if>
<if test="entity.status != null">status = #{entity.status},</if>
+ <if test="entity.handleUnitId != null">handle_unit_id = #{entity.handleUnitId},</if>
+ <if test="entity.handleUnitName != null">handle_unit_name = #{entity.handleUnitName},</if>
<if test="entity.handleUserId != null">handle_user_id = #{entity.handleUserId},</if>
<if test="entity.handleUserName != null">handle_user_name = #{entity.handleUserName},</if>
<if test="entity.handleResult != null">handle_result = #{entity.handleResult},</if>
<if test="entity.handleContent != null">handle_content = #{entity.handleContent},</if>
+ <if test="entity.handleIllust != null">handle_illust = #{entity.handleIllust},</if>
<if test="entity.handleTime != null">handle_time = #{entity.handleTime},</if>
<if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
<if test="entity.custId != null">cust_id = #{entity.custId},</if>
@@ -218,6 +227,12 @@
<if test="terms.status != null and terms.status !=''">
and status = #{terms.status}
</if>
+ <if test="terms.handleUnitId != null and terms.handleUnitId !=''">
+ and handle_unit_id = #{terms.handleUnitId}
+ </if>
+ <if test="terms.handleUnitName != null and terms.handleUnitName !=''">
+ and handle_unit_name = #{terms.handleUnitName}
+ </if>
<if test="terms.handleUserId != null and terms.handleUserId !=''">
and handle_user_id = #{terms.handleUserId}
</if>
@@ -229,6 +244,9 @@
</if>
<if test="terms.handleContent != null and terms.handleContent !=''">
and handle_content = #{terms.handleContent}
+ </if>
+ <if test="terms.handleIllust != null and terms.handleIllust !=''">
+ and handle_illust = #{terms.handleIllust}
</if>
<if test="terms.handleTime != null and terms.handleTime !=''">
and handle_time = #{terms.handleTime}
@@ -319,4 +337,25 @@
limit #{page.offset}, #{page.size}
</select>
+ <!-- 结果集-->
+ <resultMap id="FrontPageCountResult" type="cn.huge.module.cases.domain.dto.FrontPageCountDTO">
+ <result property="waitSign" column="waitSign"/>
+ <result property="waitAccept" column="waitAccept"/>
+ <result property="waitAccept" column="waitAccept"/>
+ </resultMap>
+ <!-- 查询任务数量 -->
+ <select id="countTaskList" resultMap="FrontPageCountResult">
+ select
+ count(case when sign_status = 1 then id end) as waitSign,
+ count(case when node_id = then id end) as waitAccept,
+ count(case when node_id = then id end) as Processing
+ from
+ <include refid="table-name" />
+ where
+ cande_unit_id = #{terms.candeUnitId}
+ and (cande_dept_id = #{terms.candeDeptId} or cande_dept_id is null)
+ and delete_status = '0'
+ and status = '1'
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0