From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java | 156 ++++++++++++++++++++++++++-------------------------
1 files changed, 80 insertions(+), 76 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
index 13a5496..30878f1 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
@@ -16,88 +16,92 @@
@Component
public class HContractManageService extends HibernateDao {
- public void pageContract(Page<InoutContract> page, Map<String, Object> param)
- throws Exception {
- String hql = " from " + InoutContract.class.getName()
- + " where companyId =:companyId and deptId =:deptId";
+ public void pageContract(Page<InoutContract> page, Map<String, Object> param)
+ throws Exception {
+ String hql = " from " + InoutContract.class.getName()
+ + " where companyId =:companyId and deptId =:deptId";
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
- args.put("deptId", ContextUtil.subDeptId(null));
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
- if (null != param) {
- String str = (String) param.get("type");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and type =:type";
- args.put("type", str);
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and name like:name";
- args.put("name", "%" + str + "%");
- }
- str = (String) param.get("customerName");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and customerName like:customerName";
- args.put("customerName", "%" + str + "%");
- }
- Integer year = (Integer) param.get("year");
- if (null != year) {
- hql += " and year =:year";
- args.put("year", String.valueOf(year));
- }
- str = (String) param.get("key");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and (name like :name or planName like:planName) ";
- args.put("name", "%" + str + "%");
- args.put("planName", "%" + str + "%");
- }
- }
+ if (null != param && param.size() != 0) {
+ String str = (String) param.get("type");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and type =:type";
+ args.put("type", str);
+ }
+ str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and name like:name";
+ args.put("name", "%" + str + "%");
+ }
+ str = (String) param.get("customerName");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and customerName like:customerName";
+ args.put("customerName", "%" + str + "%");
+ }
+ Integer year = (Integer) param.get("year");
+ if (null != year) {
+ hql += " and year =:year";
+ args.put("year", String.valueOf(year));
+ }
+ str = (String) param.get("key");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and (name like :name or planName like:planName) ";
+ args.put("name", "%" + str + "%");
+ args.put("planName", "%" + str + "%");
+ }
+ }
- String count = "select count(*) " + hql;
- hql += " order by createTime desc";
+ String count = "select count(*) " + hql;
+ hql += " order by createTime desc";
- this.pagingQuery(page, hql, count, args);
- }
+ this.pagingQuery(page, hql, count, args);
+ }
- public void saveContract(InoutContract data) {
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
- if(StringUtils.isEmpty(data.getDeptId())){
- data.setDeptId(ContextUtil.subDeptId(null));
- }
- Session session = this.getSessionFactory().openSession();
+ public void saveContract(InoutContract data) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ if (StringUtils.isEmpty(data.getCreateUser())) {
+ data.setCreateUser(ContextUtil.getLoginUserCName());
+ }
+ data.setUpdateTime(new Date());
+ Session session = this.getSessionFactory().openSession();
- try {
- if (null == data.getId()) {
- data.setId(InoutManageUtil.createContractId(data.getType()));
- data.setCreateTime(new Date());
- session.save(data);
- } else {
- session.update(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- }
+ try {
+ if (null == data.getId()) {
+ data.setId(InoutManageUtil.createContractId(data.getType()));
+ data.setCreateTime(new Date());
+ session.save(data);
+ } else {
+ session.update(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ }
- public String delContract(InoutContract data) {
- Session session = this.getSessionFactory().openSession();
- try {
- if (null != data.getId()) {
- session.delete(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- return null;
- }
+ public String delContract(InoutContract data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getId()) {
+ session.delete(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3