oa二期内容更新

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

@@ -146,6 +146,7 @@ public class SysOaFinanceController extends BaseController {
             outMap.put("financeType", '0');
             outMap.put("beginTime", firstDay);
             outMap.put("endTime", lastDay);
+            outMap.put("payType",bo.getPayType());
             BigDecimal financeOutReduce = iSysOaFinanceService.findFinanceByTime(bo, outMap);
 
             //收入
@@ -153,6 +154,7 @@ public class SysOaFinanceController extends BaseController {
             comeMap.put("financeType", '1');
             comeMap.put("beginTime", firstDay);
             comeMap.put("endTime", lastDay);
+            comeMap.put("payType",bo.getPayType());
             BigDecimal financeComeReduce = iSysOaFinanceService.findFinanceByTime(bo, comeMap);
             //收入减支出
             BigDecimal subtract = financeComeReduce.subtract(financeOutReduce);

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

@@ -77,6 +77,17 @@ public class SysOaProjectController extends BaseController {
         return R.ok(iSysOaProjectService.queryById(projectId));
     }
 
+    /**
+     * 获取项目管理详细信息
+     *
+     * @param projectId 主键
+     */
+    @GetMapping("/projectDataByMonth")
+    public R<List<SysOaProjectVo>> getProjectDataByMonth() {
+        return R.ok(iSysOaProjectService.getProjectDataByMonth());
+    }
+
+
     /**
      * 新增项目管理
      */