From 03baf01cdaa23d7986fc65b0394c7c550334ec42 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 30 十月 2023 16:14:23 +0800
Subject: [PATCH] 优化调整扦样化验及廒间管理
---
igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java | 4 ++++
igds-core/src/main/java/com/ld/igds/view/Granary.view.xml | 13 -------------
igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java | 33 +++++++++++++++++----------------
igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 2 +-
igds-core/src/main/java/com/ld/igds/view/GranaryPR.java | 8 ++++++++
5 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java b/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
index 239b707..b6f567f 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
@@ -247,6 +247,10 @@
// 鑾峰彇鍒嗘満淇℃伅
DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(),
depotConf.getGrainSer());
+ // 鑻ヨ櫕瀹冲垎鏈洪厤缃笉涓虹┖锛屽垯鑾峰彇铏鐨勫垎鏈�
+ if(StringUtils.isNotEmpty(depotConf.getPestSer())){
+ deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getPestSer());
+ }
CheckPestRequest request = new CheckPestRequest();
request.setDepotId(param.getDepotId());
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
index fca817d..ef48505 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
@@ -70,7 +70,7 @@
item = new CheckItemData();
BeanUtils.copyProperties(data, item);
item.setCheckId(checkId);
- if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
+ if (null != data.getUpperLimit() && data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
item.setOperaSymbolValue(data.getOperaSymbol() + " " + data.getUpperLimit());
}
result.add(item);
diff --git a/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml b/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
index 1e5df6d..74eafb8 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
@@ -104,14 +104,6 @@
</PropertyDef>
</DataType>
<DataType name="dtParam">
- <PropertyDef name="depotId">
- <Property name="label">鎵�灞炰粨搴�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("buildingPR#getCacheBuilding").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
<PropertyDef name="name">
<Property name="label">寤掗棿鍚嶇О</Property>
</PropertyDef>
@@ -170,11 +162,6 @@
<AutoForm>
<Property name="dataSet">dsParam</Property>
<Property name="cols">*,*,*,*</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
<AutoFormElement>
<Property name="name">name</Property>
<Property name="property">name</Property>
diff --git a/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java b/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
index 81310e9..6dc435d 100644
--- a/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
@@ -5,10 +5,12 @@
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.Granary;
+import com.ld.igds.util.ContextUtil;
import com.ld.igds.view.service.HGranaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -32,6 +34,12 @@
@DataProvider
public void pageGranary(Page<Granary> page, Map<String, Object> param)
throws Exception {
+ if(null == param){
+ param = new HashMap<>();
+ }
+ if(null == param.get("deptId")){
+ param.put("deptId", ContextUtil.subDeptId(null));
+ }
granaryService.pageData(page, param);
}
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java b/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
index ea68d32..da60f04 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
@@ -7,7 +7,6 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
-
import java.util.HashMap;
import java.util.Map;
@@ -24,27 +23,29 @@
throws Exception {
String hql = " from " + Granary.class.getName()
+ " where companyId=:companyId";
-
+ if (null == param) {
+ param = new HashMap<>();
+ }
+ String companyId = (String) param.get("companyId");
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
+ args.put("companyId", companyId);
- if (null != param) {
+ String str = (String) param.get("deptId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and deptId =:deptId";
+ args.put("deptId", str);
+ }
- String str = (String) param.get("depotId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and cfbh =:depotId";
- args.put("depotId", str);
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and ajmc like:name";
- args.put("name", "%" + str + "%");
- }
-
+ str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and ajmc like:name";
+ args.put("name", "%" + str + "%");
}
String count = "select count(*) " + hql;
-
hql += " order by updateTime desc";
this.pagingQuery(page, hql, count, args);
--
Gitblit v1.9.3