From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 08 八月 2024 20:48:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java index ebb3a0f..b4e77fa 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java @@ -1,16 +1,15 @@ package com.ycl.platform.service; import com.baomidou.mybatisplus.extension.service.IService; - -import com.ycl.platform.domain.query.ReportQuery; -import com.ycl.platform.domain.vo.ReportVO; -import com.ycl.platform.domain.vo.YwUnitVO; -import com.ycl.system.Result; import com.ycl.platform.domain.entity.YwUnit; import com.ycl.platform.domain.form.YwUnitForm; import com.ycl.platform.domain.query.YwUnitQuery; +import com.ycl.platform.domain.vo.YwUnitVO; +import com.ycl.system.Result; +import com.ycl.system.model.LoginUser; import java.util.List; +import java.util.Map; /** * 杩愮淮鍗曚綅 鏈嶅姟绫� @@ -73,4 +72,23 @@ * @return */ List<YwUnitVO> export(YwUnitQuery query); + + /** + * 鍒楄〃 + * @return + */ + Result workList(); + + /** + * 璁剧疆鐧诲綍鐢ㄦ埛鐨勮繍缁村崟浣嶄俊鎭� + * + * @param loginUser + */ + void setUnitInfo(LoginUser loginUser); + + /** + * 杩愮淮鍗曚綅杩濊娆℃暟 + * @return 鏁版嵁 + */ + List<Map<String, Object>> ywUnitCount(); } -- Gitblit v1.8.0