feat(equipment): 添加维护成本字段并优化成本计算逻辑
- 在 EquipmentMaintainTaskServiceImpl 中添加维护成本字段的处理 - 更新 ProductionEquipmentMapper.xml 中的维护成本计算查询 - 优化了维护任务和成本相关的数据传输和处理逻辑
正在显示
2 个修改的文件
包含
3 行增加
和
8 行删除
... | @@ -91,16 +91,9 @@ | ... | @@ -91,16 +91,9 @@ |
91 | </select> | 91 | </select> |
92 | <select id="getMaintainCost" parameterType="java.lang.String" resultType="java.lang.Double"> | 92 | <select id="getMaintainCost" parameterType="java.lang.String" resultType="java.lang.Double"> |
93 | SELECT | 93 | SELECT |
94 | IFNULL( | 94 | IFNULL(SUM(emt.material_cost),0) AS cost |
95 | SUM( | ||
96 | etc.labor_cost + etc.material_cost + etc.maintenance_cost + etc.machinery_cost + etc.service_cost + | ||
97 | etc.wastage_cost + etc.other_cost | ||
98 | ), | ||
99 | 0 | ||
100 | ) AS cost | ||
101 | FROM | 95 | FROM |
102 | equipment_maintain_task emt | 96 | equipment_maintain_task emt |
103 | LEFT JOIN equipment_task_cost etc ON etc.task_id = emt.id | ||
104 | WHERE | 97 | WHERE |
105 | emt.del_flag = 0 | 98 | emt.del_flag = 0 |
106 | <if test="startTime !=null and startTime !=''"> | 99 | <if test="startTime !=null and startTime !=''"> | ... | ... |
... | @@ -93,6 +93,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint | ... | @@ -93,6 +93,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint |
93 | equipmentMaintainTaskVO.setMaintenanceFrontUrl(equipmentMaintainTask.getMaintenanceFrontUrl()); | 93 | equipmentMaintainTaskVO.setMaintenanceFrontUrl(equipmentMaintainTask.getMaintenanceFrontUrl()); |
94 | equipmentMaintainTaskVO.setMaintenanceAfterUrl(equipmentMaintainTask.getMaintenanceAfterUrl()); | 94 | equipmentMaintainTaskVO.setMaintenanceAfterUrl(equipmentMaintainTask.getMaintenanceAfterUrl()); |
95 | equipmentMaintainTaskVO.setResultsEnforcement(equipmentMaintainTask.getResultsEnforcement()); | 95 | equipmentMaintainTaskVO.setResultsEnforcement(equipmentMaintainTask.getResultsEnforcement()); |
96 | equipmentMaintainTaskVO.setMaintenanceCost(equipmentMaintainTask.getMaintenanceCost()); | ||
96 | //维护内容 | 97 | //维护内容 |
97 | EquipmentMaintenanceContentVO equipmentMaintenanceContentVO = new EquipmentMaintenanceContentVO(); | 98 | EquipmentMaintenanceContentVO equipmentMaintenanceContentVO = new EquipmentMaintenanceContentVO(); |
98 | List<EquipmentMaintainStandardVO> standardByTaskId = baseMapper.getStandardByTaskId(id); | 99 | List<EquipmentMaintainStandardVO> standardByTaskId = baseMapper.getStandardByTaskId(id); |
... | @@ -197,6 +198,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint | ... | @@ -197,6 +198,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint |
197 | equipmentMaintainTask.setMaintenanceFrontUrl(equipmentMaintainTaskVO.getMaintenanceFrontUrl()); | 198 | equipmentMaintainTask.setMaintenanceFrontUrl(equipmentMaintainTaskVO.getMaintenanceFrontUrl()); |
198 | equipmentMaintainTask.setMaintenanceAfterUrl(equipmentMaintainTaskVO.getMaintenanceAfterUrl()); | 199 | equipmentMaintainTask.setMaintenanceAfterUrl(equipmentMaintainTaskVO.getMaintenanceAfterUrl()); |
199 | equipmentMaintainTask.setDeviceAdministratorId(equipmentMaintainTaskVO.getDeviceAdministratorId()); | 200 | equipmentMaintainTask.setDeviceAdministratorId(equipmentMaintainTaskVO.getDeviceAdministratorId()); |
201 | equipmentMaintainTask.setMaintenanceCost(equipmentMaintainTaskVO.getMaintenanceCost()); | ||
200 | 202 | ||
201 | //新增验收情况 | 203 | //新增验收情况 |
202 | boolean checkTag = false; | 204 | boolean checkTag = false; | ... | ... |
-
请 注册 或 登录 后发表评论