From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
index 37a7a54..0fc419d 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
@@ -9,6 +9,7 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -34,10 +35,11 @@
//=====================================搴撳尯璁惧=======================================//
public void pageData(Page<DeptDevice> page, Map<String, Object> param)
throws Exception {
- String hql = " from " + DeptDevice.class.getName() + " where companyId=:companyId";
+ String hql = " from " + DeptDevice.class.getName() + " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<>();
args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
if (null != param) {
hql = buildHql(hql, param, args);
@@ -57,14 +59,12 @@
if (null == data.getCompanyId()) {
data.setCompanyId(ContextUtil.getCompanyId());
}
- if (StringUtils.isEmpty(data.getKqdm())) {
- data.setKqdm(ContextUtil.subDeptId(null));
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(null));
}
- DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
- data.setKqmc(dept.getName());
data.setUpdateTime(new Date());
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ if (null == data.getSbbh()) {
+ data.setSbbh(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
}
session.saveOrUpdate(data);
} finally {
@@ -74,6 +74,39 @@
return null;
}
+ public String getIndex(String companyId) {
+ List<DeptDevice> list = getDataByTime(companyId);
+ int index = 10000;
+ if (list != null && list.size() > 0) {
+ String id = list.get(0).getSbbh().substring(8);
+ int temp = Integer.valueOf(id) + 1;
+ index += temp;
+ }else {
+ index ++;
+ }
+ return String.valueOf(index).substring(1);
+ }
+
+ private List<DeptDevice> getDataByTime(String companyId) {
+ String hql = " from " + DeptDevice.class.getName()
+ + " where companyId =:companyId ";
+
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", companyId);
+
+ hql += " and updateTime >:startTime";
+ args.put("startTime", DateUtil.getCurZero(new Date()));
+
+
+ hql += " and updateTime <:endTime";
+ args.put("endTime", DateUtil.getNextZero(new Date()));
+
+
+ hql += " order by id desc";
+
+ return this.query(hql, args);
+ }
+
public String delData(DeptDevice data) {
Session session = this.getSessionFactory().openSession();
try {
--
Gitblit v1.9.3