From 0265a4b398b7618880d5dcb6fdb50939409eb2a0 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 09 十月 2024 11:19:24 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/administration/service/WorkOvertimeService.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/product/administration/service/WorkOvertimeService.java b/src/main/java/com/product/administration/service/WorkOvertimeService.java
index 7ff0337..459b0d3 100644
--- a/src/main/java/com/product/administration/service/WorkOvertimeService.java
+++ b/src/main/java/com/product/administration/service/WorkOvertimeService.java
@@ -1,6 +1,7 @@
package com.product.administration.service;
import com.product.administration.config.CmnConst;
+import com.product.administration.config.SystemCode;
import com.product.common.lang.StringUtils;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
@@ -46,7 +47,7 @@
if(!StringUtils.isEmpty(dataFilter)){
filter += " and "+dataFilter;
}
- DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_WORK_OVERTIME,filter,param,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_WORK_OVERTIME,filter,param,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
@@ -57,7 +58,7 @@
* @Description: 鍔犵彮鐢宠璇︽儏
*/
public FieldSetEntity getWorkOvertimeInfo(FieldSetEntity fs) throws BaseException {
- return baseDao.listInternationDataTable(baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_WORK_OVERTIME, fs.getString(CmnConst.UUID), true),null);
+ return baseDao.listInternationDataTable(baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_WORK_OVERTIME, fs.getString(CmnConst.UUID), true),null);
}
/**
@@ -65,17 +66,18 @@
* @Author: ZhouJie
* @Description: 淇濆瓨鍔犵彮鐢宠(鏂板銆佷慨鏀�)
*/
- public String saveWorkOvertime(FieldSetEntity fs) throws BaseException {
- if(StringUtils.isEmpty(fs.getString(CmnConst.UUID))){
- fs.setValue("created_by",SpringMVCContextHolder.getCurrentUser().getUser_id());
- fs.setValue("created_utc_datetime",new Date());
- return baseDao.add(fs);
+ public boolean saveWorkOvertime(FieldSetEntity fse) throws BaseException {
+ BaseUtil.createCreatorAndCreationTime(fse);
+ FieldSetEntity fseRepeatData = null;
+ if(StringUtils.isEmpty(fse.getUUID())){
+ fseRepeatData = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_WORK_OVERTIME, "user_id = ? AND month = ?", new Object[] {fse.getString("user_id"), fse.getString("month")}, false);
}else {
- fs.setValue("updated_by",SpringMVCContextHolder.getCurrentUser().getUser_id());
- fs.setValue("updated_utc_datetime",new Date());
- baseDao.update(fs);
- return fs.getString(CmnConst.UUID);
+ fseRepeatData = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_WORK_OVERTIME, "user_id = ? AND month = ? AND uuid != ?", new Object[] {fse.getString("user_id"), fse.getString("month"), fse.getUUID()}, false);
}
+ if (fseRepeatData != null) {
+ throw new BaseException(SystemCode.SYSTEM_SAVE_FAIL_DATA_READY_EXIST.getValue(), SystemCode.SYSTEM_SAVE_FAIL_DATA_READY_EXIST.getText());
+ }
+ return baseDao.saveFieldSetEntity(fse);
}
/**
@@ -86,6 +88,6 @@
public boolean deleteWorkOvertime(FieldSetEntity fs) throws BaseException {
String uuid = fs.getUUID();
String[] uuids = uuid.split(",");
- return baseDao.delete(CmnConst.PRODUCT_SYS_WORK_OVERTIME, BaseUtil.buildQuestionMarkFilter(CmnConst.UUID, uuids.length, true), uuids);
+ return baseDao.delete(CmnConst.PRODUCT_OA_WORK_OVERTIME, BaseUtil.buildQuestionMarkFilter(CmnConst.UUID, uuids.length, true), uuids);
}
}
\ No newline at end of file
--
Gitblit v1.9.2