付款进度代码同步

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

@@ -6,11 +6,15 @@ import java.util.Arrays;
 
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo;
+import com.ruoyi.oa.domain.vo.DashboardChartsVo;
+import com.ruoyi.oa.domain.vo.DashboardMetricsVo;
 import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo;
 import com.ruoyi.oa.mapper.SysOaTaskMapper;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
+
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -164,4 +168,56 @@ public class SysOaProjectController extends BaseController {
     }
 
 
+    /**
+     * 数据报表部分
+     */
+
+
+
+
+
+    /**
+     * GET /api/projects/foreign/dashboard/metrics
+     * @param start yyyy/MM/dd
+     * @param end   yyyy/MM/dd
+     */
+    @GetMapping("/metrics")
+    public R<DashboardMetricsVo> metrics(
+            @RequestParam @DateTimeFormat(pattern = "yyyy/MM/dd") Date start,
+            @RequestParam @DateTimeFormat(pattern = "yyyy/MM/dd") Date end,
+            @RequestParam(value="tradeType" , required = false) Long  tradeType
+    ) {
+        DashboardMetricsVo vo = iSysOaProjectService.getMetrics(start, end,tradeType);
+        return R.ok(vo);
+    }
+
+    /**
+     * GET /api/projects/foreign/dashboard/charts
+     * @param start yyyy/MM/dd
+     * @param end   yyyy/MM/dd
+     */
+    @GetMapping("/charts")
+    public R<DashboardChartsVo> charts(
+            @RequestParam @DateTimeFormat(pattern = "yyyy/MM/dd") Date start,
+            @RequestParam @DateTimeFormat(pattern = "yyyy/MM/dd") Date end,
+            @RequestParam(value="tradeType" , required = false) Long  tradeType
+    ) {
+        DashboardChartsVo vo = iSysOaProjectService.getCharts(start, end,tradeType);
+        return R.ok(vo);
+    }
+
+    /**
+     * GET /api/projects/foreign/expiring
+     * @param days 预警天数，默认 7
+     */
+    @GetMapping("/expiring")
+    public R<List<SysOaProjectVo>> expiring(
+            @RequestParam(name = "days", defaultValue = "7") Integer days,
+            @RequestParam(value="tradeType" , required = false) Long  tradeType
+    ) {
+        List<SysOaProjectVo> list = iSysOaProjectService.getExpiringForeignProjects(days,tradeType);
+        return R.ok(list);
+    }
+
+
 }

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

@@ -133,7 +133,7 @@ public class SysOaWarehouseTaskController extends BaseController {
 
 
     /**
-     * 处理单个物料入库
+     * 处理批量物料入库
      */
     @RepeatSubmit()
     @PutMapping("/status-list")