Merge remote-tracking branch 'origin/master'

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.system.model.wages.dao.WagesConversionData;
+import com.ruoyi.system.model.wages.dto.WagesParamsDto;
 import com.ruoyi.system.model.wages.vo.WagesConversionDataVO;
 import com.ruoyi.system.service.WagesConversionService;
 import org.slf4j.Logger;
@@ -34,10 +35,10 @@ public class WagesConversionController extends BaseController {
         return new AjaxResult(200, "成功");
     }
 
-    @GetMapping("/getWagesData")
-    public TableDataInfo getWagesDataList() {
+    @PostMapping("/getWagesData")
+    public TableDataInfo getWagesDataList(@RequestBody WagesParamsDto wagesParamsDto) {
         startPage();
-        List<WagesConversionData> wagesConversionData = wagesConversionService.selectWagesConversionDataList();
+        List<WagesConversionData> wagesConversionData = wagesConversionService.selectWagesConversionDataList(wagesParamsDto);
         TableDataInfo dataTable = getDataTable(wagesConversionData);
 
         logger.info(dataTable.getRows().toString());

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

@@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
 import com.ruoyi.system.model.wages.dao.WagesConversionData;
 import com.ruoyi.system.model.wages.vo.WagesConversionDataVO;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -14,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();
+    List<WagesConversionData> selectWagesConversionDataList(@Param("n") int n, @Param("size") int size, @Param("date") String date);
     
     void update(@Param("id")int id, @Param("jsonData") String jsonData);
     

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

+package com.ruoyi.system.model.wages.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 2024/6/12
+ * 分页
+ */
+@Data
+public class WagesParamsDto {
+    @NotNull(message = "查询页码不能为空")
+    private String pageNum;
+    @NotNull(message = "查询条数不能为空")
+    private String pageSize;
+    private String wageMonth;
+}

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

 package com.ruoyi.system.service;
 
 import com.ruoyi.system.model.wages.dao.WagesConversionData;
+import com.ruoyi.system.model.wages.dto.WagesParamsDto;
 import com.ruoyi.system.model.wages.vo.WagesConversionDataVO;
 
 import java.util.List;
@@ -12,7 +13,7 @@ public interface WagesConversionService {
     
     void save(WagesConversionDataVO wagesConversionDataVO);
     
-    List<WagesConversionData> selectWagesConversionDataList();
+    List<WagesConversionData> selectWagesConversionDataList(WagesParamsDto wagesParamsDto);
     
     void update(WagesConversionData wagesConversionData);
     

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

@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
 import com.ruoyi.system.mapper.WagesConversionMapper;
 import com.ruoyi.system.model.wages.dao.WagesConversionData;
 import com.ruoyi.system.model.wages.dto.WagesConversionDataDto;
+import com.ruoyi.system.model.wages.dto.WagesParamsDto;
 import com.ruoyi.system.model.wages.vo.WagesConversionDataVO;
 import com.ruoyi.system.service.WagesConversionService;
 import org.springframework.stereotype.Service;
@@ -28,8 +29,12 @@ public class WagesConversionServiceImpl implements WagesConversionService {
     }
     
     @Override
-    public List<WagesConversionData> selectWagesConversionDataList() {
-        return wagesConversionMapper.selectWagesConversionDataList();
+    public List<WagesConversionData> selectWagesConversionDataList(WagesParamsDto wagesParamsDto) {
+        String pageNum = wagesParamsDto.getPageNum();
+        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);
     }
     
     @Override

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

@@ -26,7 +26,8 @@
     <select id="selectWagesConversionDataList" resultMap="WagesConversionData">
         select id, if_generate_voucher, wage_month, create_date, update_date
         from wages_conversion_data
-        where if_generate_voucher = 0
+        where if_generate_voucher = 0 <if test="date != null"> and wage_month = #{date}</if>
+        order by create_date desc limit #{n}, #{size}
     </select>
     <select id="selectWagesConversionDataById" parameterType="integer"
             resultMap="WagesConversionData">