diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index d93a363a..52ccd16b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bai.create_by as createBy, bai.create_time as createTime, GROUP_CONCAT(DISTINCT mt2.type_id) as typeId, - GROUP_CONCAT(mt2.type_name) AS typeName, + GROUP_CONCAT(DISTINCT mt2.type_name) AS typeName, bai.`status` AS status, bai.print_status as printStatus FROM diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 90aa1f5e..e5b10ddc 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -104,7 +104,7 @@ update repair_apply_details set status = '1', - repaired_num = repair_num, + repaired_num = repair_num - scrap_num, update_by = #{userId}, update_time = now() where id in @@ -300,15 +300,14 @@ rad.type_id as typeId, rad.back_id as backId, rad.create_time, - count(rc.id) AS totalCostRecords, - sum(ifnull(rc.costs,0)) AS totalCost + ( SELECT COUNT(*) FROM repair_cost rc WHERE rc.repair_id = rad.id ) AS totalCostRecords, + ( SELECT SUM( IFNULL( rc.costs, 0 )) FROM repair_cost rc WHERE rc.repair_id = rad.id ) AS totalCost from repair_apply_details rad left join ma_type mt on rad.type_id = mt.type_id left join ma_machine mm on mm.ma_id = rad.ma_id left join sys_user su on rad.repairer = su.user_id left join ma_type mt2 on mt.parent_id = mt2.type_id - left join repair_cost rc ON rad.id = rc.repair_id where rad.task_id = #{taskId}