bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug解决

This commit is contained in:
liang.chao 2024-08-08 13:48:33 +08:00
parent bdd8222eef
commit d44dd94380
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -159,7 +159,8 @@ public class RepairServiceImpl implements RepairService {
partDetails.setPartCost("0"); partDetails.setPartCost("0");
} }
BigDecimal partCost = new BigDecimal(partDetails.getPartCost()); 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())) { } else if (bsfPart.equals(partDetails.getPartType())) {
if (StringUtils.isEmpty(partDetails.getPartCost())) { if (StringUtils.isEmpty(partDetails.getPartCost())) {
partDetails.setPartCost("0"); partDetails.setPartCost("0");

4
sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
View File

@ -22,8 +22,8 @@
values (#{taskId},#{id},#{maId},#{typeId},#{repairNum},#{repairedNum},#{scrapNum},'0',#{createBy},now(),#{companyId}); values (#{taskId},#{id},#{maId},#{typeId},#{repairNum},#{repairedNum},#{scrapNum},'0',#{createBy},now(),#{companyId});
</insert> </insert>
<insert id="addRepairCost"> <insert id="addRepairCost">
insert into repair_cost (task_id,repair_id,type_id,ma_id,repair_num,costs,part_type,status,company_id) 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}); values (#{bean.taskId},#{bean.id},#{bean.typeId},#{bean.maId},#{bean.repairNum},#{costs},#{partType},'0',#{bean.companyId},#{bean.repairType});
</insert> </insert>
<update id="updateRepairedNum"> <update id="updateRepairedNum">
update repair_apply_details update repair_apply_details

7
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
View File

@ -185,9 +185,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt1.type_name as typeName, mt1.type_name as typeName,
mt.type_name as modelName, mt.type_name as modelName,
mt.unit_name as nuitName, mt.unit_name as nuitName,
sum(rc.repair_num ) as num, rc.repair_num as num,
sum(rc.costs * rc.repair_num) as costs, rc.costs as costs,
case rc.part_type when '0' then '不收费' when '1' then '收费' else '' end as partType, case rc.repair_type when '1' then '内部维修' when '2' then '返厂维修' else '' end as partType,
sd.name as repairStatus, sd.name as repairStatus,
rc.company_id as companyId rc.company_id as companyId
from repair_cost rc from repair_cost rc
@ -206,7 +206,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{task.taskId} #{task.taskId}
</foreach> </foreach>
</if> </if>
group by rc.type_id,rc.ma_id,rc.part_type,rc.status
</select> </select>
<select id="getScrapDetailsList" resultType="com.bonus.sgzb.base.api.domain.SltAgreementInfo"> <select id="getScrapDetailsList" resultType="com.bonus.sgzb.base.api.domain.SltAgreementInfo">
select tta.agreement_id as agreementId, select tta.agreement_id as agreementId,