优化工资计算逻辑

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSalaryController.java

@@ -24,6 +24,7 @@ import com.ruoyi.oa.domain.vo.OaSalaryVo;
 import com.ruoyi.oa.domain.bo.OaSalaryBo;
 import com.ruoyi.oa.service.IOaSalaryService;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 薪资管理
@@ -118,4 +119,6 @@ public class OaSalaryController extends BaseController {
     public R<Void> calc(@RequestBody OaSalaryBo bo) {
         return R.ok(iOaSalaryService.calcSalary(bo));
     }
+
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSalaryItemController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.oa.domain.bo.OaSalaryBo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -47,6 +48,12 @@ public class OaSalaryItemController extends BaseController {
         return iOaSalaryItemService.queryPageList(bo, pageQuery);
     }
 
+
+    @GetMapping("/check-file")
+    public R<Boolean> checkFile(OaSalaryItemBo bo, PageQuery pageQuery) {
+        return R.ok(iOaSalaryItemService.checkFile(bo));
+    }
+
     /**
      * 导出薪水详情列表
      */
@@ -100,4 +107,6 @@ public class OaSalaryItemController extends BaseController {
                           @PathVariable Long[] salaryItemIds) {
         return toAjax(iOaSalaryItemService.deleteWithValidByIds(Arrays.asList(salaryItemIds), true));
     }
+
+
 }