修正

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

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

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

@@ -18,13 +18,15 @@ import java.util.stream.Collectors;
 @Service
 public class WagesConversionServiceImpl implements WagesConversionService {
     private WagesConversionMapper wagesConversionMapper;
-    private WagesConversionServiceImpl(WagesConversionMapper wagesConversionMapper){
+
+    private WagesConversionServiceImpl(WagesConversionMapper wagesConversionMapper) {
         this.wagesConversionMapper = wagesConversionMapper;
     }
+
     @Override
     public void save(WagesConversionDataVO wagesConversionDataVO) {
         wagesConversionMapper.deleteFromConversionToDate(wagesConversionDataVO.getYearMonth());
-        wagesConversionMapper.save(wagesConversionDataVO.getJsonData(),wagesConversionDataVO.getYearMonth(),wagesConversionDataVO.getValue());
+        wagesConversionMapper.save(wagesConversionDataVO.getJsonData(), wagesConversionDataVO.getYearMonth(), wagesConversionDataVO.getValue(), wagesConversionDataVO.getMineId());
     }
 
     @Override
@@ -33,7 +35,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,wagesParamsDto.getMineId());
+        return wagesConversionMapper.selectWagesConversionDataList(n, Integer.parseInt(pageSize), wageMonth, wagesParamsDto.getMineId());
     }
 
     @Override
@@ -56,12 +58,12 @@ public class WagesConversionServiceImpl implements WagesConversionService {
         if (b1) return "数据库中数据存在日期错误";
         Optional<Integer> max = list.parallelStream().map(v -> Integer.parseInt(v.getYearMonth().split("-")[0])).max((a, b) -> a - b);
         List<WagesConversionDataVO> collect;
-        if (max.isPresent()){
+        if (max.isPresent()) {
             collect = list.parallelStream().filter(v -> v.getYearMonth().split("-")[0].equals(max.get() + "")).collect(Collectors.toList());
-        }else {
+        } else {
             return "数据库中没有数据";
         }
-        if (collect != null){
+        if (collect != null) {
             collect = collect.parallelStream().sorted((a, b) -> Integer.parseInt(b.getYearMonth().split("-")[1]) - Integer.parseInt(a.getYearMonth().split("-")[1])).collect(Collectors.toList());
         }
         return collect.get(0).getValue();

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

@@ -15,7 +15,7 @@
     </resultMap>
 
     <insert id="save">
-        insert into wages_conversion_data (json_data, if_generate_voucher, wage_month, value,mine_id)
+        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">