工资--代码提交

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

@@ -17,6 +17,12 @@ public class SalaryExcelModel implements Serializable {
     //人数
     @ExcelProperty(value = "人数")
     private String personCount;
+
+    private String personNo;
+
+    private String personName;
+
+    private String deptAttr;
     //应付工资
     @ExcelProperty(value = "应付工资")
     private String salary;
@@ -316,4 +322,27 @@ public class SalaryExcelModel implements Serializable {
         this.singleSupplyMedicalInsurance = singleSupplyMedicalInsurance;
     }
 
+    public String getPersonNo() {
+        return personNo;
+    }
+
+    public void setPersonNo(String personNo) {
+        this.personNo = personNo;
+    }
+
+    public String getDeptAttr() {
+        return deptAttr;
+    }
+
+    public void setDeptAttr(String deptAttr) {
+        this.deptAttr = deptAttr;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
 }

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

@@ -25,7 +25,7 @@ public class ImportExpenseSourceServiceImpl implements ImportExpenseSourceServic
     @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("011702"));
+        list.forEach(v->v.setOrgCode("011204"));
         importExpenseSourceMapper.save(list);
         return AjaxResult.success();
     }

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

@@ -43,12 +43,14 @@ public class SalaryCurrentRuleServiceImpl implements SalaryCurrentRuleService {
             String salaryDate = newRuleSalaryRequestModelList.get(0).getWageMonth();
             Function<List<NewRuleRequestModel>, List<SalaryExcelModel>> stringListFunction = CurrentRuleSalarySupport.MINE_MAP.get(mineCode);
             List<SalaryExcelModel> salaryExcelModels = stringListFunction.apply(newRuleSalaryRequestModelList);
-            List<SalaryExpenseSourceModel> sourceModels = salaryMapper.getSources(mineCode);
-            salaryExcelModels.forEach(salary -> sourceModels.forEach(source -> {
-                if (StringUtils.equals(salary.getOrg(), source.getOrg())) {
-                    salary.setSourceExpenses(source.getExpenseSource());
-                }
-            }));
+            if (!StringUtils.equalsAny(mineCode, "010105")) {
+                List<SalaryExpenseSourceModel> sourceModels = salaryMapper.getSources(mineCode);
+                salaryExcelModels.forEach(salary -> sourceModels.forEach(source -> {
+                    if (StringUtils.equals(salary.getOrg(), source.getOrg())) {
+                        salary.setSourceExpenses(source.getExpenseSource());
+                    }
+                }));
+            }
             int count = salaryMapper.exist(mineCode, salaryDate);
             if (count > 0) {
                 List<String> stringList = salaryMapper.selectByDateAndMineCode(salaryDate, mineCode);

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.ruoyi.system.mapper.SalaryMapper">
 
     <insert id="save">
-        INSERT INTO salary (org, person_count, medical_subsidy, sum_salary, old_insurance, annuity,
+        INSERT INTO salary (org, person_count,person_no, person_name,medical_subsidy, sum_salary, old_insurance, annuity,
         single_supply_medical_insurance, medical_insurance, supply_medical_insurance,
         birth_insurance, source_expenses, unemployment_insurance, injury_insurance,
         company_house_fund, house_fund,
@@ -11,7 +11,7 @@
         warm_subsidy, heat_prevent_subsidy, belong_to_coal,salary_date)
         VALUES
         <foreach collection="salaryExcelModelList" item="item" index="index" separator=",">
-            (#{item.org},#{item.personCount},#{item.medicalSubsidy},
+            (#{item.org},#{item.personCount},#{item.personNo},#{item.personName},#{item.medicalSubsidy},
             #{item.sumSalary},#{item.oldInsurance},#{item.annuity},#{item.singleSupplyMedicalInsurance},
             #{item.medicalInsurance},#{item.supplyMedicalInsurance},#{item.birthInsurance},#{item.sourceExpenses},
             #{item.unemploymentInsurance},#{item.injuryInsurance},#{item.companyHouseFund},#{item.houseFund},
@@ -118,6 +118,12 @@
             <if test="personCount!=null and personCount!=''">
                 person_count =#{personCount},
             </if>
+            <if test="personNo!=null and personNo!=''">
+                person_no =#{personNo},
+            </if>
+            <if test="personName!=null and personName!=''">
+                person_name=#{personName},
+            </if>
             <if test="medicalSubsidy!=null and medicalSubsidy!=''">
                 medical_subsidy=#{medicalSubsidy},
             </if>