唐山矿电力--代码提交

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/ImportExpenseSourceServiceImpl.java

@@ -36,7 +36,7 @@ public class ImportExpenseSourceServiceImpl implements ImportExpenseSourceServic
     @Override
     @SneakyThrows
     public AjaxResult save(MultipartFile multipartFile) {
-        List<PowerImportSourceModel> powerImportSourceModelList = EasyExcelFactory.read(multipartFile.getInputStream(), PowerImportSourceModel.class, new ExcelListener<>()).sheet("Sheet6").headRowNumber(1).doReadSync();
+        List<PowerImportSourceModel> powerImportSourceModelList = EasyExcelFactory.read(multipartFile.getInputStream(), PowerImportSourceModel.class, new ExcelListener<>()).sheet("Sheet8").headRowNumber(1).doReadSync();
         powerImportSourceModelList.forEach(v->{
             v.setClassificationName(v.getClassificationName().replaceAll(StringUtils.SPACE,StringUtils.EMPTY));
             v.setLevelOneClassification(v.getLevelOneClassification().replaceAll(StringUtils.SPACE,StringUtils.EMPTY));

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerDisplayServiceImpl.java

 package com.ruoyi.system.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -469,8 +470,8 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
         String minId = newRuleRequestModelList.get(0).getMineid();
         ReplaceBlank(newRuleRequestModelList);
         List<PowerDisplayDto> displayDtoList = this.getPowerDisplayDtoList(newRuleRequestModelList);
-        List<PowerDisplayDto> powerDisplayDtoList = groupData(displayDtoList);
-        getPowerSource(month, minId, powerDisplayDtoList);
+        getTotalValue(displayDtoList);
+        getPowerSource(month, minId, displayDtoList);
     }
 
 
@@ -517,6 +518,17 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
         powerDisplayMapper.insert(collect);
     }
 
+    private void getTotalValue(List<PowerDisplayDto> displayDtoList) {
+        displayDtoList.forEach(v -> {
+            if (StringUtils.isBlank(v.getPowerTotal())) {
+                v.setPowerTotal(getAddValue(v));
+            }
+            if (StringUtils.isBlank(v.getElectricityTotal())) {
+                v.setElectricityTotal(getFeeTotal(v));
+            }
+        });
+    }
+
     private void disposeData(List<PowerDisplayDto> collect) {
         //煤管科
         List<PowerDisplayDto> coalAdminCollect = collect.stream().filter(v -> StringUtils.equalsAny(v.getClassificationName(), "煤管科", "货车队")).collect(Collectors.toList());
@@ -589,6 +601,13 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
         return String.valueOf(Stream.of(motivation, lighting, powerTip, powerPeak, powerFlat, powerValley).reduce(BigDecimal.ZERO, BigDecimal::add));
     }
 
+    private String getFeeTotal(PowerDisplayDto powerDisplayDto) {
+        BigDecimal electricityTip = StringUtils.isBlank(powerDisplayDto.getElectricityTip()) ? new BigDecimal(0) : new BigDecimal(powerDisplayDto.getElectricityTip());
+        BigDecimal electricityPeak = StringUtils.isBlank(powerDisplayDto.getElectricityPeak()) ? new BigDecimal(0) : new BigDecimal(powerDisplayDto.getElectricityPeak());
+        BigDecimal electricityFlat = StringUtils.isBlank(powerDisplayDto.getElectricityFlat()) ? new BigDecimal(0) : new BigDecimal(powerDisplayDto.getElectricityFlat());
+        BigDecimal electricityValley = StringUtils.isBlank(powerDisplayDto.getElectricityValley()) ? new BigDecimal(0) : new BigDecimal(powerDisplayDto.getElectricityValley());
+        return String.valueOf(Stream.of(electricityTip, electricityPeak, electricityFlat, electricityValley).reduce(BigDecimal.ZERO, BigDecimal::add));
+    }
 
     private void getPowerSource(String month, String minId, List<PowerDisplayDto> powerDisplayDtoList) {
         List<PowerSourceModel> powerSourceModelList = powerDisplayMapper.selectSource(minId);