中润工资--代码提交

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;
@@ -54,12 +54,12 @@ public class CurrentRuleSalarySupport {
      * @return
      */
     private static List<SalaryExcelModel> getZrMineSalaryData(List<NewRuleRequestModel> newRuleRequestModelList) {
-        String mineCode=newRuleRequestModelList.get(0).getMineid();
+        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());
+        collect = collect.stream().filter(v -> sourceModels.stream().anyMatch(source -> StringUtils.equals(v.getRow(), source.getOrg()))).collect(Collectors.toList());
         return getSalaryMapping(collect);
 
     }
@@ -291,8 +291,9 @@ public class CurrentRuleSalarySupport {
             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)));
+        newRuleRequestModelList.forEach(v -> v.setRow(v.getRow().replaceAll("其中：", StringUtils.EMPTY)));
     }
 
 }