From 0d59d664b3b81e9264df6ad513d06b1b2c84c931 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 11:43:34 +0800
Subject: [PATCH] 大屏首页储量数量展示，仅展示散粮；抓拍跟踪图片展示业务逻辑调整
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
index e562322..a97a70a 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
@@ -2,11 +2,13 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.constant.FoodVariety;
import com.fzzy.igds.data.GrainDataReport;
import com.fzzy.igds.domain.DepotConf;
import com.fzzy.igds.domain.Grain;
+import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.DepotConfService;
import com.fzzy.igds.service.GrainService;
import com.fzzy.igds.service.SysDeptService;
@@ -31,6 +33,8 @@
@Resource
private GrainService grainService;
@Resource
+ private CoreDeptService deptService;
+ @Resource
private SysDeptService sysDeptService;
@Resource
private DepotConfService depotConfService;
@@ -47,7 +51,10 @@
result.put("title", "绮儏姹囨�昏〃");
if (null != subDept) {
result.put("title", subDept.getDeptName() + "绮儏姹囨�昏〃");
- result.put("deptId", subDept.getDeptId());
+
+ if(Constant.DEPT_TYPE_20.equals(subDept.getType())){
+ result.put("deptId", subDept.getDeptId());
+ }
}
result.put("timeDesc", "妫�娴嬫椂闂�");
@@ -59,11 +66,11 @@
result.put("start", start);
result.put("timeDesc",
- DateFormatUtils.format(start, "yyyy-MM-dd") + " 鎴嚦锛�"
+ DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
+ DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
result.put("createUser", ContextUtil.getLoginUserName());
- result.put("createTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ result.put("createTime", new Date());
return result;
}
@@ -91,7 +98,7 @@
// 璋冩暣鏁版嵁
int maxZ = 3;
- int hour = 0;
+ //int hour = 0;
List<GrainDataReport> dataList = new ArrayList<>();
GrainDataReport report;
DepotConf depotConf;
--
Gitblit v1.9.3