唐山矿代码提交

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

 package com.ruoyi.system.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.model.salary.LxSalaryModel;
 import com.ruoyi.system.service.LxSalaryService;
 import com.ruoyi.system.service.TsSalarySaveService;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,8 +27,8 @@ public class SalaryController {
      * @return
      */
     @PostMapping("/ts/salary")
-    public AjaxResult tsSave(@RequestParam("multipartFile") MultipartFile multipartFile) {
-        return salarySaveService.save(multipartFile);
+    public AjaxResult tsSave(@RequestParam("multipartFile") MultipartFile multipartFile,@RequestParam("salaryDate")String salaryDate) {
+        return salarySaveService.save(multipartFile,salaryDate);
     }
 
     /**
@@ -37,7 +38,7 @@ public class SalaryController {
      * @return
      */
     @PostMapping("/lx/salary")
-    public AjaxResult lxSave(@RequestParam("multipartFile") MultipartFile multipartFile) {
-        return lxSalaryService.lxSave(multipartFile);
+    public AjaxResult lxSave(@RequestParam("multipartFile") MultipartFile multipartFile, @RequestParam("salaryDate")String salaryDate) {
+        return lxSalaryService.lxSave(multipartFile,salaryDate);
     }
 }

ruoyi-wages/src/main/java/com/ruoyi/system/listener/LxExcelListener.java

+package com.ruoyi.system.listener;
+
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.system.model.salary.LxSalaryModel;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LxExcelListener<T> extends AnalysisEventListener<T> {
+
+    private final static Logger logger = LoggerFactory.getLogger(LxExcelListener.class);
+
+    List<LxSalaryModel> lxSalaryModelList = new ArrayList<>();
+
+    private int endRow;
+
+    @Override
+    public void invoke(T t, AnalysisContext analysisContext) {
+        LxSalaryModel lxSalaryModel = (LxSalaryModel) t;
+        if (StringUtils.equals("病亡", lxSalaryModel.getOrg())) {
+            endRow = analysisContext.getCurrentRowNum();
+        }
+        int count = analysisContext.getCurrentRowNum();
+        if (endRow == 0 || (endRow + 1 >= count)) {
+            lxSalaryModelList.add(lxSalaryModel);
+        }
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+        logger.info("解析完成!");
+    }
+
+    public List<LxSalaryModel> getLxSalaryModelList() {
+        return lxSalaryModelList;
+    }
+
+
+}

ruoyi-wages/src/main/java/com/ruoyi/system/listener/TsExcelListener.java

@@ -6,9 +6,10 @@ import com.ruoyi.system.model.salary.SalaryExcelModel;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -16,16 +17,40 @@ import java.util.List;
  */
 public class TsExcelListener<T> extends AnalysisEventListener<T> {
 
-    private final static Logger logger= LoggerFactory.getLogger(TsExcelListener.class);
+    private final static Logger logger = LoggerFactory.getLogger(TsExcelListener.class);
 
     private int endRow;
 
+    private int FINAL_FLAG = 0;
+
     List<SalaryExcelModel> salaryExcelModelList = new ArrayList<>();
 
+    public final static Map<Integer, String> SOURCE_EXPENSES_MAP = new HashMap<>();
+
+    static {
+        SOURCE_EXPENSES_MAP.put(3, "基本生产原煤");
+        SOURCE_EXPENSES_MAP.put(4, "基本生产洗煤");
+        SOURCE_EXPENSES_MAP.put(5, "制造费原煤");
+        SOURCE_EXPENSES_MAP.put(6, "制造费洗煤");
+        SOURCE_EXPENSES_MAP.put(7, "劳保费用");
+        SOURCE_EXPENSES_MAP.put(8, "管理费用");
+        SOURCE_EXPENSES_MAP.put(9, "其他业务支出");
+        SOURCE_EXPENSES_MAP.put(10, "研发费用");
+    }
+
     @Override
     public void invoke(T t, AnalysisContext analysisContext) {
         SalaryExcelModel salaryExcelModel = (SalaryExcelModel) t;
-        if (StringUtils.equals("汇总合计", salaryExcelModel.getProjectName())) {
+        int flag = getSourceExpense(salaryExcelModel);
+        salaryExcelModel.setSourceExpenses(SOURCE_EXPENSES_MAP.get(flag));
+        //金属厂的费用来源填写金属厂
+        if (StringUtils.contains(salaryExcelModel.getOrg(), "金属厂")) {
+            salaryExcelModel.setSourceExpenses("金属厂");
+        }
+        if (StringUtils.containsAny(salaryExcelModel.getOrg(), "合计", "汇总")) {
+            salaryExcelModel.setSourceExpenses(StringUtils.EMPTY);
+        }
+        if (StringUtils.equals("汇总合计", salaryExcelModel.getOrg())) {
             endRow = analysisContext.getCurrentRowNum();
         }
         int count = analysisContext.getCurrentRowNum();
@@ -34,6 +59,7 @@ public class TsExcelListener<T> extends AnalysisEventListener<T> {
         }
     }
 
+
     @Override
     public void doAfterAllAnalysed(AnalysisContext analysisContext) {
         logger.info("解析完成!");
@@ -42,4 +68,15 @@ public class TsExcelListener<T> extends AnalysisEventListener<T> {
     public List<SalaryExcelModel> getSalaryExcelModelList() {
         return salaryExcelModelList;
     }
+
+
+    private int getSourceExpense(SalaryExcelModel salaryExcelModel) {
+        String org = salaryExcelModel.getOrg();
+        List<Integer> collect = SOURCE_EXPENSES_MAP.entrySet().stream().filter(v -> StringUtils.contains(org, v.getValue())).map(Map.Entry::getKey).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(collect)) {
+            FINAL_FLAG = collect.get(0);
+        }
+        return FINAL_FLAG;
+    }
+
 }

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

@@ -12,4 +12,5 @@ public interface SalaryMapper {
      * @param salaryExcelModelList
      */
     void save(@Param("salaryExcelModelList") List<SalaryExcelModel> salaryExcelModelList);
+
 }

ruoyi-wages/src/main/java/com/ruoyi/system/model/salary/LxSalaryModel.java

+package com.ruoyi.system.model.salary;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import java.io.Serializable;
+
+public class LxSalaryModel implements Serializable {
+    //部门名称
+    @ExcelProperty(value = "部门名称")
+    private String org;
+    //人数
+    @ExcelProperty(value = "人数")
+    private String personCount;
+    //工资合计
+    @ExcelProperty(value = "工资合计")
+    private String sumSalary;
+    //班中餐
+    @ExcelProperty(value = "班中餐")
+    private String lunch;
+    //一孩保健
+    @ExcelProperty(value = "一孩保健")
+    private String oneChild;
+    //荣誉金
+    @ExcelProperty(value = "荣誉金")
+    private String honorMoney;
+    //降温防暑费
+    @ExcelProperty(value = "降温防暑费")
+    private String heatPreventSubsidy;
+
+    public String getOrg() {
+        return org;
+    }
+
+    public void setOrg(String org) {
+        this.org = org;
+    }
+
+    public String getPersonCount() {
+        return personCount;
+    }
+
+    public void setPersonCount(String personCount) {
+        this.personCount = personCount;
+    }
+
+    public String getSumSalary() {
+        return sumSalary;
+    }
+
+    public void setSumSalary(String sumSalary) {
+        this.sumSalary = sumSalary;
+    }
+
+    public String getLunch() {
+        return lunch;
+    }
+
+    public void setLunch(String lunch) {
+        this.lunch = lunch;
+    }
+
+    public String getOneChild() {
+        return oneChild;
+    }
+
+    public void setOneChild(String oneChild) {
+        this.oneChild = oneChild;
+    }
+
+    public String getHonorMoney() {
+        return honorMoney;
+    }
+
+    public void setHonorMoney(String honorMoney) {
+        this.honorMoney = honorMoney;
+    }
+
+    public String getHeatPreventSubsidy() {
+        return heatPreventSubsidy;
+    }
+
+    public void setHeatPreventSubsidy(String heatPreventSubsidy) {
+        this.heatPreventSubsidy = heatPreventSubsidy;
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/model/salary/SalaryExcelModel.java

 package com.ruoyi.system.model.salary;
 
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 
 
 import java.io.Serializable;
-
+@ExcelIgnoreUnannotated
 public class SalaryExcelModel implements Serializable {
 
     private Integer id;
     //项目
     @ExcelProperty(value = "项目")
-    private String projectName;
+    private String org;
     //人数
     @ExcelProperty(value = "人数")
-    private Integer personCount;
+    private String personCount;
     //应付工资
     @ExcelProperty(value = "应付工资")
     private String salary;
     //医疗补贴
-    @ExcelProperty(value = "医疗补贴")
+    @ExcelProperty(value = "应付工资2(医疗补贴)")
     private String medicalSubsidy;
     //应付工资合计
     @ExcelProperty(value = "应付工资合计")
@@ -86,19 +87,21 @@ public class SalaryExcelModel implements Serializable {
 
     private String modify;
 
-    public String getProjectName() {
-        return projectName;
+    private String salaryDate;
+
+    public String getOrg() {
+        return org;
     }
 
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
+    public void setOrg(String org) {
+        this.org = org;
     }
 
-    public Integer getPersonCount() {
+    public String getPersonCount() {
         return personCount;
     }
 
-    public void setPersonCount(Integer personCount) {
+    public void setPersonCount(String personCount) {
         this.personCount = personCount;
     }
 
@@ -301,4 +304,12 @@ public class SalaryExcelModel implements Serializable {
     public void setModify(String modify) {
         this.modify = modify;
     }
+
+    public String getSalaryDate() {
+        return salaryDate;
+    }
+
+    public void setSalaryDate(String salaryDate) {
+        this.salaryDate = salaryDate;
+    }
 }

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

@@ -4,5 +4,5 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import org.springframework.web.multipart.MultipartFile;
 
 public interface LxSalaryService {
-    AjaxResult lxSave(MultipartFile multipartFile);
+    AjaxResult lxSave(MultipartFile multipartFile, String salaryDate);
 }

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

@@ -5,5 +5,5 @@ import org.springframework.web.multipart.MultipartFile;
 
 public interface TsSalarySaveService {
 
-    AjaxResult save(MultipartFile multipartFile);
+    AjaxResult save(MultipartFile multipartFile, String salaryDate);
 }

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

 package com.ruoyi.system.service.impl;
 
+import com.alibaba.excel.EasyExcel;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.listener.LxExcelListener;
+import com.ruoyi.system.mapper.SalaryMapper;
+import com.ruoyi.system.model.salary.LxSalaryModel;
+import com.ruoyi.system.model.salary.SalaryExcelModel;
 import com.ruoyi.system.service.LxSalaryService;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 public class LxSalaryServiceImpl implements LxSalaryService {
+
+    private final SalaryMapper salaryMapper;
+
+    public LxSalaryServiceImpl(SalaryMapper salaryMapper) {
+        this.salaryMapper = salaryMapper;
+    }
+
     @Override
-    public AjaxResult lxSave(MultipartFile multipartFile) {
-        return null;
+    @SneakyThrows
+    public AjaxResult lxSave(MultipartFile multipartFile, String salaryDate) {
+        String originalFilename = multipartFile.getOriginalFilename();
+        InputStream inputStream = multipartFile.getInputStream();
+        //传入工资表
+        if (StringUtils.contains(originalFilename, "工资")) {
+            LxExcelListener<LxSalaryModel> lxExcelListener = new LxExcelListener<>();
+            EasyExcel.read(inputStream, LxSalaryModel.class, lxExcelListener).sheet(1).headRowNumber(2).doRead();
+            List<LxSalaryModel> lxSalaryModelList = lxExcelListener.getLxSalaryModelList();
+            List<SalaryExcelModel> salaryExcelModelList = getSalaryExcelModelList(lxSalaryModelList).stream().peek(v->{
+                v.setBelongToCoal("011704");
+                v.setSalaryDate(salaryDate);
+            }).collect(Collectors.toList());
+            salaryMapper.save(salaryExcelModelList);
+        }
+        //传入社会保险缴费表
+        if(StringUtils.equals("保险",originalFilename)){
+
+        }
+
+
+        return AjaxResult.success("保存成功!");
+    }
+
+    private List<SalaryExcelModel> getSalaryExcelModelList(List<LxSalaryModel> lxSalaryModelList) {
+        List<SalaryExcelModel> salaryExcelModelList = new ArrayList<>();
+        for (LxSalaryModel lxSalaryModel : lxSalaryModelList) {
+            SalaryExcelModel salaryExcelModel = new SalaryExcelModel();
+            salaryExcelModel.setOrg(lxSalaryModel.getOrg());
+            salaryExcelModel.setPersonCount(lxSalaryModel.getPersonCount());
+            salaryExcelModel.setSumSalary(lxSalaryModel.getSumSalary());
+            salaryExcelModel.setLunch(lxSalaryModel.getLunch());
+            salaryExcelModel.setOneChild(lxSalaryModel.getOneChild());
+            salaryExcelModel.setHonorMoney(lxSalaryModel.getHonorMoney());
+            salaryExcelModel.setHeatPreventSubsidy(lxSalaryModel.getHeatPreventSubsidy());
+            salaryExcelModelList.add(salaryExcelModel);
+        }
+        return salaryExcelModelList;
     }
 }

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

@@ -21,7 +21,7 @@ import java.util.stream.Stream;
 @Service
 public class TsSalarySaveServiceImpl implements TsSalarySaveService {
 
-    private final static Set<String> COST_CHANNEL_SET = Stream.of("基本生产原煤", "基本生产洗煤", "制造费用原煤", "制造费用洗煤", "选混煤", "其他业务成本", "其他应付款", "管理费用", "销售费用", "其他业务支出").collect(Collectors.toSet());
+    public final static Set<String> COST_CHANNEL_SET = Stream.of("基本生产原煤", "基本生产洗煤", "制造费用原煤", "制造费用洗煤", "选混煤", "其他业务成本", "其他应付款", "管理费用", "销售费用", "其他业务支出").collect(Collectors.toSet());
 
     private final SalaryMapper salaryMapper;
 
@@ -31,22 +31,23 @@ public class TsSalarySaveServiceImpl implements TsSalarySaveService {
 
     @Override
     @SneakyThrows
-    public AjaxResult save(MultipartFile multipartFile) {
+    public AjaxResult save(MultipartFile multipartFile, String salaryDate) {
         InputStream inputStream = multipartFile.getInputStream();
         TsExcelListener<SalaryExcelModel> tsExcelListener = new TsExcelListener<>();
         EasyExcel.read(inputStream, SalaryExcelModel.class, tsExcelListener).sheet(0).headRowNumber(3).doRead();
         List<SalaryExcelModel> salaryExcelModelList = tsExcelListener.getSalaryExcelModelList().stream().map(project -> {
-            if (StringUtils.isNotBlank(project.getProjectName())) {
-                project.setProjectName(project.getProjectName().replaceAll("[0-9\\p{Punct}]", StringUtils.EMPTY));
+            if (StringUtils.isNotBlank(project.getOrg())) {
+                project.setOrg(project.getOrg().replaceAll("[.、0-9（）()]", StringUtils.EMPTY));
             }
             project.setBelongToCoal("010101");
+            project.setSalaryDate(salaryDate);
 //            project.setCreator(SecurityUtils.getLoginUser().getUsername());
 //            project.setModify(SecurityUtils.getLoginUser().getUsername());
             return project;
         }).collect(Collectors.toList());
-        List<SalaryExcelModel> list=salaryExcelModelList.stream().filter(v-> !COST_CHANNEL_SET.contains(v.getProjectName())).filter(v->StringUtils.isNotBlank(v.getProjectName())).collect(Collectors.toList());
+        List<SalaryExcelModel> list=salaryExcelModelList.stream().filter(v-> !COST_CHANNEL_SET.contains(v.getOrg())).filter(v->StringUtils.isNotBlank(v.getOrg())).collect(Collectors.toList());
         salaryMapper.save(list);
-        return AjaxResult.success("保存成功!", salaryExcelModelList);
+        return AjaxResult.success("保存成功!");
     }
 
 }

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

@@ -8,15 +8,15 @@
         birth_insurance, source_expenses, unemployment_insurance, injury_insurance,
         company_house_fund, house_fund,
         labor_union_dues, edu_fees, one_child, long_account_insurance, lunch, honor_money,
-        warm_subsidy, heat_prevent_subsidy, belong_to_coal)
+        warm_subsidy, heat_prevent_subsidy, belong_to_coal,salary_date)
         VALUES
         <foreach collection="salaryExcelModelList" item="item" index="index" separator=",">
-            (#{item.projectName},#{item.personCount},#{item.medicalSubsidy},
+            (#{item.org},#{item.personCount},#{item.medicalSubsidy},
             #{item.sumSalary},#{item.oldInsurance},#{item.annuity},#{item.supplyMedicalInsurance},
             #{item.medicalInsurance},#{item.supplyMedicalInsurance},#{item.birthInsurance},#{item.sourceExpenses},
             #{item.unemploymentInsurance},#{item.injuryInsurance},#{item.companyHouseFund},#{item.houseFund},
             #{item.laborUnionDues},#{item.edufFees},#{item.oneChild},#{item.longAccountInsurance},#{item.lunch},
-            #{item.honorMoney},#{item.warmSubsidy},#{item.heatPreventSubsidy},#{item.belongToCoal})
+            #{item.honorMoney},#{item.warmSubsidy},#{item.heatPreventSubsidy},#{item.belongToCoal},#{item.salaryDate})
         </foreach>
 
     </insert>