1

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

@@ -34,10 +34,10 @@ public class WagesConversionController extends BaseController {
         return new AjaxResult(200, "成功");
     }
 
-    @GetMapping("/getWagesData")
-    public TableDataInfo getWagesDataList() {
+    @GetMapping("/getWagesData/{wageMonth}")
+    public TableDataInfo getWagesDataList(@PathVariable("wageMonth") String date) {
         startPage();
-        List<WagesConversionData> wagesConversionData = wagesConversionService.selectWagesConversionDataList();
+        List<WagesConversionData> wagesConversionData = wagesConversionService.selectWagesConversionDataList(date);
         TableDataInfo dataTable = getDataTable(wagesConversionData);
 
         logger.info(dataTable.getRows().toString());

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

@@ -14,7 +14,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("date") String date);
     
     void update(@Param("id")int id, @Param("jsonData") String jsonData);
     

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

@@ -12,7 +12,7 @@ public interface WagesConversionService {
     
     void save(WagesConversionDataVO wagesConversionDataVO);
     
-    List<WagesConversionData> selectWagesConversionDataList();
+    List<WagesConversionData> selectWagesConversionDataList(String date);
     
     void update(WagesConversionData wagesConversionData);
     

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

@@ -28,8 +28,8 @@ public class WagesConversionServiceImpl implements WagesConversionService {
     }
     
     @Override
-    public List<WagesConversionData> selectWagesConversionDataList() {
-        return wagesConversionMapper.selectWagesConversionDataList();
+    public List<WagesConversionData> selectWagesConversionDataList(String date) {
+        return wagesConversionMapper.selectWagesConversionDataList(date);
     }
     
     @Override

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

@@ -26,8 +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
-order by create_date desc
+        where if_generate_voucher = 0 <if test="date != null"> and wage_month = #{date}</if>
+        order by create_date desc
     </select>
     <select id="selectWagesConversionDataById" parameterType="integer"
             resultMap="WagesConversionData">