Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
promotion-service
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
promotion
promotion-service
Commits
3abca5af
提交
3abca5af
authored
11月 13, 2025
作者:
吕本才
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor(temporary): 重构临时活动任务打卡逻辑 -id赋值修改
上级
5cbd8228
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
8 行增加
和
6 行删除
+8
-6
TemporaryActivityTaskClockCoreController.java
...y/temporary/TemporaryActivityTaskClockCoreController.java
+1
-1
EmployeeCoreTemClockServiceImpl.java
...activity/manage/impl/EmployeeCoreTemClockServiceImpl.java
+1
-1
TemporaryActivityTaskClockService.java
...activity/temporary/TemporaryActivityTaskClockService.java
+1
-1
TemporaryActivityTaskClockServiceImpl.java
...temporary/impl/TemporaryActivityTaskClockServiceImpl.java
+2
-3
TemporaryActivityTaskClockSocketHandler.java
...on/websocket/TemporaryActivityTaskClockSocketHandler.java
+3
-0
没有找到文件。
src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityTaskClockCoreController.java
浏览文件 @
3abca5af
...
@@ -28,7 +28,7 @@ public class TemporaryActivityTaskClockCoreController {
...
@@ -28,7 +28,7 @@ public class TemporaryActivityTaskClockCoreController {
*/
*/
@PostMapping
(
"/clock"
)
@PostMapping
(
"/clock"
)
public
R
clock
(
@RequestBody
TemporaryActivityTaskClockReq
clockVo
)
{
public
R
clock
(
@RequestBody
TemporaryActivityTaskClockReq
clockVo
)
{
service
.
c
lock
(
clockVo
);
service
.
taskC
lock
(
clockVo
);
return
R
.
success
();
return
R
.
success
();
}
}
...
...
src/main/java/com/wangxiaolu/promotion/service/activity/manage/impl/EmployeeCoreTemClockServiceImpl.java
浏览文件 @
3abca5af
...
@@ -92,7 +92,7 @@ public class EmployeeCoreTemClockServiceImpl implements EmployeeCoreTemClockServ
...
@@ -92,7 +92,7 @@ public class EmployeeCoreTemClockServiceImpl implements EmployeeCoreTemClockServ
temporaryActivityPhotoDao
.
updateStatus
(
tpw
,
StatusType
.
INVALID
.
getType
());
temporaryActivityPhotoDao
.
updateStatus
(
tpw
,
StatusType
.
INVALID
.
getType
());
TemporaryTaskClockDto
updateTaskClockDto
=
new
TemporaryTaskClockDto
();
TemporaryTaskClockDto
updateTaskClockDto
=
new
TemporaryTaskClockDto
();
updateTaskClockDto
.
setId
(
clockDto
.
getId
())
updateTaskClockDto
.
set
Clock
Id
(
clockDto
.
getId
())
.
setIsDelete
(
FlagType
.
YES
.
getType
());
.
setIsDelete
(
FlagType
.
YES
.
getType
());
taskClockDao
.
updateTaskClock
(
updateTaskClockDto
);
taskClockDao
.
updateTaskClock
(
updateTaskClockDto
);
return
clockDto
.
getPlanId
();
return
clockDto
.
getPlanId
();
...
...
src/main/java/com/wangxiaolu/promotion/service/activity/temporary/TemporaryActivityTaskClockService.java
浏览文件 @
3abca5af
...
@@ -18,7 +18,7 @@ public interface TemporaryActivityTaskClockService extends IService<TemporaryAct
...
@@ -18,7 +18,7 @@ public interface TemporaryActivityTaskClockService extends IService<TemporaryAct
List
<
TemporaryActivityTaskClockDO
>
listByUserId
();
List
<
TemporaryActivityTaskClockDO
>
listByUserId
();
void
c
lock
(
TemporaryActivityTaskClockReq
clockVo
);
void
taskC
lock
(
TemporaryActivityTaskClockReq
clockVo
);
TemporaryActivityTaskClockRes
queryByMyTaskType
(
Integer
taskType
);
TemporaryActivityTaskClockRes
queryByMyTaskType
(
Integer
taskType
);
}
}
src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityTaskClockServiceImpl.java
浏览文件 @
3abca5af
...
@@ -145,7 +145,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
...
@@ -145,7 +145,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
* @param clockVo
* @param clockVo
*/
*/
@Override
@Override
public
void
c
lock
(
TemporaryActivityTaskClockReq
clockVo
)
{
public
void
taskC
lock
(
TemporaryActivityTaskClockReq
clockVo
)
{
TemporaryActivityTaskClockDO
taskClockDO
=
temporaryActivityTaskClockDao
.
selectById
(
clockVo
.
getId
());
TemporaryActivityTaskClockDO
taskClockDO
=
temporaryActivityTaskClockDao
.
selectById
(
clockVo
.
getId
());
if
(
taskClockDO
==
null
)
{
if
(
taskClockDO
==
null
)
{
throw
new
IllegalArgumentException
(
"打卡任务不存在"
);
throw
new
IllegalArgumentException
(
"打卡任务不存在"
);
...
@@ -161,7 +161,6 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
...
@@ -161,7 +161,6 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
}
}
}
}
BeanUtils
.
copyProperties
(
clockVo
,
taskClockDO
);
BeanUtils
.
copyProperties
(
clockVo
,
taskClockDO
);
// 更新 任务状态为未完成,打卡时间为当前时间
// 更新 任务状态为未完成,打卡时间为当前时间
taskClockDO
.
setTaskStatus
(
ActivityClockTaskStatus
.
COMPLETED
.
getType
());
taskClockDO
.
setTaskStatus
(
ActivityClockTaskStatus
.
COMPLETED
.
getType
());
taskClockDO
.
setClockTime
(
new
Date
());
taskClockDO
.
setClockTime
(
new
Date
());
...
@@ -169,7 +168,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
...
@@ -169,7 +168,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
temporaryActivityTaskClockDao
.
update
(
taskClockDO
);
temporaryActivityTaskClockDao
.
update
(
taskClockDO
);
TemporaryActivityPhotoDto
dto
=
new
TemporaryActivityPhotoDto
();
TemporaryActivityPhotoDto
dto
=
new
TemporaryActivityPhotoDto
();
dto
.
setClockId
(
taskClockDO
.
getId
())
dto
.
setClockId
(
taskClockDO
.
get
Clock
Id
())
.
setTemporaryId
(
taskClockDO
.
getTemporaryId
())
.
setTemporaryId
(
taskClockDO
.
getTemporaryId
())
.
setReportedId
(
taskClockDO
.
getReportedId
())
.
setReportedId
(
taskClockDO
.
getReportedId
())
.
setType
(
clockVo
.
getTaskType
());
.
setType
(
clockVo
.
getTaskType
());
...
...
src/main/java/com/wangxiaolu/promotion/websocket/TemporaryActivityTaskClockSocketHandler.java
浏览文件 @
3abca5af
...
@@ -162,6 +162,9 @@ public class TemporaryActivityTaskClockSocketHandler extends TextWebSocketHandle
...
@@ -162,6 +162,9 @@ public class TemporaryActivityTaskClockSocketHandler extends TextWebSocketHandle
return
0
;
return
0
;
}
}
return
1
;
return
1
;
}
else
{
log
.
warn
(
"用户["
+
userId
+
"]不存在链接"
);
}
}
return
0
;
return
0
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论