修改实体类

ruoyi-admin/pom.xml

@@ -94,7 +94,7 @@
         <!-- 工资管理 -->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-wages</artifactId>
+            <artifactId>rouyi-wages</artifactId>
             <version>3.4.0</version>
         </dependency>
     </dependencies>

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

-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.WagesMapper">
-    <insert id="insertDetailsOriginal">
-        insert into wages_details_original_data (year, month, unit_name, people_count, total_withholding,
-        net_salary, one_child_fee, medical_subsidy, health_care_fee, class_meal_fee, soap_fee, nursing_fee,
-        heatstroke_prevention_subsidy, heating_subsidy, manuscript_fee, driver_allowance,graduate_settlement_fee,
-        one_time_disability_subsidy,lecture_and_exam_fee,other_subsidies,house_rent,Wages_payable,accommodation,
-        heating_fee,trade_union_dues,compensation_deduction,other_deductions,mutual_medical_aid,communication_fee,tax1,tax2,pension_insurance,
-        unemployment_insurance,medical_insurance,annuity,housing_provident_fund,enterprise_fund,annuity_income_tax,total_payment,total_salary_disbursement)
-        values
-        <foreach collection="accList" item="list" separator=",">
-            (#{list.year}, #{list.month}, #{list.unitName}, #{list.peopleCount},
-            #{list.totalWithholding},
-            #{list.netSalary}, #{list.oneChildFee}, #{list.medicalSubsidy}, #{list.healthCareFee},
-            #{list.classMealFee}, #{list.soapFee}, #{list.nursingFee}, #{list.heatstrokePreventionSubsidy},
-            #{list.heatingSubsidy},
-            #{list.manuscriptFee}, #{list.driverAllowance}, #{list.graduateSettlementFee},
-            #{list.oneTimeDisabilitySubsidy}, #{list.lectureAndExamFee}, #{list.otherSubsidies},
-            #{list.houseRent}, #{list.wagesPayable}, #{list.accommodation}, #{list.heatingFee}, #{list.tradeUnionDues},
-            #{list.compensationDeduction}, #{list.otherDeductions}
-            , #{list.mutualMedicalAid}, #{list.communicationFee}, #{list.tax1}, #{list.tax2}, #{list.pensionInsurance}
-            , #{list.unemploymentInsurance}, #{list.medicalInsurance}, #{list.annuity}, #{list.housingProvidentFund},
-            #{list.enterpriseFund}
-            , #{list.annuityIncomeTax}, #{list.totalPayment}, #{list.totalSalaryDisbursement})
-        </foreach>
-    </insert>
-    <insert id="insertWagesOverviewOriginal">
-        insert into wages_overview_original_data(year,month,unit_code,unit_name,worker_count,worker_wages_payable,
-        cadre_count,cadre_wages_payable,total_count,total_wages_payable)
-        values
-        <foreach collection="accList" item="list" separator=",">
-            (#{list.year}, #{list.month}, #{list.unitCode}, #{list.unitName},
-            #{list.workerCount},
-            #{list.workerWagesPayable}, #{list.cadreCount}, #{list.cadreWagesPayable}, #{list.totalCount},
-            #{list.totalWagesPayable})
-        </foreach>
-    </insert>
-</mapper>
\ No newline at end of file

ruoyi-system/pom.xml

@@ -33,7 +33,7 @@
         <!-- 工资-->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-wages</artifactId>
+            <artifactId>rouyi-wages</artifactId>
             <version>3.4.0</version>
         </dependency>
 

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

-package main.java.com.ruoyi.system.controller;
+package com.ruoyi.system.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO;
 import com.ruoyi.system.service.WagesService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * 2024/4/26
  */
 @RestController
 @RequestMapping("/wages")
 public class WagesController {
+    private Logger logger = LoggerFactory.getLogger(WagesController.class);
 
     private WagesService wagesService;
 
@@ -27,4 +33,11 @@ public class WagesController {
         new AjaxResult();
         return new AjaxResult(200, s);
     }
+
+    @PostMapping("/salaries")
+    public List<WagesOverviewOriginalDataVO> salaries() {
+        logger.info("salaries");
+        List<WagesOverviewOriginalDataVO> salaryList = wagesService.getSalaryList();
+        return salaryList;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO;
 import com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO;
+import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -16,4 +17,6 @@ public interface WagesMapper {
     void insertDetailsOriginal(@Param("accList") List<WagesDetailsOriginalExcelDAO> wagesDetList);
 
     void insertWagesOverviewOriginal(@Param("accList") List<WagesOverviewOriginalExcelDAO> wagesOveList);
+
+    List<WagesOverviewOriginalDataVO> queryList();
 }

ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/vo/WagesOverviewOriginalDataVO.java

+package com.ruoyi.system.model.wages.vo;
+
+import java.math.BigDecimal;
+
+public class WagesOverviewOriginalDataVO {
+
+    private int id;
+
+    private String year;
+
+    private String month;
+
+    private String unitCode;
+
+    private String unitName;
+
+    private int workerCount;
+
+    private BigDecimal workerWagesPayable;
+
+    private int cadreCount;
+
+    private BigDecimal cadreWagesPayable;
+
+    private int totalCount;
+
+    private BigDecimal totalWagesPayable;
+
+    @Override
+    public String toString() {
+        return "WagesOverviewOriginalDataVO{" +
+                "id=" + id +
+                ", year='" + year + '\'' +
+                ", month='" + month + '\'' +
+                ", unitCode='" + unitCode + '\'' +
+                ", unitName='" + unitName + '\'' +
+                ", workerCount=" + workerCount +
+                ", workerWagesPayable=" + workerWagesPayable +
+                ", cadreCount=" + cadreCount +
+                ", cadreWagesPayable=" + cadreWagesPayable +
+                ", totalCount=" + totalCount +
+                ", totalWagesPayable=" + totalWagesPayable +
+                '}';
+    }
+
+    public WagesOverviewOriginalDataVO(int id, String year, String month, String unitCode, String unitName, int workerCount, BigDecimal workerWagesPayable, int cadreCount, BigDecimal cadreWagesPayable, int totalCount, BigDecimal totalWagesPayable) {
+        this.id = id;
+        this.year = year;
+        this.month = month;
+        this.unitCode = unitCode;
+        this.unitName = unitName;
+        this.workerCount = workerCount;
+        this.workerWagesPayable = workerWagesPayable;
+        this.cadreCount = cadreCount;
+        this.cadreWagesPayable = cadreWagesPayable;
+        this.totalCount = totalCount;
+        this.totalWagesPayable = totalWagesPayable;
+    }
+
+    public WagesOverviewOriginalDataVO() {
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        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 getUnitCode() {
+        return unitCode;
+    }
+
+    public void setUnitCode(String unitCode) {
+        this.unitCode = unitCode;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public int getWorkerCount() {
+        return workerCount;
+    }
+
+    public void setWorkerCount(int workerCount) {
+        this.workerCount = workerCount;
+    }
+
+    public BigDecimal getWorkerWagesPayable() {
+        return workerWagesPayable;
+    }
+
+    public void setWorkerWagesPayable(BigDecimal workerWagesPayable) {
+        this.workerWagesPayable = workerWagesPayable;
+    }
+
+    public int getCadreCount() {
+        return cadreCount;
+    }
+
+    public void setCadreCount(int cadreCount) {
+        this.cadreCount = cadreCount;
+    }
+
+    public BigDecimal getCadreWagesPayable() {
+        return cadreWagesPayable;
+    }
+
+    public void setCadreWagesPayable(BigDecimal cadreWagesPayable) {
+        this.cadreWagesPayable = cadreWagesPayable;
+    }
+
+    public int getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(int totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public BigDecimal getTotalWagesPayable() {
+        return totalWagesPayable;
+    }
+
+    public void setTotalWagesPayable(BigDecimal totalWagesPayable) {
+        this.totalWagesPayable = totalWagesPayable;
+    }
+
+
+}
+

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

 package com.ruoyi.system.service;
 
+import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * 2024/4/27
  */
 public interface WagesService {
     String readOriginalData(MultipartFile file);
+
+    List<WagesOverviewOriginalDataVO> getSalaryList();
 }

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

@@ -7,7 +7,10 @@ import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO;
 import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelSheet1DAO;
 import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelSheet2DAO;
 import com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO;
+import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO;
 import com.ruoyi.system.service.WagesService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +27,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class WagesServiceImpl implements WagesService {
+    private Logger logger = LoggerFactory.getLogger(WagesServiceImpl.class);
     @Autowired
     WagesMapper wagesMapper;
     @Transactional
@@ -64,4 +68,14 @@ public class WagesServiceImpl implements WagesService {
         }
         return null;
     }
+
+    @Override
+    public List<WagesOverviewOriginalDataVO> getSalaryList() {
+        logger.info("getSalaryList");
+        List<WagesOverviewOriginalDataVO> salaries = wagesMapper.queryList();
+        for (WagesOverviewOriginalDataVO WagesOverviewOriginalDataVO:salaries) {
+            logger.info(WagesOverviewOriginalDataVO.toString());
+        }
+        return salaries;
+    }
 }

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

@@ -38,4 +38,17 @@
             #{list.totalWagesPayable})
         </foreach>
     </insert>
+    <select id="queryList" resultType="com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO">
+        select  year                    as year,
+                month                   as month,
+                unit_code               as unitCode,
+                unit_name               as unitName,
+                worker_count            as workerCount,
+                worker_wages_payable    as workerWagesPayable,
+                cadre_count             as cadreCount,
+                cadre_wages_payable     as cadreWagesPayable,
+                total_count             as totalCount,
+                total_wages_payable     as totalWagesPayable
+        from wages_overview_original_data
+    </select>
 </mapper>
\ No newline at end of file