Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
57c6cc0f
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
57c6cc0f
编写于
10月 16, 2020
作者:
L
luojing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复多人同时打卡时后台更新数据锁死
上级
3a6187dc
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
8 addition
and
38 deletion
+8
-38
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/CacheUtil.java
...ain/java/com/x/attendance/assemble/control/CacheUtil.java
+0
-1
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/QueueAttendanceDetailStatistic.java
...ance/assemble/control/QueueAttendanceDetailStatistic.java
+0
-3
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/QueuePersonAttendanceDetailAnalyse.java
.../assemble/control/QueuePersonAttendanceDetailAnalyse.java
+0
-4
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/ActionDelete.java
...ontrol/jaxrs/attendancestatisticalcycle/ActionDelete.java
+0
-1
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/ActionSave.java
.../control/jaxrs/attendancestatisticalcycle/ActionSave.java
+0
-1
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/BaseAction.java
.../control/jaxrs/attendancestatisticalcycle/BaseAction.java
+2
-4
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceworkdayconfig/ActionDelete.java
...e/control/jaxrs/attendanceworkdayconfig/ActionDelete.java
+0
-2
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceworkdayconfig/ActionSave.java
...ble/control/jaxrs/attendanceworkdayconfig/ActionSave.java
+0
-1
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionDelete.java
...ance/assemble/control/jaxrs/selfholiday/ActionDelete.java
+0
-2
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionDeleteByWfDocId.java
...mble/control/jaxrs/selfholiday/ActionDeleteByWfDocId.java
+0
-1
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionSave.java
...ndance/assemble/control/jaxrs/selfholiday/ActionSave.java
+0
-9
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/BaseAction.java
...ndance/assemble/control/jaxrs/selfholiday/BaseAction.java
+2
-4
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java
...emble/control/service/AttendanceDetailAnalyseService.java
+0
-4
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailServiceAdv.java
.../assemble/control/service/AttendanceDetailServiceAdv.java
+4
-1
未找到文件。
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/CacheUtil.java
浏览文件 @
57c6cc0f
package
com.x.attendance.assemble.control
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.CacheManager
;
/**
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/QueueAttendanceDetailStatistic.java
浏览文件 @
57c6cc0f
...
...
@@ -5,11 +5,9 @@ import com.x.attendance.assemble.control.service.*;
import
com.x.attendance.entity.AttendanceStatisticRequireLog
;
import
com.x.attendance.entity.AttendanceStatisticalCycle
;
import
com.x.attendance.entity.AttendanceWorkDayConfig
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.queue.AbstractQueue
;
import
net.sf.ehcache.Ehcache
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -28,7 +26,6 @@ public class QueueAttendanceDetailStatistic extends AbstractQueue<String> {
AttendanceStatisticalCycleServiceAdv
statisticalCycleServiceAdv
=
new
AttendanceStatisticalCycleServiceAdv
();
AttendanceStatisticRequireLog
log
=
statisticRequireLogServiceAdv
.
get
(
logId
);
Ehcache
cache
=
ApplicationCache
.
instance
().
getCache
(
AttendanceStatisticalCycle
.
class
);
if
(
log
!=
null
){
logger
.
debug
(
"system try to statistic attendance detail, logId:"
+
logId
);
AttendanceStatisticalCycle
attendanceStatisticalCycle
=
null
;
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/QueuePersonAttendanceDetailAnalyse.java
浏览文件 @
57c6cc0f
...
...
@@ -7,13 +7,9 @@ import com.x.attendance.assemble.control.service.AttendanceWorkDayConfigServiceA
import
com.x.attendance.entity.AttendanceDetail
;
import
com.x.attendance.entity.AttendanceStatisticalCycle
;
import
com.x.attendance.entity.AttendanceWorkDayConfig
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.queue.AbstractQueue
;
import
net.sf.ehcache.Ehcache
;
import
net.sf.ehcache.Element
;
import
java.util.List
;
import
java.util.Map
;
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/ActionDelete.java
浏览文件 @
57c6cc0f
...
...
@@ -5,7 +5,6 @@ import com.x.attendance.entity.AttendanceStatisticalCycle;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.annotation.CheckRemoveType
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.CacheManager
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/ActionSave.java
浏览文件 @
57c6cc0f
...
...
@@ -14,7 +14,6 @@ import com.x.base.core.entity.JpaObject;
import
com.x.base.core.entity.annotation.CheckPersistType
;
import
com.x.base.core.project.bean.WrapCopier
;
import
com.x.base.core.project.bean.WrapCopierFactory
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.CacheManager
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/BaseAction.java
浏览文件 @
57c6cc0f
...
...
@@ -3,13 +3,11 @@ package com.x.attendance.assemble.control.jaxrs.attendancestatisticalcycle;
import
com.x.attendance.assemble.common.date.DateOperation
;
import
com.x.attendance.assemble.control.service.UserManagerService
;
import
com.x.attendance.entity.AttendanceStatisticalCycle
;
import
com.x.base.core.project.cache.
Application
Cache
;
import
com.x.base.core.project.cache.Cache
;
import
com.x.base.core.project.jaxrs.StandardJaxrsAction
;
import
net.sf.ehcache.Ehcache
;
public
class
BaseAction
extends
StandardJaxrsAction
{
protected
Ehcache
cache
=
ApplicationCache
.
instance
().
getCache
(
AttendanceStatisticalCycle
.
class
);
protected
Cache
.
CacheCategory
cache
=
new
Cache
.
CacheCategory
(
AttendanceStatisticalCycle
.
class
);
protected
UserManagerService
userManagerService
=
new
UserManagerService
();
protected
DateOperation
dateOperation
=
new
DateOperation
();
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceworkdayconfig/ActionDelete.java
浏览文件 @
57c6cc0f
...
...
@@ -2,12 +2,10 @@ package com.x.attendance.assemble.control.jaxrs.attendanceworkdayconfig;
import
javax.servlet.http.HttpServletRequest
;
import
com.x.attendance.entity.AttendanceStatisticalCycle
;
import
com.x.attendance.entity.AttendanceWorkDayConfig
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.annotation.CheckRemoveType
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.CacheManager
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceworkdayconfig/ActionSave.java
浏览文件 @
57c6cc0f
...
...
@@ -14,7 +14,6 @@ import com.x.base.core.entity.JpaObject;
import
com.x.base.core.entity.annotation.CheckPersistType
;
import
com.x.base.core.project.bean.WrapCopier
;
import
com.x.base.core.project.bean.WrapCopierFactory
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.CacheManager
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionDelete.java
浏览文件 @
57c6cc0f
...
...
@@ -7,11 +7,9 @@ import javax.servlet.http.HttpServletRequest;
import
com.x.attendance.assemble.control.ThisApplication
;
import
com.x.attendance.entity.AttendanceSelfHoliday
;
import
com.x.attendance.entity.AttendanceStatisticalCycle
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.annotation.CheckRemoveType
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.CacheManager
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionDeleteByWfDocId.java
浏览文件 @
57c6cc0f
...
...
@@ -10,7 +10,6 @@ import com.x.attendance.entity.AttendanceSelfHoliday;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.annotation.CheckRemoveType
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.CacheManager
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionSave.java
浏览文件 @
57c6cc0f
...
...
@@ -4,16 +4,11 @@ import com.google.gson.JsonElement;
import
com.x.attendance.assemble.control.ExceptionWrapInConvert
;
import
com.x.attendance.assemble.control.ThisApplication
;
import
com.x.attendance.entity.AttendanceSelfHoliday
;
import
com.x.attendance.entity.AttendanceStatisticalCycle
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.AbstractPersistenceProperties
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.entity.annotation.CheckPersist
;
import
com.x.base.core.entity.annotation.CheckPersistType
;
import
com.x.base.core.entity.annotation.CheckRemoveType
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.CacheManager
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
...
...
@@ -25,13 +20,9 @@ import com.x.base.core.project.organization.Unit;
import
com.x.base.core.project.tools.ListTools
;
import
org.apache.commons.lang3.StringUtils
;
import
javax.persistence.Column
;
import
javax.persistence.Temporal
;
import
javax.persistence.TemporalType
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
public
class
ActionSave
extends
BaseAction
{
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/BaseAction.java
浏览文件 @
57c6cc0f
...
...
@@ -5,14 +5,12 @@ import com.x.attendance.assemble.control.service.AttendanceSelfHolidayServiceAdv
import
com.x.attendance.assemble.control.service.AttendanceStatisticalCycleServiceAdv
;
import
com.x.attendance.assemble.control.service.UserManagerService
;
import
com.x.attendance.entity.AttendanceSelfHoliday
;
import
com.x.attendance.entity.AttendanceStatisticalCycle
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.Cache
;
import
com.x.base.core.project.jaxrs.StandardJaxrsAction
;
import
net.sf.ehcache.Ehcache
;
public
class
BaseAction
extends
StandardJaxrsAction
{
protected
Ehcache
cache
=
ApplicationCache
.
instance
().
getCache
(
AttendanceSelfHoliday
.
class
);
protected
Cache
.
CacheCategory
cache
=
new
Cache
.
CacheCategory
(
AttendanceSelfHoliday
.
class
);
protected
UserManagerService
userManagerService
=
new
UserManagerService
();
protected
AttendanceStatisticalCycleServiceAdv
attendanceStatisticCycleServiceAdv
=
new
AttendanceStatisticalCycleServiceAdv
();
protected
AttendanceDetailAnalyseServiceAdv
attendanceDetailAnalyseServiceAdv
=
new
AttendanceDetailAnalyseServiceAdv
();
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java
浏览文件 @
57c6cc0f
...
...
@@ -7,16 +7,12 @@ import java.util.List;
import
java.util.Map
;
import
com.x.attendance.assemble.control.ThisApplication
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.tools.ListTools
;
import
net.sf.ehcache.Ehcache
;
import
net.sf.ehcache.Element
;
import
org.apache.commons.lang3.StringUtils
;
import
com.x.attendance.assemble.common.date.DateOperation
;
import
com.x.attendance.assemble.control.Business
;
import
com.x.attendance.assemble.control.factory.AttendanceStatisticRequireLogFactory
;
import
com.x.attendance.assemble.control.jaxrs.attendancedetail.AttendanceCycles
;
import
com.x.attendance.entity.AttendanceDetail
;
import
com.x.attendance.entity.AttendanceScheduleSetting
;
import
com.x.attendance.entity.AttendanceSelfHoliday
;
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailServiceAdv.java
浏览文件 @
57c6cc0f
...
...
@@ -307,6 +307,7 @@ public class AttendanceDetailServiceAdv {
}
if
(
detail_old
==
null
)
{
detail
.
setBatchName
(
"FromMobile_"
+
dateOperation
.
getNowTimeChar
()
);
detail
.
setRecordStatus
(
1
);
emc
.
beginTransaction
(
AttendanceDetail
.
class
);
emc
.
persist
(
detail
,
CheckPersistType
.
all
);
emc
.
commit
();
...
...
@@ -314,15 +315,17 @@ public class AttendanceDetailServiceAdv {
}
else
{
emc
.
beginTransaction
(
AttendanceDetail
.
class
);
detail
.
copyTo
(
detail_old
,
JpaObject
.
FieldsUnmodify
);
detail_old
.
setRecordStatus
(
1
);
emc
.
check
(
detail_old
,
CheckPersistType
.
all
);
emc
.
commit
();
}
/*可能引起多人同时打卡时commit error
emc.beginTransaction( AttendanceDetailMobile.class );
for( AttendanceDetailMobile detailMobile : mobileDetails ) {
detailMobile.setRecordStatus(1);
emc.check( detailMobile , CheckPersistType.all );
}
emc
.
commit
();
emc.commit();
*/
//分析保存好的考勤数据
try
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录