kangwei：设备分析补充：维护费用 保养费用 基建维修费用

@@ -13,6 +13,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import netscape.javascript.JSUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
@@ -59,4 +60,9 @@ public class EquipmentInfoDuration {
 	@Excel(name = "累计总时长", width = 15)
 	@Excel(name = "累计总时长", width = 15)
     @ApiModelProperty(value = "累计总时长")
     @ApiModelProperty(value = "累计总时长")
 	private Double totalDuration;
 	private Double totalDuration;
+
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "设备运行比例")
+	private String sbyxRate;
 }
 }

@@ -65,8 +65,11 @@ public class ProductionEquipmentServiceImpl implements IProductionEquipmentServi
         Double maintainCost = 0.00;
         Double maintainCost = 0.00;
         Double totalCost = 0.00;
         Double totalCost = 0.00;
         Double costRing = 0.00;
         Double costRing = 0.00;
-        Double dxjgCost = 0d;
+        Double dxjgCost = 0d;   //大修
 
 
+        Double sbwhCost = 0d; //维护费用
+        Double sbbyCost = 0d;//保养费用
+        Double jjwxCost = 0d; //基建维修费用
         //ab总数
         //ab总数
         Integer ABEquipmentNum = 0;
         Integer ABEquipmentNum = 0;
         if (reportStatisticsDTO.getTimeUnit() != null && reportStatisticsDTO.getTimeUnit() == 3) {
         if (reportStatisticsDTO.getTimeUnit() != null && reportStatisticsDTO.getTimeUnit() == 3) {
@@ -219,6 +222,12 @@ public class ProductionEquipmentServiceImpl implements IProductionEquipmentServi
             //维护维修费用
             //维护维修费用
             //大修费用
             //大修费用
             dxjgCost = productionEquipmentMapper.getMaintainCostByMaintenanceType("dxjg",reportStatisticsDTO.getTime() + YEAR_START, reportStatisticsDTO.getTime() + YEAR_END);
             dxjgCost = productionEquipmentMapper.getMaintainCostByMaintenanceType("dxjg",reportStatisticsDTO.getTime() + YEAR_START, reportStatisticsDTO.getTime() + YEAR_END);
+
+            sbwhCost = productionEquipmentMapper.getMaintainCostByMaintenanceType("sbwh",reportStatisticsDTO.getTime() + YEAR_START, reportStatisticsDTO.getTime() + YEAR_END);; //维护费用
+            sbbyCost = productionEquipmentMapper.getMaintainCostByMaintenanceType("sbby",reportStatisticsDTO.getTime() + YEAR_START, reportStatisticsDTO.getTime() + YEAR_END);;//保养费用
+            jjwxCost = productionEquipmentMapper.getMaintainCostByMaintenanceType("jjwx",reportStatisticsDTO.getTime() + YEAR_START, reportStatisticsDTO.getTime() + YEAR_END);; //基建维修费用
+
+
             //维修费
             //维修费
             repairCost = productionEquipmentMapper.getRepairCost(reportStatisticsDTO.getTime() + YEAR_START, reportStatisticsDTO.getTime() + YEAR_END);
             repairCost = productionEquipmentMapper.getRepairCost(reportStatisticsDTO.getTime() + YEAR_START, reportStatisticsDTO.getTime() + YEAR_END);
             //保养费
             //保养费
@@ -259,6 +268,10 @@ public class ProductionEquipmentServiceImpl implements IProductionEquipmentServi
         productionEquipmentVO.setRepairCompleteRingRate(bigDecimal3.toString() + "%");
         productionEquipmentVO.setRepairCompleteRingRate(bigDecimal3.toString() + "%");
         //大修技改费用
         //大修技改费用
         productionEquipmentVO.setDxCost(dxjgCost+"");
         productionEquipmentVO.setDxCost(dxjgCost+"");
+        productionEquipmentVO.setSbbyCost(sbbyCost+"");//维护费用
+        productionEquipmentVO.setSbwhCost(sbwhCost+"");//维护费用
+        productionEquipmentVO.setJjwxCost(jjwxCost+"");//基建维修费用
+
         //维护维修费用
         //维护维修费用
         productionEquipmentVO.setRepairMaintainCost(JSUtils.divide(totalCost,10000));
         productionEquipmentVO.setRepairMaintainCost(JSUtils.divide(totalCost,10000));
         //维修费用
         //维修费用

 package com.skua.modules.equipment.vo;
 package com.skua.modules.equipment.vo;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 /***************************
 /***************************
@@ -47,6 +48,16 @@ public class ProductionEquipmentVO {
     private String maintainCost;
     private String maintainCost;
 
 
     //大修费用
     //大修费用
+    @ApiModelProperty(value = "大修费用")
     private String dxCost;
     private String dxCost;
 
 
+    @ApiModelProperty(value = "维护费用")
+    private String sbwhCost;
+
+    @ApiModelProperty(value = "保养费用")
+    private String sbbyCost;
+
+    @ApiModelProperty(value = "基建维修费用")
+    private String jjwxCost;
+
 }
 }