From 51603d9354ddef5d8960fe0e6b3e21059da5ff66 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 08 一月 2026 15:53:00 +0800
Subject: [PATCH] 数量检测提交1-页面数据交互

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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..306e62a 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,14 @@
 
 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.Dept;
 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 +34,8 @@
     @Resource
     private GrainService grainService;
     @Resource
+    private CoreDeptService deptService;
+    @Resource
     private SysDeptService sysDeptService;
     @Resource
     private DepotConfService depotConfService;
@@ -47,7 +52,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", "妫�娴嬫椂闂�");
@@ -91,7 +99,7 @@
 
         // 璋冩暣鏁版嵁
         int maxZ = 3;
-        int hour = 0;
+        //int hour = 0;
         List<GrainDataReport> dataList = new ArrayList<>();
         GrainDataReport report;
         DepotConf depotConf;

--
Gitblit v1.9.3