修改实体类

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

 package com.ruoyi.system.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO;
 import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO;
 import com.ruoyi.system.service.WagesService;
 import org.slf4j.Logger;
@@ -34,10 +35,16 @@ public class WagesController {
         return new AjaxResult(200, s);
     }
 
-    @PostMapping("/salaries")
+    @PostMapping("/overview")
     public List<WagesOverviewOriginalDataVO> salaries() {
-        logger.info("salaries");
+        logger.info("overview");
         List<WagesOverviewOriginalDataVO> salaryList = wagesService.getSalaryList();
         return salaryList;
     }
+
+    @RequestMapping("/details")
+    public List<WagesDetailsOriginalExcelDAO> test(){
+        List<WagesDetailsOriginalExcelDAO> list = wagesService.details();
+        return list;
+    }
 }

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

@@ -19,4 +19,6 @@ public interface WagesMapper {
     void insertWagesOverviewOriginal(@Param("accList") List<WagesOverviewOriginalExcelDAO> wagesOveList);
 
     List<WagesOverviewOriginalDataVO> queryList();
+
+    List<WagesDetailsOriginalExcelDAO> detailsSelect();
 }

ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/dao/WagesDetailsOriginalExcelDAO.java

@@ -97,6 +97,326 @@ public class WagesDetailsOriginalExcelDAO {
         this.id = id;
     }
 
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getMonth() {
+        return month;
+    }
+
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public Integer getPeopleCount() {
+        return peopleCount;
+    }
+
+    public void setPeopleCount(Integer peopleCount) {
+        this.peopleCount = peopleCount;
+    }
+
+    public BigDecimal getWagesPayable() {
+        return wagesPayable;
+    }
+
+    public void setWagesPayable(BigDecimal wagesPayable) {
+        this.wagesPayable = wagesPayable;
+    }
+
+    public BigDecimal getHouseRent() {
+        return houseRent;
+    }
+
+    public void setHouseRent(BigDecimal houseRent) {
+        this.houseRent = houseRent;
+    }
+
+    public BigDecimal getAccommodation() {
+        return accommodation;
+    }
+
+    public void setAccommodation(BigDecimal accommodation) {
+        this.accommodation = accommodation;
+    }
+
+    public BigDecimal getHeatingFee() {
+        return heatingFee;
+    }
+
+    public void setHeatingFee(BigDecimal heatingFee) {
+        this.heatingFee = heatingFee;
+    }
+
+    public BigDecimal getTradeUnionDues() {
+        return tradeUnionDues;
+    }
+
+    public void setTradeUnionDues(BigDecimal tradeUnionDues) {
+        this.tradeUnionDues = tradeUnionDues;
+    }
+
+    public BigDecimal getCompensationDeduction() {
+        return compensationDeduction;
+    }
+
+    public void setCompensationDeduction(BigDecimal compensationDeduction) {
+        this.compensationDeduction = compensationDeduction;
+    }
+
+    public BigDecimal getOtherDeductions() {
+        return otherDeductions;
+    }
+
+    public void setOtherDeductions(BigDecimal otherDeductions) {
+        this.otherDeductions = otherDeductions;
+    }
+
+    public BigDecimal getMutualMedicalAid() {
+        return mutualMedicalAid;
+    }
+
+    public void setMutualMedicalAid(BigDecimal mutualMedicalAid) {
+        this.mutualMedicalAid = mutualMedicalAid;
+    }
+
+    public BigDecimal getCommunicationFee() {
+        return communicationFee;
+    }
+
+    public void setCommunicationFee(BigDecimal communicationFee) {
+        this.communicationFee = communicationFee;
+    }
+
+    public BigDecimal getTax1() {
+        return tax1;
+    }
+
+    public void setTax1(BigDecimal tax1) {
+        this.tax1 = tax1;
+    }
+
+    public BigDecimal getTax2() {
+        return tax2;
+    }
+
+    public void setTax2(BigDecimal tax2) {
+        this.tax2 = tax2;
+    }
+
+    public BigDecimal getPensionInsurance() {
+        return pensionInsurance;
+    }
+
+    public void setPensionInsurance(BigDecimal pensionInsurance) {
+        this.pensionInsurance = pensionInsurance;
+    }
+
+    public BigDecimal getUnemploymentInsurance() {
+        return unemploymentInsurance;
+    }
+
+    public void setUnemploymentInsurance(BigDecimal unemploymentInsurance) {
+        this.unemploymentInsurance = unemploymentInsurance;
+    }
+
+    public BigDecimal getMedicalInsurance() {
+        return medicalInsurance;
+    }
+
+    public void setMedicalInsurance(BigDecimal medicalInsurance) {
+        this.medicalInsurance = medicalInsurance;
+    }
+
+    public BigDecimal getAnnuity() {
+        return annuity;
+    }
+
+    public void setAnnuity(BigDecimal annuity) {
+        this.annuity = annuity;
+    }
+
+    public BigDecimal getHousingProvidentFund() {
+        return housingProvidentFund;
+    }
+
+    public void setHousingProvidentFund(BigDecimal housingProvidentFund) {
+        this.housingProvidentFund = housingProvidentFund;
+    }
+
+    public BigDecimal getEnterpriseFund() {
+        return enterpriseFund;
+    }
+
+    public void setEnterpriseFund(BigDecimal enterpriseFund) {
+        this.enterpriseFund = enterpriseFund;
+    }
+
+    public BigDecimal getAnnuityIncomeTax() {
+        return annuityIncomeTax;
+    }
+
+    public void setAnnuityIncomeTax(BigDecimal annuityIncomeTax) {
+        this.annuityIncomeTax = annuityIncomeTax;
+    }
+
+    public BigDecimal getTotalWithholding() {
+        return totalWithholding;
+    }
+
+    public void setTotalWithholding(BigDecimal totalWithholding) {
+        this.totalWithholding = totalWithholding;
+    }
+
+    public BigDecimal getNetSalary() {
+        return netSalary;
+    }
+
+    public void setNetSalary(BigDecimal netSalary) {
+        this.netSalary = netSalary;
+    }
+
+    public BigDecimal getOneChildFee() {
+        return oneChildFee;
+    }
+
+    public void setOneChildFee(BigDecimal oneChildFee) {
+        this.oneChildFee = oneChildFee;
+    }
+
+    public BigDecimal getMedicalSubsidy() {
+        return medicalSubsidy;
+    }
+
+    public void setMedicalSubsidy(BigDecimal medicalSubsidy) {
+        this.medicalSubsidy = medicalSubsidy;
+    }
+
+    public BigDecimal getHealthCareFee() {
+        return healthCareFee;
+    }
+
+    public void setHealthCareFee(BigDecimal healthCareFee) {
+        this.healthCareFee = healthCareFee;
+    }
+
+    public BigDecimal getClassMealFee() {
+        return classMealFee;
+    }
+
+    public void setClassMealFee(BigDecimal classMealFee) {
+        this.classMealFee = classMealFee;
+    }
+
+    public BigDecimal getSoapFee() {
+        return soapFee;
+    }
+
+    public void setSoapFee(BigDecimal soapFee) {
+        this.soapFee = soapFee;
+    }
+
+    public BigDecimal getNursingFee() {
+        return nursingFee;
+    }
+
+    public void setNursingFee(BigDecimal nursingFee) {
+        this.nursingFee = nursingFee;
+    }
+
+    public BigDecimal getHeatstrokePreventionSubsidy() {
+        return heatstrokePreventionSubsidy;
+    }
+
+    public void setHeatstrokePreventionSubsidy(BigDecimal heatstrokePreventionSubsidy) {
+        this.heatstrokePreventionSubsidy = heatstrokePreventionSubsidy;
+    }
+
+    public BigDecimal getHeatingSubsidy() {
+        return heatingSubsidy;
+    }
+
+    public void setHeatingSubsidy(BigDecimal heatingSubsidy) {
+        this.heatingSubsidy = heatingSubsidy;
+    }
+
+    public BigDecimal getManuscriptFee() {
+        return manuscriptFee;
+    }
+
+    public void setManuscriptFee(BigDecimal manuscriptFee) {
+        this.manuscriptFee = manuscriptFee;
+    }
+
+    public BigDecimal getDriverAllowance() {
+        return driverAllowance;
+    }
+
+    public void setDriverAllowance(BigDecimal driverAllowance) {
+        this.driverAllowance = driverAllowance;
+    }
+
+    public BigDecimal getGraduateSettlementFee() {
+        return graduateSettlementFee;
+    }
+
+    public void setGraduateSettlementFee(BigDecimal graduateSettlementFee) {
+        this.graduateSettlementFee = graduateSettlementFee;
+    }
+
+    public BigDecimal getOneTimeDisabilitySubsidy() {
+        return oneTimeDisabilitySubsidy;
+    }
+
+    public void setOneTimeDisabilitySubsidy(BigDecimal oneTimeDisabilitySubsidy) {
+        this.oneTimeDisabilitySubsidy = oneTimeDisabilitySubsidy;
+    }
+
+    public BigDecimal getLectureAndExamFee() {
+        return lectureAndExamFee;
+    }
+
+    public void setLectureAndExamFee(BigDecimal lectureAndExamFee) {
+        this.lectureAndExamFee = lectureAndExamFee;
+    }
+
+    public BigDecimal getOtherSubsidies() {
+        return otherSubsidies;
+    }
+
+    public void setOtherSubsidies(BigDecimal otherSubsidies) {
+        this.otherSubsidies = otherSubsidies;
+    }
+
+    public BigDecimal getTotalPayment() {
+        return totalPayment;
+    }
+
+    public void setTotalPayment(BigDecimal totalPayment) {
+        this.totalPayment = totalPayment;
+    }
+
+    public BigDecimal getTotalSalaryDisbursement() {
+        return totalSalaryDisbursement;
+    }
+
+    public void setTotalSalaryDisbursement(BigDecimal totalSalaryDisbursement) {
+        this.totalSalaryDisbursement = totalSalaryDisbursement;
+    }
+
     public WagesDetailsOriginalExcelDAO(String year, String month, String unitName, Integer peopleCount, BigDecimal wagesPayable, BigDecimal houseRent, BigDecimal accommodation, BigDecimal heatingFee, BigDecimal tradeUnionDues, BigDecimal compensationDeduction, BigDecimal otherDeductions, BigDecimal mutualMedicalAid, BigDecimal communicationFee, BigDecimal tax1, BigDecimal tax2, BigDecimal pensionInsurance, BigDecimal unemploymentInsurance, BigDecimal medicalInsurance, BigDecimal annuity, BigDecimal housingProvidentFund, BigDecimal enterpriseFund, BigDecimal annuityIncomeTax, BigDecimal totalWithholding, BigDecimal netSalary, BigDecimal oneChildFee, BigDecimal medicalSubsidy, BigDecimal healthCareFee, BigDecimal classMealFee, BigDecimal soapFee, BigDecimal nursingFee, BigDecimal heatstrokePreventionSubsidy, BigDecimal heatingSubsidy, BigDecimal manuscriptFee, BigDecimal driverAllowance, BigDecimal graduateSettlementFee, BigDecimal oneTimeDisabilitySubsidy, BigDecimal lectureAndExamFee, BigDecimal otherSubsidies, BigDecimal totalPayment, BigDecimal totalSalaryDisbursement) {
         this.year = year;
         this.month = month;
@@ -139,4 +459,7 @@ public class WagesDetailsOriginalExcelDAO {
         this.totalPayment = totalPayment;
         this.totalSalaryDisbursement = totalSalaryDisbursement;
     }
+
+    public WagesDetailsOriginalExcelDAO() {
+    }
 }

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

 package com.ruoyi.system.service;
 
+import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO;
 import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -12,4 +13,6 @@ public interface WagesService {
     String readOriginalData(MultipartFile file);
 
     List<WagesOverviewOriginalDataVO> getSalaryList();
+
+    List<WagesDetailsOriginalExcelDAO> details();
 }

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

@@ -75,4 +75,9 @@ public class WagesServiceImpl implements WagesService {
         List<WagesOverviewOriginalDataVO> salaries = wagesMapper.queryList();
         return salaries;
     }
+
+    @Override
+    public List<WagesDetailsOriginalExcelDAO> details() {
+        return wagesMapper.detailsSelect();
+    }
 }

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

@@ -51,4 +51,47 @@
                total_wages_payable  as totalWagesPayable
         from wages_overview_original_data
     </select>
+    <select id="detailsSelect" resultType="com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO">
+        select year                          as year,
+               month                         as month,
+               unit_name                     as unitName,
+               people_count                  as peopleCount,
+               total_withholding             as totalWithholding,
+               net_salary                    as netSalary,
+               one_child_fee                 as oneChildFee,
+               medical_subsidy               as medicalSubsidy,
+               health_care_fee               as healthCareFee,
+               class_meal_fee                as classMealFee,
+               soap_fee                      as soapFee,
+               nursing_fee                   as nursingFee,
+               heatstroke_prevention_subsidy as heatstrokePreventionSubsidy,
+               heating_subsidy               as heatingSubsidy,
+               manuscript_fee                as manuscriptFee,
+               driver_allowance              as driverAllowance,
+               graduate_settlement_fee       as graduateSettlementFee,
+               one_time_disability_subsidy   as oneTimeDisabilitySubsidy,
+               lecture_and_exam_fee          as lectureAndExamFee,
+               other_subsidies               as otherSubsidies,
+               house_rent                    as houseRent,
+               Wages_payable                 as WagesPayable,
+               accommodation                 as accommodation,
+               heating_fee                   as heatingFee,
+               trade_union_dues              as tradeUnionDues,
+               compensation_deduction        as compensationDeduction,
+               other_deductions              as otherDeductions,
+               mutual_medical_aid            as mutual_medical_aid,
+               communication_fee             as communicationFee,
+               tax1                          as tax1,
+               tax2                          as tax2,
+               pension_insurance             as pensionInsurance,
+               unemployment_insurance        as unemploymentInsurance,
+               medical_insurance             as medicalInsurance,
+               annuity                       as annuity,
+               housing_provident_fund        as housingProvidentFund,
+               enterprise_fund               as enterpriseFund,
+               annuity_income_tax            as annuityIncomeTax,
+               total_payment                 as totalPayment,
+               total_salary_disbursement     as totalSalaryDisbursement
+        from wages_details_original_data
+    </select>
 </mapper>
\ No newline at end of file