代码修改

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

@@ -15,7 +15,7 @@ import java.util.List;
 public interface WagesConversionMapper {
     void save(@Param("jsonData") String jsonData , @Param("yearMonth") String yearMonth, @Param("value") String value);
     
-    List<WagesConversionData> selectWagesConversionDataList(@Param("n") int n, @Param("size") int size, @Param("date") String date);
+    List<WagesConversionData> selectWagesConversionDataList(@Param("n") int n, @Param("size") int size, @Param("date") String date,@Param("mineId")String mineId);
     
     void update(@Param("id")int id, @Param("jsonData") String jsonData);
     

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

@@ -21,17 +21,14 @@ public class WagesConversionData {
 
     private String value;
 
-    @Override
-    public String  toString() {
-        return "WagesConversionData{" +
-                "id=" + id +
-                ", jsonData='" + jsonData + '\'' +
-                ", ifGenerateVoucher='" + ifGenerateVoucher + '\'' +
-                ", createTime=" + createTime +
-                ", updateTime=" + updateTime +
-                ", yearMonth='" + yearMonth + '\'' +
-                ", value='" + value + '\'' +
-                '}';
+    private String mineId;
+
+    public String getMineId() {
+        return mineId;
+    }
+
+    public void setMineId(String mineId) {
+        this.mineId = mineId;
     }
 
     public int getId() {

ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/dto/WagesParamsDto.java

@@ -15,4 +15,5 @@ public class WagesParamsDto {
     @NotNull(message = "查询条数不能为空")
     private String pageSize;
     private String wageMonth;
+    private String mineId;
 }

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

@@ -12,6 +12,16 @@ public class WagesConversionDataVO {
 
     private String value;
 
+    private String mineId;
+
+    public String getMineId() {
+        return mineId;
+    }
+
+    public void setMineId(String mineId) {
+        this.mineId = mineId;
+    }
+
     public String getValue() {
         return value;
     }

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

 package com.ruoyi.system.service.impl;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelReader;
+import com.alibaba.excel.read.metadata.ReadSheet;
 
+import java.io.File;
+import java.io.InputStream;
 import com.alibaba.excel.EasyExcelFactory;
+import com.alibaba.excel.read.builder.ExcelReaderBuilder;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.system.listener.ExcelListener;
@@ -55,9 +61,9 @@ public class WagesCompilationServiceImpl implements WagesCompilationService {
             WagesCompilationExcelDAO financeWagesHeader = financeWagesList.get(0);
 
             wagesHeader.setMineId("011704");
-            wagesHeader.setType("0");
+            wagesHeader.setType("2");
             financeWagesHeader.setMineId("011704");
-            financeWagesHeader.setType("1");
+            financeWagesHeader.setType("3");
 
             wagesCompilationMapper.insertBatch(wagesHeader);
             wagesCompilationMapper.insertBatch(financeWagesHeader);

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

@@ -34,7 +34,7 @@ public class WagesConversionServiceImpl implements WagesConversionService {
         String pageSize = wagesParamsDto.getPageSize();
         String wageMonth = wagesParamsDto.getWageMonth();
         int n = (Integer.parseInt(pageNum) - 1) * Integer.parseInt(pageSize);
-        return wagesConversionMapper.selectWagesConversionDataList(n, Integer.parseInt(pageSize), wageMonth);
+        return wagesConversionMapper.selectWagesConversionDataList(n, Integer.parseInt(pageSize), wageMonth,wagesParamsDto.getMineId());
     }
     
     @Override

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

@@ -11,11 +11,12 @@
         <result property="createTime" column="create_date"/>
         <result property="updateTime" column="update_date"/>
         <result property="yearMonth" column="wage_month"/>
+        <result property="mineId" column="mine_id"/>
     </resultMap>
 
     <insert id="save">
-        insert into wages_conversion_data (json_data, if_generate_voucher, wage_month, value)
-        values (#{jsonData}, 0, #{yearMonth}, #{value})
+        insert into wages_conversion_data (json_data, if_generate_voucher, wage_month, value,mine_id)
+        values (#{jsonData}, 0, #{yearMonth}, #{value},#{mineId})
     </insert>
     <delete id="deleteFromConversionToDate">
         delete
@@ -27,6 +28,7 @@
         select id, if_generate_voucher, wage_month, create_date, update_date
         from wages_conversion_data
         where if_generate_voucher = 0 <if test="date != null"> and wage_month = #{date}</if>
+        <if test="mineId != null"> and mine_id = #{mineId}</if>
         order by create_date desc limit #{n}, #{size}
     </select>
     <select id="selectWagesConversionDataById" parameterType="integer"