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

- 在 EquipmentMaintainTaskServiceImpl 中添加维护成本字段的处理
- 更新 ProductionEquipmentMapper.xml 中的维护成本计算查询
- 优化了维护任务和成本相关的数据传输和处理逻辑

@@ -91,24 +91,17 @@
     </select>
     </select>
     <select id="getMaintainCost" parameterType="java.lang.String" resultType="java.lang.Double">
     <select id="getMaintainCost" parameterType="java.lang.String" resultType="java.lang.Double">
         SELECT
         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
         FROM
-        equipment_maintain_task emt
-        LEFT JOIN equipment_task_cost etc ON etc.task_id = emt.id
+            equipment_maintain_task emt
         WHERE
         WHERE
-        emt.del_flag = 0
-        <if test="startTime !=null and startTime !=''">
-            AND emt.maintain_time BETWEEN #{startTime}
-        </if>
-        <if test="endTime !=null and endTime !=''">
-            and #{endTime}
-        </if>
+            emt.del_flag = 0
+            <if test="startTime !=null and startTime !=''">
+                AND emt.maintain_time BETWEEN #{startTime}
+            </if>
+            <if test="endTime !=null and endTime !=''">
+                and #{endTime}
+            </if>
     </select>
     </select>
 
 
     <select id="getEquipmentStatisticsDetailsNew" resultType="com.skua.modules.equipment.vo.EquipmentStatisticsCountVO">
     <select id="getEquipmentStatisticsDetailsNew" resultType="com.skua.modules.equipment.vo.EquipmentStatisticsCountVO">

@@ -93,6 +93,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
         equipmentMaintainTaskVO.setMaintenanceFrontUrl(equipmentMaintainTask.getMaintenanceFrontUrl());
         equipmentMaintainTaskVO.setMaintenanceFrontUrl(equipmentMaintainTask.getMaintenanceFrontUrl());
         equipmentMaintainTaskVO.setMaintenanceAfterUrl(equipmentMaintainTask.getMaintenanceAfterUrl());
         equipmentMaintainTaskVO.setMaintenanceAfterUrl(equipmentMaintainTask.getMaintenanceAfterUrl());
         equipmentMaintainTaskVO.setResultsEnforcement(equipmentMaintainTask.getResultsEnforcement());
         equipmentMaintainTaskVO.setResultsEnforcement(equipmentMaintainTask.getResultsEnforcement());
+        equipmentMaintainTaskVO.setMaintenanceCost(equipmentMaintainTask.getMaintenanceCost());
         //维护内容
         //维护内容
         EquipmentMaintenanceContentVO equipmentMaintenanceContentVO = new EquipmentMaintenanceContentVO();
         EquipmentMaintenanceContentVO equipmentMaintenanceContentVO = new EquipmentMaintenanceContentVO();
         List<EquipmentMaintainStandardVO> standardByTaskId = baseMapper.getStandardByTaskId(id);
         List<EquipmentMaintainStandardVO> standardByTaskId = baseMapper.getStandardByTaskId(id);
@@ -113,7 +114,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
         //备件清单
         //备件清单
         List<EquipmentSparePartListVO> sparePartListByTaskId = baseMapper.getSparePartListByTaskId(id);
         List<EquipmentSparePartListVO> sparePartListByTaskId = baseMapper.getSparePartListByTaskId(id);
         equipmentMaintainTaskVO.setEquipmentSparePartListVOList(sparePartListByTaskId);
         equipmentMaintainTaskVO.setEquipmentSparePartListVOList(sparePartListByTaskId);
-        
+
         //验收情况
         //验收情况
         String userCode = BaseContextHandler.getUserId();
         String userCode = BaseContextHandler.getUserId();
         if (userCode.equals(equipmentMaintainPlanVO.getPlanAccepterId())) {
         if (userCode.equals(equipmentMaintainPlanVO.getPlanAccepterId())) {
@@ -197,7 +198,8 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
         equipmentMaintainTask.setMaintenanceFrontUrl(equipmentMaintainTaskVO.getMaintenanceFrontUrl());
         equipmentMaintainTask.setMaintenanceFrontUrl(equipmentMaintainTaskVO.getMaintenanceFrontUrl());
         equipmentMaintainTask.setMaintenanceAfterUrl(equipmentMaintainTaskVO.getMaintenanceAfterUrl());
         equipmentMaintainTask.setMaintenanceAfterUrl(equipmentMaintainTaskVO.getMaintenanceAfterUrl());
         equipmentMaintainTask.setDeviceAdministratorId(equipmentMaintainTaskVO.getDeviceAdministratorId());
         equipmentMaintainTask.setDeviceAdministratorId(equipmentMaintainTaskVO.getDeviceAdministratorId());
-        
+        equipmentMaintainTask.setMaintenanceCost(equipmentMaintainTaskVO.getMaintenanceCost());
+
         //新增验收情况
         //新增验收情况
         boolean checkTag = false;
         boolean checkTag = false;
         if (equipmentMaintainTaskVO.getCurrentState() != 3 && status == 3) {
         if (equipmentMaintainTaskVO.getCurrentState() != 3 && status == 3) {
@@ -211,7 +213,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
                     equipmentMaintainTaskCheck.setExpenses(e.getExpenses());
                     equipmentMaintainTaskCheck.setExpenses(e.getExpenses());
                     equipmentMaintainTaskCheck.setAcceptancesStatus(e.getAcceptancesStatus());
                     equipmentMaintainTaskCheck.setAcceptancesStatus(e.getAcceptancesStatus());
                     equipmentMaintainTaskCheck.setAcceptancesTime(e.getAcceptancesTime());
                     equipmentMaintainTaskCheck.setAcceptancesTime(e.getAcceptancesTime());
-                    
+
                     String checkId = e.getId();
                     String checkId = e.getId();
                     if(StringUtils.isEmpty(checkId)) {
                     if(StringUtils.isEmpty(checkId)) {
                     	 equipmentMaintainTaskCheckMapper.insert(equipmentMaintainTaskCheck);
                     	 equipmentMaintainTaskCheckMapper.insert(equipmentMaintainTaskCheck);
@@ -219,7 +221,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
                     	equipmentMaintainTaskCheck.setId(checkId);
                     	equipmentMaintainTaskCheck.setId(checkId);
                     	equipmentMaintainTaskCheckMapper.updateById(equipmentMaintainTaskCheck);
                     	equipmentMaintainTaskCheckMapper.updateById(equipmentMaintainTaskCheck);
                     }
                     }
-                    
+
                     //判断如果不合格，则打回到任务执行节点
                     //判断如果不合格，则打回到任务执行节点
                     if("1".equals(equipmentMaintainTaskCheck.getMaintainQuality())) {
                     if("1".equals(equipmentMaintainTaskCheck.getMaintainQuality())) {
                     	equipmentMaintainTask.setResultsEnforcement(2);
                     	equipmentMaintainTask.setResultsEnforcement(2);
@@ -253,7 +255,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
         		handleSparepartInOrOut(sparepartInfoList,maintainerId,"in");
         		handleSparepartInOrOut(sparepartInfoList,maintainerId,"in");
             	//删除备品备件数据
             	//删除备品备件数据
             	equipmentMaintainTaskSparepartMapper.deleteByTaskId(equipmentMaintainTaskVO.getId());
             	equipmentMaintainTaskSparepartMapper.deleteByTaskId(equipmentMaintainTaskVO.getId());
-            	
+
             	//更新物料库存数量-出库仓库
             	//更新物料库存数量-出库仓库
             	sparepartInfoList = equipmentMaintainTaskVO.getEquipmentSparePartListVOList();
             	sparepartInfoList = equipmentMaintainTaskVO.getEquipmentSparePartListVOList();
             	handleSparepartInOrOut(sparepartInfoList,maintainerId,"out");
             	handleSparepartInOrOut(sparepartInfoList,maintainerId,"out");
@@ -348,7 +350,7 @@ public class EquipmentMaintainTaskServiceImpl extends ServiceImpl<EquipmentMaint
                 if(equipmentMaintainTaskCalendarVO.getResultsEnforcement()==3&&userCode.equals(equipmentMaintainTaskCalendarVO.getPlanAccepterId())) {
                 if(equipmentMaintainTaskCalendarVO.getResultsEnforcement()==3&&userCode.equals(equipmentMaintainTaskCalendarVO.getPlanAccepterId())) {
                 	equipmentMaintainTaskCalendarVO.setCurrentState(3);
                 	equipmentMaintainTaskCalendarVO.setCurrentState(3);
                 }
                 }
-				
+
 				String timeStr = DateUtils.format(timeDate, "yyyy-MM-dd");
 				String timeStr = DateUtils.format(timeDate, "yyyy-MM-dd");
 				List<EquipmentMaintainTaskCalendarVO> dayTaskList = taskCalendarMap.get(timeStr);
 				List<EquipmentMaintainTaskCalendarVO> dayTaskList = taskCalendarMap.get(timeStr);
 				if(dayTaskList ==null) {
 				if(dayTaskList ==null) {