--代码提交

ruoyi-wages/src/main/java/com/ruoyi/system/controller/ImportExpenseSourceController.java

@@ -21,4 +21,9 @@ public class ImportExpenseSourceController {
     public AjaxResult expenseSource(@RequestParam("multipartFile")MultipartFile multipartFile) {
         return importExpenseSourceService.expenseSource(multipartFile);
     }
+
+    @PostMapping("/power/source")
+    public AjaxResult powerSource(@RequestParam("multipartFile")MultipartFile multipartFile) {
+        return importExpenseSourceService.save(multipartFile);
+    }
 }

ruoyi-wages/src/main/java/com/ruoyi/system/mapper/ImportExpenseSourceMapper.java

 package com.ruoyi.system.mapper;
 
+import com.ruoyi.system.model.power.PowerImportSourceModel;
 import com.ruoyi.system.model.salary.SalaryExpenseSourceModel;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
@@ -9,4 +10,6 @@ import java.util.List;
 
 public interface ImportExpenseSourceMapper {
     void save(@Param("list") List<SalaryExpenseSourceModel> list);
+
+    void saveSource(@Param("powerImportSourceModelList") List<PowerImportSourceModel> powerImportSourceModelList);
 }

ruoyi-wages/src/main/java/com/ruoyi/system/model/power/PowerImportSourceModel.java

+package com.ruoyi.system.model.power;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import java.io.Serializable;
+
+public class PowerImportSourceModel implements Serializable {
+
+    @ExcelProperty("一级分类")
+    private String levelOneClassification;
+
+    @ExcelProperty("项目名")
+    private String classificationName;
+
+    @ExcelProperty("矿id")
+    private String mineId;
+
+    @ExcelProperty("是否启用")
+    private String whetherItIsEnabled;
+
+    public String getLevelOneClassification() {
+        return levelOneClassification;
+    }
+
+    public void setLevelOneClassification(String levelOneClassification) {
+        this.levelOneClassification = levelOneClassification;
+    }
+
+    public String getClassificationName() {
+        return classificationName;
+    }
+
+    public void setClassificationName(String classificationName) {
+        this.classificationName = classificationName;
+    }
+
+    public String getMineId() {
+        return mineId;
+    }
+
+    public void setMineId(String mineId) {
+        this.mineId = mineId;
+    }
+
+    public String getWhetherItIsEnabled() {
+        return whetherItIsEnabled;
+    }
+
+    public void setWhetherItIsEnabled(String whetherItIsEnabled) {
+        this.whetherItIsEnabled = whetherItIsEnabled;
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/service/ImportExpenseSourceService.java

@@ -5,4 +5,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 public interface ImportExpenseSourceService {
     AjaxResult expenseSource(MultipartFile multipartFile);
+
+    AjaxResult save(MultipartFile multipartFile);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcelFactory;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.listener.ExcelListener;
 import com.ruoyi.system.mapper.ImportExpenseSourceMapper;
+import com.ruoyi.system.model.power.PowerImportSourceModel;
 import com.ruoyi.system.model.salary.SalaryExpenseSourceModel;
 import com.ruoyi.system.service.ImportExpenseSourceService;
 import lombok.SneakyThrows;
@@ -24,9 +25,17 @@ 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("Sheet1").headRowNumber(1).doReadSync();
+        list.forEach(v -> v.setOrgCode("011704"));
         importExpenseSourceMapper.save(list);
         return AjaxResult.success();
     }
+
+    @Override
+    @SneakyThrows
+    public AjaxResult save(MultipartFile multipartFile) {
+        List<PowerImportSourceModel> powerImportSourceModelList = EasyExcelFactory.read(multipartFile.getInputStream(), PowerImportSourceModel.class, new ExcelListener<>()).sheet("Sheet1").headRowNumber(1).doReadSync();
+        importExpenseSourceMapper.saveSource(powerImportSourceModelList);
+        return AjaxResult.success();
+    }
 }

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;
@@ -142,7 +143,6 @@ public class CurrentRuleSalarySupport {
             }
         });
         return salaryExcelModelList.stream().filter(v -> !StringUtils.containsAny(v.getOrg(), "小计", "总计", "合计")).collect(Collectors.toList());
-
     }
 
     /**
@@ -240,21 +240,25 @@ public class CurrentRuleSalarySupport {
     private static String getQJYSource(SalaryExcelModel salaryExcelModel) {
         String deptAttr = salaryExcelModel.getDeptAttr();
         String org = salaryExcelModel.getOrg();
-        if (StringUtils.equals("机关", deptAttr) && StringUtils.equals("洗煤厂", org)) {
+        if (StringUtils.equals("机关", deptAttr) && !StringUtils.equals("洗煤厂", org)) {
             return "管理费用-管理费";
-        } else if (StringUtils.equals("洗煤厂", org)) {
-            return "基本生产-洗煤";
-        } else if (StringUtils.containsAny(org, "后勤", "宾馆")) {
-            return "制造费用-原煤";
-        } else if (StringUtils.containsAny(org, "人资")) {
-            return "管理费用-劳动保险费";
-        } else if (StringUtils.contains(org, "研发")) {
-            return "研发入相应工资";
-        } else if (StringUtils.contains(org, "兴隆洗煤厂")) {
-            return "管理费用-管理费（部门-兴隆洗煤厂）";
-        } else {
-            return "基本生产-原煤";
         }
+        if (!StringUtils.equals("机关", deptAttr)) {
+            if (StringUtils.equals("洗煤厂", org)) {
+                return "基本生产-洗煤";
+            } else if (StringUtils.containsAny(org, "后勤", "宾馆")) {
+                return "制造费用-原煤";
+            } else if (StringUtils.containsAny(org, "人资")) {
+                return "管理费用-劳动保险费";
+            } else if (StringUtils.contains(org, "研发")) {
+                return "研发入相应工资";
+            } else if (StringUtils.contains(org, "兴隆洗煤厂")) {
+                return "管理费用-管理费（部门-兴隆洗煤厂）";
+            } else {
+                return "基本生产-原煤";
+            }
+        }
+        return StringUtils.EMPTY;
     }
 
     public static String getBigDecimalData(String sumSalary, String coefficient) {

ruoyi-wages/src/main/resources/mapper/system/ImportExpenseSourceMapper.xml

@@ -8,4 +8,12 @@
             (#{item.org},#{item.expenseSource},#{item.orgCode})
         </foreach>
     </insert>
+    <insert id="saveSource">
+        INSERT INTO power_classification_query (level_one_classification,classification_name,mind_id,whether_it_is_enabled)
+        values
+        <foreach collection="powerImportSourceModelList" item="item" index="index" separator=",">
+            (#{item.levelOneClassification},#{item.classificationName},#{item.mineId},#{item.whetherItIsEnabled})
+        </foreach>
+
+    </insert>
 </mapper>
\ No newline at end of file