From 921ed67368431c332b68450a0407b0bd151052c5 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 26 五月 2023 12:20:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
index baeab8f..036d218 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
@@ -4,7 +4,6 @@
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.models.*;
-import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
@@ -501,8 +500,8 @@
* @param endTime
* @return
*/
- public List<MVarietyChange> listFoodVarietyChange(String companyId, String depotId, Date startTime, Date endTime) {
- String hql = " from " + MVarietyChange.class.getName() + " where companyId =:companyId";
+ public List<InoutVarietyChange> listFoodVarietyChange(String companyId, String depotId, Date startTime, Date endTime) {
+ String hql = " from " + InoutVarietyChange.class.getName() + " where companyId =:companyId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", companyId);
@@ -721,8 +720,8 @@
* @param endTime
* @return
*/
- public List<MPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
- String hql = " from " + MPlan.class.getName() + " where companyId =:companyId";
+ public List<InoutPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
+ String hql = " from " + InoutPlan.class.getName() + " where companyId =:companyId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", companyId);
@@ -751,9 +750,9 @@
* @param planId
* @return
*/
- public List<MPlanDetail> getPlanDetail(String planId) {
+ public List<InoutPlanDetail> getPlanDetail(String planId) {
- String hql = " from " + MPlanDetail.class.getName() + " where planId =:planId";
+ String hql = " from " + InoutPlanDetail.class.getName() + " where planId =:planId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("planId", planId);
@@ -768,8 +767,8 @@
* @param endTime
* @return
*/
- public List<MContract> listContract(String companyId, Date startTime, Date endTime){
- String hql = " from " + MContract.class.getName() + " where companyId =:companyId";
+ public List<InoutContract> listContract(String companyId, Date startTime, Date endTime){
+ String hql = " from " + InoutContract.class.getName() + " where companyId =:companyId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", companyId);
--
Gitblit v1.9.3