Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-manag...

chenhj

6 小时以前 7488018d52edaafcd4e541c5fdeada8dd2e47b11

 src/main/java/com/ruoyi/home/controller/HomeController.java

@@ -21,7 +21,9 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.text.ParseException;
import java.util.List;
import java.util.Map;

/**
 * @author :yys
@@ -63,7 +65,7 @@
    @GetMapping("/todos")
    @Log(title = "待办事项", businessType = BusinessType.OTHER)
    @ApiOperation("待办事项")
    public AjaxResult todos(ApproveProcess req) {
    public AjaxResult todos(ApproveProcess req) throws ParseException {
        List<ApproveProcess> approveProcessList = homeService.todos();
        return AjaxResult.success(approveProcessList);
    }
@@ -76,5 +78,17 @@
        return AjaxResult.success(statisticsReceivablePayable);
    }

    @GetMapping("/approveAndDeviceTodos")
    @ApiOperation("审批协同，设备报修待办事项")
    public AjaxResult approveAndDeviceTodos(){
        Map<String, Object> map = homeService.approveAndDeviceTodos();
        return AjaxResult.success(map);
    }

    @GetMapping("/noticesCount")
    @ApiOperation("未过期的公告数量")
    public AjaxResult noticesCount(){
        Long count = homeService.noticesCount();
        return AjaxResult.success(count);
    }
}