Merge remote-tracking branch 'origin/master'

ruoyi-wages/src/main/java/com/ruoyi/system/constant/CoalConstant.java

@@ -39,8 +39,17 @@ public class CoalConstant {
      * 云飞
      */
     public final static String YF_MINE = "011504";
+    /**
+     * 中润
+     */
+    public final static String ZR_MINE = "011706";
+    /**
+     * 中浩
+     */
+    public static final String ZH_MINE = "011708";
 
     public final static String ONE = "1";
 
     public final static String ZERO = "0";
+
 }

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

@@ -27,8 +27,8 @@ public class ImportExpenseSourceServiceImpl implements ImportExpenseSourceServic
     @Override
     @SneakyThrows
     public AjaxResult expenseSource(MultipartFile multipartFile) {
-        List<SalaryExpenseSourceModel> list = EasyExcelFactory.read(multipartFile.getInputStream(), SalaryExpenseSourceModel.class, new ExcelListener<>()).sheet("Sheet1").headRowNumber(1).doReadSync();
-        list.forEach(v -> v.setOrgCode("011704"));
+        List<SalaryExpenseSourceModel> list = EasyExcelFactory.read(multipartFile.getInputStream(), SalaryExpenseSourceModel.class, new ExcelListener<>()).sheet("Sheet7").headRowNumber(1).doReadSync();
+        list.forEach(v -> v.setOrgCode("011706"));
         importExpenseSourceMapper.save(list);
         return AjaxResult.success();
     }
@@ -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.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -469,8 +468,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 +516,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 +599,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);

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

 package com.ruoyi.system.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.domain.AjaxResult;
 
 
@@ -51,6 +52,7 @@ public class SalaryCurrentRuleServiceImpl implements SalaryCurrentRuleService {
                     }
                 }));
             }
+            System.err.println(JSON.toJSONString(salaryExcelModels));
             int count = salaryMapper.exist(mineCode, salaryDate);
             if (count > 0) {
                 List<String> stringList = salaryMapper.selectByDateAndMineCode(salaryDate, mineCode);
@@ -65,7 +67,7 @@ public class SalaryCurrentRuleServiceImpl implements SalaryCurrentRuleService {
                     }
                 }
             } else {
-                salaryMapper.save(salaryExcelModels);
+               salaryMapper.save(salaryExcelModels);
             }
         });
         stopWatch.stop();

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

@@ -6,6 +6,7 @@ import com.ruoyi.system.mapper.SalaryMapper;
 import com.ruoyi.system.model.newrule.NewRuleRequestModel;
 import com.ruoyi.system.model.salary.ConfigModel;
 import com.ruoyi.system.model.salary.SalaryExcelModel;
+import com.ruoyi.system.model.salary.SalaryExpenseSourceModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -34,6 +35,8 @@ public class CurrentRuleSalarySupport {
         MINE_MAP.put(CoalConstant.HF_MINE, CurrentRuleSalarySupport::getHfMineSalaryData);
         MINE_MAP.put(CoalConstant.QJY_MINE, CurrentRuleSalarySupport::getQjyMineSalaryData);
         MINE_MAP.put(CoalConstant.YF_MINE, CurrentRuleSalarySupport::getYfMineSalaryData);
+        MINE_MAP.put(CoalConstant.ZR_MINE, CurrentRuleSalarySupport::getZrMineSalaryData);
+        MINE_MAP.put(CoalConstant.ZH_MINE, CurrentRuleSalarySupport::getZhMineSalaryData);
     }
 
 
@@ -44,6 +47,39 @@ public class CurrentRuleSalarySupport {
         CurrentRuleSalarySupport.salaryMapper = salaryMapper;
     }
 
+    /**
+     * 中浩
+     *
+     * @param newRuleRequestModelList
+     * @return
+     */
+    private static List<SalaryExcelModel> getZhMineSalaryData(List<NewRuleRequestModel> newRuleRequestModelList) {
+        String mineCode = newRuleRequestModelList.get(0).getMineid();
+        ReplaceSpace(newRuleRequestModelList);
+        List<SalaryExpenseSourceModel> sourceModels = salaryMapper.getSources(mineCode);
+        newRuleRequestModelList = newRuleRequestModelList.stream().filter(v -> sourceModels.stream().anyMatch(source -> StringUtils.equals(v.getRow(), source.getOrg()))).collect(Collectors.toList());
+        List<SalaryExcelModel> salaryExcelModelList = getSalaryMapping(newRuleRequestModelList);
+        salaryExcelModelList.forEach(v -> v.setSumSalary(new BigDecimal(v.getSumSalary()).toPlainString()));
+        return salaryExcelModelList;
+    }
+
+    /**
+     * 中润
+     *
+     * @param newRuleRequestModelList
+     * @return
+     */
+    private static List<SalaryExcelModel> getZrMineSalaryData(List<NewRuleRequestModel> newRuleRequestModelList) {
+        String mineCode = newRuleRequestModelList.get(0).getMineid();
+        ReplaceSpace(newRuleRequestModelList);
+        ReplaceBracket(newRuleRequestModelList);
+        List<SalaryExpenseSourceModel> sourceModels = salaryMapper.getSources(mineCode);
+        List<NewRuleRequestModel> collect = newRuleRequestModelList.stream().filter(v -> sourceModels.stream().noneMatch(source -> StringUtils.equals(v.getRow(), source.getExpenseSource()))).collect(Collectors.toList());
+        collect = collect.stream().filter(v -> sourceModels.stream().anyMatch(source -> StringUtils.equals(v.getRow(), source.getOrg()))).collect(Collectors.toList());
+        return getSalaryMapping(collect);
+
+    }
+
 
     /**
      * 云飞
@@ -115,6 +151,7 @@ public class CurrentRuleSalarySupport {
      */
 
     private static List<SalaryExcelModel> getLjtMineSalaryData(List<NewRuleRequestModel> newRuleSalaryRequestModelList) {
+        ReplaceSpace(newRuleSalaryRequestModelList);
         return getSalaryMapping(newRuleSalaryRequestModelList);
     }
 
@@ -125,14 +162,7 @@ public class CurrentRuleSalarySupport {
      * @return
      */
     private static List<SalaryExcelModel> getLxMineSalaryData(List<NewRuleRequestModel> newRuleSalaryRequestModelList) {
-        newRuleSalaryRequestModelList = newRuleSalaryRequestModelList.stream().map(v -> {
-            v.setColoumn(v.getColoumn().replaceAll(StringUtils.SPACE, StringUtils.EMPTY));
-            v.setRow(v.getRow().replaceAll(StringUtils.SPACE, StringUtils.EMPTY));
-            v.setMineid(v.getMineid().replaceAll(StringUtils.SPACE, StringUtils.EMPTY));
-            v.setValue(v.getValue().replaceAll(StringUtils.SPACE, StringUtils.EMPTY));
-            v.setWageMonth(v.getWageMonth().replaceAll(StringUtils.SPACE, StringUtils.EMPTY));
-            return v;
-        }).collect(Collectors.toList());
+        ReplaceSpace(newRuleSalaryRequestModelList);
         List<SalaryExcelModel> salaryExcelModelList = getSalaryMapping(newRuleSalaryRequestModelList);
         salaryExcelModelList.forEach(v -> {
             if (StringUtils.isNotBlank(v.getSumSalary())) {
@@ -144,6 +174,7 @@ public class CurrentRuleSalarySupport {
         return salaryExcelModelList.stream().filter(v -> !StringUtils.containsAny(v.getOrg(), "小计", "总计", "合计")).collect(Collectors.toList());
     }
 
+
     /**
      * 东欢坨矿
      *
@@ -151,6 +182,7 @@ public class CurrentRuleSalarySupport {
      * @return
      */
     private static List<SalaryExcelModel> getDhtMineSalaryData(List<NewRuleRequestModel> newRuleSalaryRequestModelList) {
+        ReplaceSpace(newRuleSalaryRequestModelList);
         return getSalaryMapping(newRuleSalaryRequestModelList);
     }
 
@@ -225,6 +257,7 @@ public class CurrentRuleSalarySupport {
                         }
                     }
                 }
+                salaryExcelModel.setOrg(newRuleRequestModel.getRow());
                 salaryExcelModel.setBelongToCoal(newRuleRequestModel.getMineid());
                 salaryExcelModel.setSalaryDate(newRuleRequestModel.getWageMonth());
             }
@@ -264,4 +297,19 @@ public class CurrentRuleSalarySupport {
         BigDecimal multiply = new BigDecimal(sumSalary).multiply(new BigDecimal(coefficient));
         return multiply.setScale(2, RoundingMode.HALF_UP).toString();
     }
+
+    private static void ReplaceSpace(List<NewRuleRequestModel> newRuleSalaryRequestModelList) {
+        newRuleSalaryRequestModelList.forEach(v -> {
+            v.setColoumn(v.getColoumn().replaceAll(StringUtils.SPACE, StringUtils.EMPTY));
+            v.setRow(v.getRow().replaceAll(StringUtils.SPACE, StringUtils.EMPTY));
+            v.setMineid(v.getMineid().replaceAll(StringUtils.SPACE, StringUtils.EMPTY));
+            v.setValue(v.getValue().replaceAll(StringUtils.SPACE, StringUtils.EMPTY));
+            v.setWageMonth(v.getWageMonth().replaceAll(StringUtils.SPACE, StringUtils.EMPTY));
+        });
+    }
+
+    private static void ReplaceBracket(List<NewRuleRequestModel> newRuleRequestModelList) {
+        newRuleRequestModelList.forEach(v -> v.setRow(v.getRow().replaceAll("其中：", StringUtils.EMPTY)));
+    }
+
 }