diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/handlinggroup/HandlingGroupMapper.xml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/handlinggroup/HandlingGroupMapper.xml index cbfb387e..6a3911ac 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/handlinggroup/HandlingGroupMapper.xml +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/handlinggroup/HandlingGroupMapper.xml @@ -12,11 +12,13 @@ - + @@ -68,16 +71,16 @@ SUM( a.amount ) AS totalAmount, sum( a.total_count ) AS totalNum, JSON_ARRAYAGG( - JSON_OBJECT( - 'handlingSpecificationsId', a.handling_specifications_id, - 'totalCount', a.total_count, - 'amount', a.amount, - 'handlingSpecificationsName', ( - SELECT hs.specifications_name - FROM sf_handling_specifications as hs - WHERE hs.id = a.handling_specifications_id - ) - ) + JSON_OBJECT( + 'handlingSpecificationsId', a.handling_specifications_id, + 'totalCount', a.total_count, + 'amount', a.amount, + 'handlingSpecificationsName', ( + SELECT hs.specifications_name + FROM sf_handling_specifications as hs + WHERE hs.id = a.handling_specifications_id + ) + ) ) AS specificationDetails FROM sf_handling_group_amount_specifications AS a @@ -87,7 +90,6 @@ a.deleted = 0 and b.deleted = 0 - and c.deleted = 0 and a.factory_id = #{vo.factoryId} @@ -131,4 +133,13 @@ a.date_str, a.handling_group_id + diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/handlingspecifications/HandlingSpecificationsMapper.xml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/handlingspecifications/HandlingSpecificationsMapper.xml index 360f1da0..6e8998af 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/handlingspecifications/HandlingSpecificationsMapper.xml +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/handlingspecifications/HandlingSpecificationsMapper.xml @@ -51,4 +51,18 @@ +