feat(equipment): 添加维护成本字段并优化成本计算逻辑

- 在 EquipmentMaintainTaskServiceImpl 中添加维护成本字段的处理
- 更新 ProductionEquipmentMapper.xml 中的维护成本计算查询
- 优化了维护任务和成本相关的数据传输和处理逻辑
1 个父辈 564a2a15
......@@ -91,16 +91,9 @@
</select>
<select id="getMaintainCost" parameterType="java.lang.String" resultType="java.lang.Double">
SELECT
IFNULL(
SUM(
etc.labor_cost + etc.material_cost + etc.maintenance_cost + etc.machinery_cost + etc.service_cost +
etc.wastage_cost + etc.other_cost
),
0
) AS cost
IFNULL(SUM(emt.material_cost),0) AS cost
FROM
equipment_maintain_task emt
LEFT JOIN equipment_task_cost etc ON etc.task_id = emt.id
WHERE
emt.del_flag = 0
<if test="startTime !=null and startTime !=''">
......
......@@ -93,6 +93,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
equipmentMaintainTaskVO.setMaintenanceFrontUrl(equipmentMaintainTask.getMaintenanceFrontUrl());
equipmentMaintainTaskVO.setMaintenanceAfterUrl(equipmentMaintainTask.getMaintenanceAfterUrl());
equipmentMaintainTaskVO.setResultsEnforcement(equipmentMaintainTask.getResultsEnforcement());
equipmentMaintainTaskVO.setMaintenanceCost(equipmentMaintainTask.getMaintenanceCost());
//维护内容
EquipmentMaintenanceContentVO equipmentMaintenanceContentVO = new EquipmentMaintenanceContentVO();
List<EquipmentMaintainStandardVO> standardByTaskId = baseMapper.getStandardByTaskId(id);
......@@ -197,6 +198,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
equipmentMaintainTask.setMaintenanceFrontUrl(equipmentMaintainTaskVO.getMaintenanceFrontUrl());
equipmentMaintainTask.setMaintenanceAfterUrl(equipmentMaintainTaskVO.getMaintenanceAfterUrl());
equipmentMaintainTask.setDeviceAdministratorId(equipmentMaintainTaskVO.getDeviceAdministratorId());
equipmentMaintainTask.setMaintenanceCost(equipmentMaintainTaskVO.getMaintenanceCost());
//新增验收情况
boolean checkTag = false;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!