|
|
@@ -49,27 +49,25 @@
|
|
|
t2.evaluate_type,
|
|
|
t4.name as evaluateTypeCn,
|
|
|
(select
|
|
|
- count(tb3.status)
|
|
|
- from evaluate_manage tb1
|
|
|
- left join evaluate_executer tb3 on tb3.evaluate_manage_id = tb1.id
|
|
|
- where tb1.delete_mark = 0
|
|
|
- and tb3.delete_mark = 0
|
|
|
- and tb1.status <> -1
|
|
|
- and tb3.status = 0
|
|
|
- and tb3.id = t3.id
|
|
|
- and tb1.id = t.id) as ratedCount
|
|
|
+ count(tb3.status)
|
|
|
+ from evaluate_manage tb1
|
|
|
+ left join evaluate_executer tb3 on tb3.evaluate_manage_id = tb1.id
|
|
|
+ where tb1.delete_mark = 0
|
|
|
+ and tb1.status <> -1
|
|
|
+ and tb3.status = 0
|
|
|
+ and tb3.user_id = t3.user_id
|
|
|
+ and tb1.id = t.id) as ratedCount
|
|
|
from evaluate_manage t
|
|
|
- left join evaluate_template t2 on t2.id = t.evaluate_template_id
|
|
|
- left join evaluate_executer t3 on t3.evaluate_manage_id = t.id
|
|
|
- left join xjr_dictionary_detail t4 on t4.code = t2.evaluate_type
|
|
|
+ left join evaluate_template t2 on t2.id = t.evaluate_template_id
|
|
|
+ left join evaluate_executer t3 on t3.evaluate_manage_id = t.id
|
|
|
+ left join xjr_dictionary_detail t4 on t4.code = t2.evaluate_type
|
|
|
where t.delete_mark = 0
|
|
|
- and t3.delete_mark = 0
|
|
|
- and t.status <> -1
|
|
|
- and t3.user_id = #{dto.loginUserId}
|
|
|
- <if test="dto.keyword != null and dto.keyword != ''">
|
|
|
- and (t.name like concat('%', #{dto.keyword}, '%')
|
|
|
- or t4.name like concat('%', #{dto.keyword}, '%'))
|
|
|
- </if>
|
|
|
+ and t.status <> -1
|
|
|
+ and t3.user_id = #{dto.loginUserId}
|
|
|
+ <if test="dto.keyword != null and dto.keyword != ''">
|
|
|
+ and (t.name like concat('%', #{dto.keyword}, '%')
|
|
|
+ or t4.name like concat('%', #{dto.keyword}, '%'))
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="getMobileResultPage" parameterType="com.xjrsoft.module.evaluate.dto.MobileResultPageDto" resultType="com.xjrsoft.module.evaluate.vo.MobileResultPageVo">
|