From 21d3a185731b8546ce14aa9f8fbab4e24dccc94c Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Wed, 10 Jan 2024 18:03:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/material/RepairTestInputMapper.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml index d8313532..cd8cbce9 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml @@ -69,10 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ANY_VALUE(tt2.`code`) AS repairCode, ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName, ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2, - ANY_VALUE(tt2.create_by) AS wxName, + ANY_VALUE(us.user_name) AS wxName, ANY_VALUE(tt2.create_time) AS wxTime, ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus FROM repair_input_details rid + LEFT JOIN repair_apply_details rad on rid.repair_id=rad.task_id and rid.type_id=rad.type_id + LEFT JOIN sys_user us on us.user_id=rad.repairer LEFT JOIN tm_task tt ON rid.task_id = tt.task_id LEFT JOIN sys_dic sd ON tt.task_status = sd.id LEFT JOIN tm_task tt2 ON rid.repair_id = tt2.task_id @@ -81,7 +83,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ma_type mt LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3' LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2' - LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1' WHERE mt.`level` = '4' )a ON rid.type_id = a.typeId GROUP BY rid.task_id