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-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
index fd9718a..daac4f3 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
@@ -1,5 +1,6 @@
package com.ld.igds.drug.service;
+import com.bstek.bdf2.core.business.IUser;
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.DrugLog;
@@ -20,10 +21,10 @@
public void pageData(Page<DrugLog> page, Map<String, Object> param)
throws Exception {
String hql = " from " + DrugLog.class.getName()
- + " where companyId=:companyId";
+ + " where deptId=:deptId";
Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
if (null != param) {
@@ -34,8 +35,18 @@
}
str = (String) param.get("name");
if (StringUtils.isNotEmpty(str)) {
- hql += " and user =:name";
+ hql += " and user like:name";
args.put("name", "%" + str + "%");
+ }
+ Date date = (Date) param.get("start");
+ if (null != date) {
+ hql +=(" and start >=:start");
+ args.put("start", date);
+ }
+ date = (Date) param.get("end");
+ if (null != date) {
+ hql +=(" and end <=:end");
+ args.put("end", date);
}
}
@@ -97,7 +108,7 @@
data.setUpdateUser(ContextUtil.getLoginUserCName());
try {
if (null == data.getId()) {
- data.setId(data.getDepotId() + DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
+ data.setId(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
session.save(data);
} else {
session.update(data);
--
Gitblit v1.9.3