--代码提交

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("Sheet4").headRowNumber(1).doReadSync();
+        List<PowerImportSourceModel> powerImportSourceModelList = EasyExcelFactory.read(multipartFile.getInputStream(), PowerImportSourceModel.class, new ExcelListener<>()).sheet("Sheet6").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

@@ -296,12 +296,59 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
             if (StringUtils.equals("010105", mineid)) {
                 saveQJYPowerData(newRuleRequestModelList);
             }
+            //单侯
+            if (StringUtils.equals("011204", mineid)) {
+                saveDHPowerData(newRuleRequestModelList);
+            }
+            //宏丰
+            if (StringUtils.equals("011502", mineid)) {
+                savaHFPowerData(newRuleRequestModelList);
+            }
         } else {
             return AjaxResult.error();
         }
         return AjaxResult.success();
     }
 
+    /**
+     * 宏丰
+     *
+     * @param newRuleRequestModelList
+     */
+    private void savaHFPowerData(List<NewRuleRequestModel> newRuleRequestModelList) {
+        String month = newRuleRequestModelList.get(0).getWageMonth();
+        String minId = newRuleRequestModelList.get(0).getMineid();
+        newRuleRequestModelList.forEach(v -> v.setColoumn(v.getColoumn().replaceAll("-", StringUtils.EMPTY)));
+        ReplaceBlank(newRuleRequestModelList);
+        List<PowerDisplayDto> displayDtoList = this.getPowerDisplayDtoList(newRuleRequestModelList);
+        List<PowerSourceModel> powerSourceModelList = powerDisplayMapper.selectSource(minId);
+        List<PowerDisplayDto> collect = displayDtoList.stream().filter(v -> powerSourceModelList.stream().anyMatch(source -> StringUtils.equals(v.getClassificationName(), source.getClassificationName()))).collect(Collectors.toList());
+        List<PowerDisplayDto> totalCollect = displayDtoList.stream().filter(v -> powerSourceModelList.stream().noneMatch(powerSourceModel -> StringUtils.equals(v.getClassificationName(), powerSourceModel.getClassificationName()))).collect(Collectors.toList());
+        Optional<PowerDisplayDto> first = totalCollect.stream().findFirst();
+        BigDecimal unitPrice = first.map(powerDisplayDto -> new BigDecimal(powerDisplayDto.getElectricityTotal()).divide(new BigDecimal(powerDisplayDto.getPowerTotal()), 2, RoundingMode.HALF_UP)).orElse(null);
+        collect.forEach(v -> {
+            assert unitPrice != null;
+            v.setElectricityTotal(String.valueOf(unitPrice.multiply(new BigDecimal(v.getPowerTotal()))));
+        });
+        getPowerSource(month, minId, collect);
+    }
+
+    /**
+     * 单侯
+     *
+     * @param newRuleRequestModelList
+     */
+    private void saveDHPowerData(List<NewRuleRequestModel> newRuleRequestModelList) {
+        String month = newRuleRequestModelList.get(0).getWageMonth();
+        String minId = newRuleRequestModelList.get(0).getMineid();
+        ReplaceBlank(newRuleRequestModelList);
+        List<PowerDisplayDto> displayDtoList = this.getPowerDisplayDtoList(newRuleRequestModelList);
+        List<PowerSourceModel> powerSourceModelList = powerDisplayMapper.selectSource(minId);
+        List<PowerDisplayDto> collect = displayDtoList.stream().filter(v -> powerSourceModelList.stream().anyMatch(powerSourceModel -> StringUtils.equals(v.getClassificationName(), powerSourceModel.getClassificationName()))).collect(Collectors.toList());
+        collect.forEach(v -> v.setElectricityTotal(getAddValue(v)));
+        getPowerSource(month, minId, collect);
+    }
+
     /**
      * 钱家营
      *
@@ -330,7 +377,7 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
         //数据操作
         disposeData(collect);
         disposeList.forEach(v -> v.setElectricityTotal(getAddValue(v)));
-        getPowerSource(month,minId,disposeList);
+        getPowerSource(month, minId, disposeList);
 
     }
 

ruoyi-wages/src/main/java/com/ruoyi/system/support/CurrentRuleSalarySupport.java

 package com.ruoyi.system.support;
 
 
-import com.alibaba.fastjson.JSON;
 import com.ruoyi.system.constant.CoalConstant;
 import com.ruoyi.system.mapper.SalaryMapper;
 import com.ruoyi.system.model.newrule.NewRuleRequestModel;