From 21bf8b454eee7e80d9471e4424e7520c4f82f3a7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 25 七月 2023 11:55:14 +0800
Subject: [PATCH] 通知单及合同相关优化
---
igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 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 cd2312f..21f6ab5 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
@@ -15,6 +15,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
+
import java.util.*;
@Repository
@@ -96,11 +97,11 @@
param.setFoodVariety(data.getFoodVariety());
param.setYear(data.getYear());
//鑻ユ湁鍚堝悓淇℃伅锛屾坊鍔犲悎鍚屼俊鎭�
- if(StringUtils.isNotEmpty(data.getContractId())){
+ if (StringUtils.isNotEmpty(data.getContractId())) {
param.setContractId(data.getContractId());
}
//鑻ユ湁璁″垝淇℃伅锛屾坊鍔犺鍒掍俊鎭�
- if(StringUtils.isNotEmpty(data.getPlanId())){
+ if (StringUtils.isNotEmpty(data.getPlanId())) {
param.setPlanId(data.getPlanId());
}
param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
@@ -213,11 +214,11 @@
param.setFoodVariety(data.getFoodVariety());
param.setYear(data.getYear());
//鑻ユ湁鍚堝悓淇℃伅锛屾坊鍔犲悎鍚屼俊鎭�
- if(StringUtils.isNotEmpty(data.getContractId())){
+ if (StringUtils.isNotEmpty(data.getContractId())) {
param.setContractId(data.getContractId());
}
//鑻ユ湁璁″垝淇℃伅锛屾坊鍔犺鍒掍俊鎭�
- if(StringUtils.isNotEmpty(data.getPlanId())){
+ if (StringUtils.isNotEmpty(data.getPlanId())) {
param.setPlanId(data.getPlanId());
}
param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
@@ -257,6 +258,7 @@
/**
* 鏍规嵁鍙傛暟鏌ヨ鍑哄叆搴撻�氱煡鍗�
+ *
* @param parameter
* @return
*/
@@ -271,15 +273,15 @@
String hql = " from ";
if (InoutConstant.TYPE_IN.equals(type)) {
hql += InoutNoticeIn.class.getName();
- }else {
+ } else {
hql += InoutNoticeOut.class.getName();
}
- hql += " where companyId =:companyId and deptId =:deptId";
+ hql += " where companyId =:companyId and deptId =:deptId and completeStatus =:completeStatus";
Map<String, Object> args = new HashMap<>();
args.put("companyId", ContextUtil.getCompanyId());
args.put("deptId", ContextUtil.subDeptId(null));
-
+ args.put("completeStatus", "NONE");
String str = (String) parameter.get("customerId");
if (StringUtils.isNotEmpty(str)) {
hql += " and customerId =:customerId";
@@ -292,7 +294,7 @@
args.put("foodVariety", str);
}
- if(InoutConstant.TYPE_OUT.equals(type)){
+ if (InoutConstant.TYPE_OUT.equals(type)) {
str = (String) parameter.get("depotId");
if (StringUtils.isNotEmpty(str)) {
hql += " and depotId =:depotId";
@@ -311,13 +313,13 @@
List<Object> list1 = this.query(hql, args);
List<NoticeDto> list = new ArrayList<>();
- if(list1 == null || list1.isEmpty()){
+ if (list1 == null || list1.isEmpty()) {
return null;
}
NoticeDto dto;
for (Object o : list1) {
dto = new NoticeDto();
- BeanUtils.copyProperties(o,dto);
+ BeanUtils.copyProperties(o, dto);
list.add(dto);
}
return list;
@@ -325,19 +327,20 @@
/**
* 鏍规嵁id鑾峰彇閫氱煡鍗曚俊鎭�
+ *
* @param id
* @param type
* @return
*/
public NoticeDto queryNoticeById(String id, String type) {
- if(StringUtils.isEmpty(id) || StringUtils.isEmpty(type)){
+ if (StringUtils.isEmpty(id) || StringUtils.isEmpty(type)) {
return null;
}
String hql = " from ";
if (InoutConstant.TYPE_IN.equals(type)) {
hql += InoutNoticeIn.class.getName();
- }else {
+ } else {
hql += InoutNoticeOut.class.getName();
}
hql += " where companyId =:companyId and deptId =:deptId and id =:id";
@@ -350,7 +353,7 @@
hql += " order by id ";
List<Object> list = this.query(hql, args);
- if(list == null || list.isEmpty()){
+ if (list == null || list.isEmpty()) {
return null;
}
NoticeDto dto = new NoticeDto();
--
Gitblit v1.9.3