From e356555905a02466a25206bae8f9bc66f3432d4f Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 07 一月 2026 14:20:09 +0800
Subject: [PATCH] 报表优化修改
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml | 36 +++++++++++-
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 10 +++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java | 7 +-
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml | 9 ++
fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java | 15 ++++-
fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java | 4
fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java | 6 +-
fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml | 12 +++
fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java | 12 +++-
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java | 2
fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html | 5 +
13 files changed, 98 insertions(+), 26 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
index ee97820..296e8b1 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
@@ -55,7 +55,7 @@
}
// 鏀跺偍鍏徃妫�绱�
if (StringUtils.isNotBlank(param.getKey())) {
- queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
+ queryWrapper.likeRight("dept_id", param.getKey());
}
//鎶撴媿鏃堕棿妫�绱�
if (null != param.getStart()) {
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java
index 7ddcb88..cbe3d03 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java
@@ -48,10 +48,11 @@
QueryWrapper<Quantity> queryWrapper = new QueryWrapper<>();
param.setCompanyId(ContextUtil.getCompanyId());
- param.setDeptId(ContextUtil.subDeptId(null));
queryWrapper.eq("company_id", param.getCompanyId());
- queryWrapper.eq("dept_id", param.getDeptId());
-
+ //搴撳尯妫�绱�
+ if (StringUtils.isNotBlank(param.getDeptId())) {
+ queryWrapper.like("dept_id", param.getDeptId());
+ }
//浠撳簱妫�绱�
if (StringUtils.isNotBlank(param.getDepotId())) {
queryWrapper.eq("depot_id", param.getDepotId());
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
index df7fbf0..73b5df0 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
@@ -51,7 +51,7 @@
}
// 鏀跺偍鍏徃妫�绱�
if (StringUtils.isNotBlank(param.getKey())) {
- queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
+ queryWrapper.likeRight("dept_id", param.getKey());
}
//鎶撴媿鏃堕棿妫�绱�
if (null != param.getStart()) {
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml
index 3cf79f5..6bff250 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml
@@ -9,6 +9,15 @@
<Property></Property>
<Property name="label">妫�娴嬫壒娆�</Property>
</PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
@@ -17,7 +26,7 @@
<Property></Property>
<Property name="label">鎵�灞炰粨搴�</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -25,10 +34,12 @@
<PropertyDef name="weight">
<Property name="dataType">Double</Property>
<Property name="label">閲嶉噺</Property>
+ <Property name="displayFormat">#0.0 KG</Property>
</PropertyDef>
<PropertyDef name="bulk">
<Property name="dataType">Double</Property>
<Property name="label">浣撶Н</Property>
+ <Property name="displayFormat">#0.0 m鲁</Property>
</PropertyDef>
<PropertyDef name="receiveDate">
<Property name="dataType">Date</Property>
@@ -57,11 +68,20 @@
<PropertyDef name="title">
<Property name="label"> </Property>
</PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="depotId">
<Property></Property>
<Property name="label">閫夋嫨浠撳簱</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -100,12 +120,17 @@
<Container>
<Property name="className">c-param</Property>
<AutoForm>
- <Property name="cols">*,*,*,90,90</Property>
+ <Property name="cols">*,*,*,*,90,90</Property>
<Property name="dataSet">dataSetC</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">110</Property>
<Property name="exClassName">bg-color</Property>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
@@ -204,6 +229,11 @@
<Property name="property">batchId</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn>
+ <Property name="property">deptId</Property>
+ <Property name="align">center</Property>
+ <Property name="name">deptId</Property>
+ </DataColumn>
<DataColumn name="depotId">
<Property name="property">depotId</Property>
<Property name="align">center</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java
index 093e57b..fbb7711 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java
@@ -16,7 +16,7 @@
import java.util.Date;
/**
- *
+ *鏁伴噺妫�娴嬫暟鎹姤琛�
*
* @author sgj
* @date 2025/12/18
@@ -43,7 +43,7 @@
result.setTitle("鏁伴噺妫�娴嬫暟鎹�");
if (null != subDept) {
result.setTitle(subDept.getDeptName() + "鏁伴噺妫�娴嬫暟鎹�");
- result.setDepotId(String.valueOf(subDept.getDeptId()));
+ result.setDeptId(String.valueOf(subDept.getDeptId()));
}
result.setEnd(new Date());
Date start = DateUtil.getNewByDay(new Date(), -90);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index 9b125e6..a1f5e7a 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
@@ -543,7 +543,15 @@
</AutoFormElement>
<Button>
<ClientEvent name="onClick"> var data = view.get("#dsQuery.data");
- view.get("#dsMain").set("parameter",data).flushAsync();</ClientEvent>
+ var deptId=data.get("deptId");
+ var companyId=data.get("companyId");
+ if(!companyId || !deptId){
+ $alert("璇峰厛閫夋嫨鏀跺偍鍏徃鍜屽拰鎵�灞炲簱鍖�");
+
+ }else{
+ view.get("#dsMain").set("parameter",data).flushAsync();
+ }
+</ClientEvent>
<Property name="caption">鎼滅储</Property>
<Property name="exClassName">btn-q1</Property>
<Property name="iconClass">fa fa-search</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
index 79e426e..c1ace34 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
@@ -536,7 +536,14 @@
</AutoFormElement>
<Button>
<ClientEvent name="onClick"> var data = view.get("#dsQuery.data");
- view.get("#dsMain").set("parameter",data).flushAsync();</ClientEvent>
+ var deptId=data.get("deptId");
+ var companyId=data.get("companyId");
+ if(!companyId || !deptId){
+ $alert("璇峰厛閫夋嫨鏀跺偍鍏徃鍜屽拰鎵�灞炲簱鍖�");
+ }else{
+ view.get("#dsMain").set("parameter",data).flushAsync();
+ }
+</ClientEvent>
<Property name="caption">鎼滅储</Property>
<Property name="exClassName">btn-q1</Property>
<Property name="iconClass">fa fa-search</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
index 5bcc483..4dcb7b1 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
@@ -80,7 +80,7 @@
<Property></Property>
<Property name="label">瑁呭嵏浠撳簱</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -256,42 +256,52 @@
<Property name="property">customerId</Property>
<Property name="width">326</Property>
<Property name="name">customerId</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="deptId">
<Property name="property">deptId</Property>
<Property name="width">250</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="depotId">
<Property name="property">depotId</Property>
<Property name="width">326</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="initialWeight">
<Property name="property">initialWeight</Property>
<Property name="width">100</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="recordInWeight">
<Property name="property">recordInWeight</Property>
<Property name="width">100</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="changeInWeight">
<Property name="property">changeInWeight</Property>
<Property name="width">100</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="recordOutWeight">
<Property name="property">recordOutWeight</Property>
<Property name="width">100</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="changeOutWeight">
<Property name="property">changeOutWeight</Property>
<Property name="width">100</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="lossWeight">
<Property name="property">lossWeight</Property>
<Property name="width">100</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="finalWeight">
<Property name="property">finalWeight</Property>
<Property name="width">100</Property>
+ <Property name="align">center</Property>
</DataColumn>
</DataGrid>
<ToolBar id="tool" layoutConstraint="bottom">
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
index d3253f8..ac2440c 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
@@ -134,13 +134,13 @@
/**
- * 鑾峰彇鍒嗗簱鍒楄〃
+ * 鏍规嵁鍏徃ID鑾峰彇鍏徃涓嬬殑鍒嗗簱鍒楄〃
*
* @author sgj
* @date 2025/12/12
*/
- public List<Dept> listDeptData() {
- return coreDeptService.getDeptData();
+ public List<Dept> listDeptData(String parentId) {
+ return coreDeptService.getDeptByUserType(parentId);
}
/**
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
index d90416b..79acef5 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
@@ -6,6 +6,7 @@
import com.fzzy.igds.constant.WarnType;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
+import com.fzzy.igds.domain.Company;
import com.fzzy.igds.domain.EventInfo;
import com.fzzy.security.manager.EventInfoManager;
import com.ruoyi.common.utils.StringUtils;
@@ -42,10 +43,15 @@
*/
@GetMapping
public String getEventInfo(@RequestParam(value = "viewType", required = false) String viewType, Model model) {
-
+ List<Company> companies = commonManager.listCompanyData();
+ String defaultCompany = "" ;
+ if (companies != null && !companies.isEmpty()) {
+ defaultCompany = companies.get(0).getId();
+ }
IgdsBaseParam param = new IgdsBaseParam();
param.setPage(1);
param.setLimit(6);
+ param.setKey(defaultCompany);
Page<EventInfo> events = eventInfoManager.pageData(param);
model.addAttribute("eventInfoList", events.getRecords());
model.addAttribute("currentPage", events.getCurrent());
@@ -60,7 +66,7 @@
//璁惧鏁版嵁
model.addAttribute("cameraList", commonManager.listCameraData());
//搴撳尯鏁版嵁
- model.addAttribute("deptList", commonManager.listDeptData());
+ model.addAttribute("deptList", commonManager.listDeptData(null));
//涓氬姟绫诲瀷鏁版嵁
List<Map<String, String>> bizTypeList = new ArrayList<>();
for (WarnType type : WarnType.values()) {
@@ -71,7 +77,7 @@
}
model.addAttribute("bizTypeList", bizTypeList);
//鍏徃鏁版嵁
- model.addAttribute("companyList", commonManager.listCompanyData());
+ model.addAttribute("companyList", companies);
return prefix + "/eventInfo";
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
index d82e3ca..81928d3 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
@@ -5,6 +5,7 @@
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
+import com.fzzy.igds.domain.Company;
import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.security.manager.SnapRecordManager;
import com.ruoyi.common.utils.StringUtils;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
@Slf4j
@@ -34,10 +36,15 @@
*/
@GetMapping
public String getSnapRecord(@RequestParam(value = "viewType", required = false) String viewType, Model model) {
-
+ List<Company> companies = commonManager.listCompanyData();
+ String defaultCompany = "" ;
+ if (companies != null && !companies.isEmpty()) {
+ defaultCompany = companies.get(0).getId();
+ }
IgdsBaseParam param = new IgdsBaseParam();
param.setPage(1);
param.setLimit(6);
+ param.setKey(defaultCompany);
Page<SnapRecord> images = snapRecordManager.pageData(param);
model.addAttribute("snapRecordList", images.getRecords());
model.addAttribute("currentPage", images.getCurrent());
@@ -52,9 +59,11 @@
//璁惧鏁版嵁
model.addAttribute("cameraList", commonManager.listCameraData());
//搴撳尯鏁版嵁
- model.addAttribute("deptList", commonManager.listDeptData());
+ model.addAttribute("deptList", commonManager.listDeptData(null));
//鍏徃鏁版嵁
- model.addAttribute("companyList", commonManager.listCompanyData());
+ model.addAttribute("companyList", companies);
+ //榛樿鏌ヨ鍏徃鏁版嵁
+ model.addAttribute("defaultCompany", defaultCompany);
return prefix + "/snapRecord";
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
index 9a4d36c..2b8b546 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
@@ -20,8 +20,9 @@
<ul>
<li>
鏀跺偍鍏徃锛�<select class="form-control" name="key">
- <option value="">鎵�鏈�</option>
- <option th:each="company : ${companyList}" th:value="${company.id}" th:text="${company.dwmc}">
+ <option th:each="company : ${companyList}" th:value="${company.id}"
+ th:text="${company.dwmc}"
+ th:selected="${company.id == defaultCompany}">
</option>
</select>
</li>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html b/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
index 228da6f..e21c52c 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
@@ -20,9 +20,9 @@
<ul>
<li>
鏀跺偍鍏徃锛�<select class="form-control" name="key">
- <option value="">鎵�鏈�</option>
<option th:each="company : ${companyList}" th:value="${company.id}"
- th:text="${company.dwmc}">
+ th:text="${company.dwmc}"
+ th:selected="${company.id == defaultCompany}">
</option>
</select>
</li>
--
Gitblit v1.9.3