bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

This commit is contained in:
hayu 2025-08-04 09:58:23 +08:00
parent 68764e648b
commit 19cceff7b8
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java
View File

@ -194,4 +194,6 @@ public class RepairTask {
* 数据状态 0-未定损，1-已定损 3-修饰后入库驳回 * 数据状态 0-未定损，1-已定损 3-修饰后入库驳回
*/ */
private String dataStatus; private String dataStatus;
private Integer num;
} }

13
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
View File

@ -272,7 +272,8 @@
GROUP_CONCAT(DISTINCT mt2.type_name) as type, GROUP_CONCAT(DISTINCT mt2.type_name) as type,
rd.level as level, rd.level as level,
GROUP_CONCAT(DISTINCT mt4.type_id) as firstId, GROUP_CONCAT(DISTINCT mt4.type_id) as firstId,
rd.status as dataStatus rd.status as dataStatus,
rad2.num
FROM FROM
repair_apply_details rd repair_apply_details rd
LEFT JOIN ma_type mt on rd.type_id = mt.type_id LEFT JOIN ma_type mt on rd.type_id = mt.type_id
@ -287,6 +288,16 @@
left join sys_user su2 on su2.user_id = rd.repairer left join sys_user su2 on su2.user_id = rd.repairer
left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0' left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0'
left join ma_type mt4 ON mt3.parent_id = mt4.type_id and mt4.del_flag = '0' left join ma_type mt4 ON mt3.parent_id = mt4.type_id and mt4.del_flag = '0'
LEFT JOIN (
SELECT
task_id,
SUM(`status`) as num
FROM
repair_apply_details
WHERE
is_ds='1'
GROUP BY task_id
) rad2 on rad2.task_id=rd.task_id
<if test="userId != null"> <if test="userId != null">
JOIN ma_type_repair mtr ON mtr.type_id = rd.type_id AND mtr.user_id = #{userId} JOIN ma_type_repair mtr ON mtr.type_id = rd.type_id AND mtr.user_id = #{userId}
</if> </if>