From 2411d88ab5411fed8928ace4d3c46a62dedd00fc Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 12 九月 2023 12:10:34 +0800
Subject: [PATCH] 测试提交
---
igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 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 7b64f1b..37a7a54 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
@@ -1,17 +1,22 @@
package com.ld.igds.oa.service;
+import com.bstek.bdf2.core.model.DefaultDept;
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.DeptDevice;
import com.ld.igds.models.DeviceCheckup;
+import com.ld.igds.sys.service.SysDeptService;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -21,6 +26,10 @@
*/
@Component
public class HDeptDeviceService extends HibernateDao {
+
+ @Autowired
+ private SysDeptService sysDeptService;
+
//=====================================搴撳尯璁惧=======================================//
public void pageData(Page<DeptDevice> page, Map<String, Object> param)
@@ -45,7 +54,15 @@
Session session = this.getSessionFactory().openSession();
try {
- data.setCompanyId(ContextUtil.getCompanyId());
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getKqdm())) {
+ data.setKqdm(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());
}
@@ -60,7 +77,15 @@
public String delData(DeptDevice data) {
Session session = this.getSessionFactory().openSession();
try {
+ Map<String, Object> param = new HashMap<>();
+ param.put("code", data.getSbbh());
+ List<DeviceCheckup> list = this.listCheck(param);
+ for (DeviceCheckup checkup : list) {
+ session.delete(checkup);
+ }
session.delete(data);
+ } catch (Exception e) {
+ e.printStackTrace();
} finally {
session.flush();
session.close();
@@ -88,11 +113,34 @@
}
+ public List<DeviceCheckup> listCheck(Map<String, Object> param) throws Exception {
+ String hql = " from " + DeviceCheckup.class.getName() + " where companyId=:companyId";
+
+ Map<String, Object> args = new HashMap<>();
+ args.put("companyId", ContextUtil.getCompanyId());
+
+ if (null != param) {
+ hql = buildHql(hql, param, args);
+ }
+
+ hql += " order by jdsj desc";
+
+ return this.query(hql, args);
+ }
+
public String saveCheck(DeviceCheckup data) {
Session session = this.getSessionFactory().openSession();
try {
- data.setCompanyId(ContextUtil.getCompanyId());
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getKqdm())) {
+ data.setKqdm(ContextUtil.subDeptId(null));
+ }
+ DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
+ data.setKqmc(dept.getName());
+ data.setZhgxsj(new Date());
if (null == data.getId()) {
data.setId(ContextUtil.getUUID());
}
--
Gitblit v1.9.3