From ede3341677f4c480489e0adcf9a84c48c18fbe32 Mon Sep 17 00:00:00 2001 From: limingyu Date: Wed, 27 Dec 2023 09:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E8=88=B1=20=E9=A6=96=E9=A1=B5=20=E5=8F=B3=E4=B8=8B=E8=A7=92?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E6=96=B0=E5=8A=A8=E7=81=AB?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/home/HomeController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/home/HomeController.java b/src/main/java/com/zcloud/controller/home/HomeController.java index b690e0d0..1f26bbf9 100644 --- a/src/main/java/com/zcloud/controller/home/HomeController.java +++ b/src/main/java/com/zcloud/controller/home/HomeController.java @@ -15,6 +15,7 @@ import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.ObjectExcelView; import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.crypto.hash.SimpleHash; @@ -318,7 +319,12 @@ public class HomeController extends BaseController { Map chartData = new HashMap(); List legendData = Arrays.asList(new String[]{"动火作业", "临时用电作业", "盲板作业", "高处作业", "有限空间作业", "吊装作业"}); - List workChart = highworkService.statisticsAllHighRiskWork(pd); //统计高危作业里各作业数 + List workChart = new ArrayList<>(); + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6",pd.getString("CORPINFO_ID"))) { //一公司 + workChart = highworkService.statisticsAllHighRiskWorkFirst(pd); //统计高危作业里各作业数 + } else { + workChart = highworkService.statisticsAllHighRiskWork(pd); //统计高危作业里各作业数 + } List seriesData = new ArrayList(); for (int i = 0; i < legendData.size(); i++) { PageData pie = new PageData();