Merge remote-tracking branch 'origin/hckx' into hckx

maven

8 小时以前 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d

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

@@ -23,6 +23,7 @@

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

/**
 * @author :yys
@@ -77,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);
    }
}