From 1d1d34b48e6e80bea350d805d8ff2564ca226f25 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 19 八月 2024 13:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0
---
src/main/java/com/product/administration/service/LeaveRequestService.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/product/administration/service/LeaveRequestService.java b/src/main/java/com/product/administration/service/LeaveRequestService.java
index 8d32b7d..3eb4b21 100644
--- a/src/main/java/com/product/administration/service/LeaveRequestService.java
+++ b/src/main/java/com/product/administration/service/LeaveRequestService.java
@@ -61,16 +61,23 @@
* 璇峰亣鐢宠淇濆瓨
*/
public String saveLeaveRequest(FieldSetEntity fs) throws BaseException {
-// fs.setValue("org_level_uuid", SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());//鍏徃
-// fs.setValue("fill_in_time", new Date());//濉崟鏃堕棿
-// fs.setValue("department_uuid", SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());//閮ㄩ棬
- fs.setValue("created_by", SpringMVCContextHolder.getCurrentUser().getUser_id());//濮撳悕
- fs.setValue("flow_flag", 0);
- if(StringUtils.isEmpty(fs.getString(CmnConst.UUID))){
- return baseDao.add(fs);
+ DataTableEntity dataTableEntity = baseDao.listTable(CmnConst.PRODUCT_SYS_ASK_FOR_LEAVE, " uuid not in (?) and user_id=? and ((start_time<=? and end_time>=?) or(start_time<=? and end_time>=?))"
+ , new String[]{StringUtils.isEmpty(fs.getUUID())?"":fs.getUUID(), fs.getString("user_id"), fs.getString("start_time"), fs.getString("start_time"), fs.getString("end_time"), fs.getString("end_time")});
+ if (dataTableEntity.getRows()>0){
+ return "1";
}else {
- baseDao.update(fs);
- return fs.getString(CmnConst.UUID);
+ if (StringUtils.isEmpty(fs.getString(CmnConst.UUID))) {
+ fs.setValue("created_by", SpringMVCContextHolder.getCurrentUser().getUser_id());
+ fs.setValue("created_utc_datetime", new Date());
+ fs.setValue("org_level_uuid", SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());
+ return baseDao.add(fs);
+ } else {
+ fs.setValue("updated_by", SpringMVCContextHolder.getCurrentUser().getUser_id());
+ fs.setValue("updated_utc_datetime", new Date());
+ baseDao.update(fs);
+ return fs.getString(CmnConst.UUID);
+ }
+
}
}
/**
--
Gitblit v1.9.2