运营考核分析接口修改
正在显示
2 个修改的文件
包含
12 行增加
和
0 行删除
... | @@ -4,6 +4,7 @@ import com.skua.modules.dataAnalysis.vo.ArchivesWarnVO; | ... | @@ -4,6 +4,7 @@ import com.skua.modules.dataAnalysis.vo.ArchivesWarnVO; |
4 | import com.skua.modules.dataAnalysis.vo.EquipAlarmVO; | 4 | import com.skua.modules.dataAnalysis.vo.EquipAlarmVO; |
5 | import com.skua.modules.dataAnalysis.vo.EquipRunTimeVO; | 5 | import com.skua.modules.dataAnalysis.vo.EquipRunTimeVO; |
6 | import com.skua.modules.dataAnalysis.vo.EquipWarnVO; | 6 | import com.skua.modules.dataAnalysis.vo.EquipWarnVO; |
7 | import com.skua.tool.annotation.Anonymous; | ||
7 | import org.apache.ibatis.annotations.Param; | 8 | import org.apache.ibatis.annotations.Param; |
8 | 9 | ||
9 | import java.util.List; | 10 | import java.util.List; |
... | @@ -27,6 +28,7 @@ public interface FactoryOperateCenterMapper { | ... | @@ -27,6 +28,7 @@ public interface FactoryOperateCenterMapper { |
27 | List<Map<String, String>> getReportCount(@Param("departId") String departId, @Param("month") String month, | 28 | List<Map<String, String>> getReportCount(@Param("departId") String departId, @Param("month") String month, |
28 | @Param("reportName") String reportName); | 29 | @Param("reportName") String reportName); |
29 | 30 | ||
31 | @Anonymous | ||
30 | Map<String, Object> getSdyData(@Param("view2119") String view2119, @Param("view3a24") String view3a24, | 32 | Map<String, Object> getSdyData(@Param("view2119") String view2119, @Param("view3a24") String view3a24, |
31 | @Param("departId") String departId, @Param("dateTime") String dateTime); | 33 | @Param("departId") String departId, @Param("dateTime") String dateTime); |
32 | } | 34 | } | ... | ... |
... | @@ -158,6 +158,11 @@ public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterSer | ... | @@ -158,6 +158,11 @@ public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterSer |
158 | nclslMap.put("nmbTb", df.format((yearClslMb-yearTbClslMb)/yearClslMb)); | 158 | nclslMap.put("nmbTb", df.format((yearClslMb-yearTbClslMb)/yearClslMb)); |
159 | nclslMap.put("nwcd", df.format(100*yearClsl/yearClslMb)); | 159 | nclslMap.put("nwcd", df.format(100*yearClsl/yearClslMb)); |
160 | nclslMap.put("nwcdTb", "1"); | 160 | nclslMap.put("nwcdTb", "1"); |
161 | if(yearClslMb == 0.00){ | ||
162 | nclslMap.put("wcbfb", "0"); | ||
163 | nclslMap.put("nmbTb", "0"); | ||
164 | nclslMap.put("nwcd", "0"); | ||
165 | } | ||
161 | 166 | ||
162 | map.put("yclsl",new HashMap<>()); | 167 | map.put("yclsl",new HashMap<>()); |
163 | Map<String, Object> yclslMap = new HashMap<>(); | 168 | Map<String, Object> yclslMap = new HashMap<>(); |
... | @@ -167,6 +172,11 @@ public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterSer | ... | @@ -167,6 +172,11 @@ public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterSer |
167 | yclslMap.put("ymbTb", "0"); | 172 | yclslMap.put("ymbTb", "0"); |
168 | yclslMap.put("ywcd", df.format(100*monthClsl/(yearClslMb/12))); | 173 | yclslMap.put("ywcd", df.format(100*monthClsl/(yearClslMb/12))); |
169 | yclslMap.put("ywcdTb", "0"); | 174 | yclslMap.put("ywcdTb", "0"); |
175 | if(yearClslMb == 0.00){ | ||
176 | yclslMap.put("wcbfb", "0"); | ||
177 | yclslMap.put("ymb", "0"); | ||
178 | yclslMap.put("ywcd", "0"); | ||
179 | } | ||
170 | 180 | ||
171 | map.put("ndsdh",new HashMap<>()); | 181 | map.put("ndsdh",new HashMap<>()); |
172 | Map<String, Object> ndsdhMap = new HashMap<>(); | 182 | Map<String, Object> ndsdhMap = new HashMap<>(); | ... | ... |
-
请 注册 或 登录 后发表评论