From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java | 124 +++++++++++++++++++----------------------
1 files changed, 58 insertions(+), 66 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
index 21f6ab5..39d1c17 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
@@ -27,23 +27,18 @@
public void pageQueryIn(Page<InoutNoticeIn> page, Map<String, Object> param) throws Exception {
String hql = " from " + InoutNoticeIn.class.getName()
- + " where companyId =:companyId";
+ + " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
Object year = param.get("year");
if (year == null) {
param.put("year", DateFormatUtils.format(new Date(), "yyyy"));
}
- String str = (String) param.get("deptId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and deptId =:deptId";
- args.put("deptId", str);
- }
-
- str = (String) param.get("id");
+ String str = (String) param.get("id");
if (StringUtils.isNotEmpty(str)) {
hql += " and id=:id";
args.put("id", str);
@@ -86,30 +81,31 @@
public String saveOrUpdateIn(InoutNoticeIn data) {
- //鏂板鍏ュ簱閫氱煡鍗曟椂锛岄渶瑕佽繘琛屽敮涓�鎬у垽鏂�傚嵆淇濊瘉鍗曚綅銆佺伯椋熷搧绉嶃�佸勾浠藉敮涓�锛屼笖涓嶅瓨鍦ㄦ湭瀹屾垚鐘舵�佺殑鍗曞瓙銆�
- if (Constant.YN_Y.equals(data.getTag())) {
- data.setCompanyId(ContextUtil.getCompanyId());
-
- NoticeParam param = new NoticeParam();
- param.setCompanyId(data.getCompanyId());
- param.setDeptId(data.getDeptId());
- param.setCustomerId(data.getCustomerId());
- param.setFoodVariety(data.getFoodVariety());
- param.setYear(data.getYear());
- //鑻ユ湁鍚堝悓淇℃伅锛屾坊鍔犲悎鍚屼俊鎭�
- if (StringUtils.isNotEmpty(data.getContractId())) {
- param.setContractId(data.getContractId());
- }
- //鑻ユ湁璁″垝淇℃伅锛屾坊鍔犺鍒掍俊鎭�
- if (StringUtils.isNotEmpty(data.getPlanId())) {
- param.setPlanId(data.getPlanId());
- }
- param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
- Integer integer = inoutManagerService.queryNoticeIn(param);
- if (integer > 0) {
- return "鏂板鐨勫叆搴撻�氱煡鍗曞凡瀛樺湪锛屼笉鑳藉啀娆℃柊澧烇紝璇锋牳鏌ワ紒";
- }
- }
+ //2023-09-02绂佺敤锛屽師鍥狅細鍚屼竴涓敤鎴锋湁澶氫釜鍚堝悓锛屽氨瀵艰嚧鏈夊涓�氱煡鍗�
+// //鏂板鍏ュ簱閫氱煡鍗曟椂锛岄渶瑕佽繘琛屽敮涓�鎬у垽鏂�傚嵆淇濊瘉鍗曚綅銆佺伯椋熷搧绉嶃�佸勾浠藉敮涓�锛屼笖涓嶅瓨鍦ㄦ湭瀹屾垚鐘舵�佺殑鍗曞瓙銆�
+// if (Constant.YN_Y.equals(data.getTag())) {
+// data.setCompanyId(ContextUtil.getCompanyId());
+//
+// NoticeParam param = new NoticeParam();
+// param.setCompanyId(data.getCompanyId());
+// param.setDeptId(data.getDeptId());
+// param.setCustomerId(data.getCustomerId());
+// param.setFoodVariety(data.getFoodVariety());
+// param.setYear(data.getYear());
+// //鑻ユ湁鍚堝悓淇℃伅锛屾坊鍔犲悎鍚屼俊鎭�
+// if (StringUtils.isNotEmpty(data.getContractId())) {
+// param.setContractId(data.getContractId());
+// }
+// //鑻ユ湁璁″垝淇℃伅锛屾坊鍔犺鍒掍俊鎭�
+// if (StringUtils.isNotEmpty(data.getPlanId())) {
+// param.setPlanId(data.getPlanId());
+// }
+// param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
+// Integer integer = inoutManagerService.queryNoticeIn(param);
+// if (integer > 0) {
+// return "鏂板鐨勫叆搴撻�氱煡鍗曞凡瀛樺湪锛屼笉鑳藉啀娆℃柊澧烇紝璇锋牳鏌ワ紒";
+// }
+// }
Session session = this.getSessionFactory().openSession();
@@ -143,23 +139,18 @@
public void pageQueryOut(Page<InoutNoticeOut> page, Map<String, Object> param) throws Exception {
String hql = " from " + InoutNoticeOut.class.getName()
- + " where companyId =:companyId";
+ + " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
Object year = param.get("year");
if (year == null) {
param.put("year", DateFormatUtils.format(new Date(), "yyyy"));
}
- String str = (String) param.get("deptId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and deptId =:deptId";
- args.put("deptId", str);
- }
-
- str = (String) param.get("id");
+ String str = (String) param.get("id");
if (StringUtils.isNotEmpty(str)) {
hql += " and id =:id";
args.put("id", str);
@@ -202,31 +193,32 @@
public String saveOrUpdateOut(InoutNoticeOut data) {
- //鏂板鍑哄簱閫氱煡鍗曟椂锛岄渶瑕佽繘琛屽敮涓�鎬у垽鏂�傚嵆淇濊瘉鍗曚綅銆佷粨搴撱�佺伯椋熷搧绉嶃�佸勾浠藉敮涓�锛屼笖涓嶅瓨鍦ㄦ湭瀹屾垚鐘舵�佺殑鍗曞瓙銆�
- if (Constant.YN_Y.equals(data.getTag())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- NoticeParam param = new NoticeParam();
- param.setCompanyId(data.getCompanyId());
- param.setDeptId(data.getDeptId());
-
- param.setCustomerId(data.getCustomerId());
- param.setDepotId(data.getDepotId());
- param.setFoodVariety(data.getFoodVariety());
- param.setYear(data.getYear());
- //鑻ユ湁鍚堝悓淇℃伅锛屾坊鍔犲悎鍚屼俊鎭�
- if (StringUtils.isNotEmpty(data.getContractId())) {
- param.setContractId(data.getContractId());
- }
- //鑻ユ湁璁″垝淇℃伅锛屾坊鍔犺鍒掍俊鎭�
- if (StringUtils.isNotEmpty(data.getPlanId())) {
- param.setPlanId(data.getPlanId());
- }
- param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
- Integer integer = inoutManagerService.queryNoticeOut(param);
- if (integer > 0) {
- return "鏂板鐨勫嚭搴撻�氱煡鍗曞凡瀛樺湪锛屼笉鑳藉啀娆℃柊澧烇紝璇锋牳鏌ワ紒";
- }
- }
+ //2023-09-02 鏆傛椂绂佺敤閫氱煡鍗曞敮涓�鎬у垽鏂紝鍘熷洜锛氬悓涓�涓崟浣嶆湁澶氫釜鍚堝悓锛屽氨鏈夊涓�氱煡鍗�
+// //鏂板鍑哄簱閫氱煡鍗曟椂锛岄渶瑕佽繘琛屽敮涓�鎬у垽鏂�傚嵆淇濊瘉鍗曚綅銆佷粨搴撱�佺伯椋熷搧绉嶃�佸勾浠藉敮涓�锛屼笖涓嶅瓨鍦ㄦ湭瀹屾垚鐘舵�佺殑鍗曞瓙銆�
+// if (Constant.YN_Y.equals(data.getTag())) {
+// data.setCompanyId(ContextUtil.getCompanyId());
+// NoticeParam param = new NoticeParam();
+// param.setCompanyId(data.getCompanyId());
+// param.setDeptId(data.getDeptId());
+//
+// param.setCustomerId(data.getCustomerId());
+// param.setDepotId(data.getDepotId());
+// param.setFoodVariety(data.getFoodVariety());
+// param.setYear(data.getYear());
+// //鑻ユ湁鍚堝悓淇℃伅锛屾坊鍔犲悎鍚屼俊鎭�
+// if (StringUtils.isNotEmpty(data.getContractId())) {
+// param.setContractId(data.getContractId());
+// }
+// //鑻ユ湁璁″垝淇℃伅锛屾坊鍔犺鍒掍俊鎭�
+// if (StringUtils.isNotEmpty(data.getPlanId())) {
+// param.setPlanId(data.getPlanId());
+// }
+// param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
+// Integer integer = inoutManagerService.queryNoticeOut(param);
+// if (integer > 0) {
+// return "鏂板鐨勫嚭搴撻�氱煡鍗曞凡瀛樺湪锛屼笉鑳藉啀娆℃柊澧烇紝璇锋牳鏌ワ紒";
+// }
+// }
Session session = this.getSessionFactory().openSession();
try {
@@ -303,7 +295,7 @@
}
str = (String) parameter.get("key");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and (name like:name or customerName like:customerName) ";
args.put("name", "%" + str + "%");
args.put("customerName", "%" + str + "%");
--
Gitblit v1.9.3