diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 0b1f9e29..b9643f11 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -159,7 +159,8 @@ public class RepairServiceImpl implements RepairService { partDetails.setPartCost("0"); } BigDecimal partCost = new BigDecimal(partDetails.getPartCost()); - sfCosts = sfCosts.add(partCost); + BigDecimal partNumber = new BigDecimal(partDetails.getPartNum()); + sfCosts = sfCosts.add(partCost.multiply(partNumber)); } else if (bsfPart.equals(partDetails.getPartType())) { if (StringUtils.isEmpty(partDetails.getPartCost())) { partDetails.setPartCost("0"); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index 80017de6..966c20c4 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -22,8 +22,8 @@ values (#{taskId},#{id},#{maId},#{typeId},#{repairNum},#{repairedNum},#{scrapNum},'0',#{createBy},now(),#{companyId}); - insert into repair_cost (task_id,repair_id,type_id,ma_id,repair_num,costs,part_type,status,company_id) - values (#{bean.taskId},#{bean.id},#{bean.typeId},#{bean.maId},#{bean.repairNum},#{costs},#{partType},'0',#{bean.companyId}); + insert into repair_cost (task_id,repair_id,type_id,ma_id,repair_num,costs,part_type,status,company_id,repair_type) + values (#{bean.taskId},#{bean.id},#{bean.typeId},#{bean.maId},#{bean.repairNum},#{costs},#{partType},'0',#{bean.companyId},#{bean.repairType}); update repair_apply_details diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml index c38ee983..af65b641 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml @@ -185,9 +185,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt1.type_name as typeName, mt.type_name as modelName, mt.unit_name as nuitName, - sum(rc.repair_num ) as num, - sum(rc.costs * rc.repair_num) as costs, - case rc.part_type when '0' then '不收费' when '1' then '收费' else '' end as partType, + rc.repair_num as num, + rc.costs as costs, + case rc.repair_type when '1' then '内部维修' when '2' then '返厂维修' else '' end as partType, sd.name as repairStatus, rc.company_id as companyId from repair_cost rc @@ -206,7 +206,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{task.taskId} - group by rc.type_id,rc.ma_id,rc.part_type,rc.status