From 7e864f157e98e468de60aea1658c66a2d8d5d53f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 28 七月 2023 17:26:53 +0800
Subject: [PATCH] 单兵端-新任务轮询接口-获取最新任务接口
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
index b6986bd..61bc650 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -111,7 +111,7 @@
public int insertArdAppTask(ArdAppTask ardAppTask) {
ardAppTask.setId(IdUtils.simpleUUID());
ardAppTask.setUserId(SecurityUtils.getUserId());
- ardAppTask.setCreateBy(SecurityUtils.getUsername());
+ ardAppTask.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
ardAppTask.setCreateTime(DateUtils.getNowDate());
int rows = ardAppTaskMapper.insertArdAppTask(ardAppTask);
insertArdAppTaskPic(ardAppTask);
@@ -249,8 +249,15 @@
*/
@Override
public int updateArdAppTaskDetail(ArdAppTaskDetail ardAppTaskDetail) {
+ ardAppTaskDetail.setClockInTime(DateUtils.getNowDate());
insertArdAppTaskPic(ardAppTaskDetail);
return ardAppTaskMapper.updateArdAppTaskDetail(ardAppTaskDetail);
+ }
+
+ @Override
+ public int updateArdAppTaskDetailView(ArdAppTaskDetail ardAppTaskDetail) {
+ ardAppTaskDetail.setViewTime(DateUtils.getNowDate());
+ return ardAppTaskMapper.updateArdAppTaskDetailView(ardAppTaskDetail);
}
/**
@@ -262,6 +269,7 @@
List<ArdAppTaskDetailPic> ardAppTaskDetailPicList = ardAppTaskDetail.getArdAppTaskDetailPic();
String detailId = ardAppTaskDetail.getId();
if (StringUtils.isNotNull(ardAppTaskDetailPicList)) {
+ ardAppTaskMapper.deleteArdAppTaskDetailPicByTaskDetailId(detailId);
List<ArdAppTaskDetailPic> list = new ArrayList<ArdAppTaskDetailPic>();
for (ArdAppTaskDetailPic ardAppTaskDetailPic : ardAppTaskDetailPicList) {
ardAppTaskDetailPic.setId(IdUtils.simpleUUID());
@@ -269,9 +277,13 @@
list.add(ardAppTaskDetailPic);
}
if (list.size() > 0) {
- ardAppTaskMapper.deleteArdAppTaskDetailPicByTaskDetailId(detailId);
ardAppTaskMapper.batchArdAppTaskDetailPic(list);
}
}
}
+
+ @Override
+ public ArdAppTask selectNewArdAppTaskByUserId(String userId) {
+ return ardAppTaskMapper.selectNewArdAppTaskByUserId(userId);
+ }
}
--
Gitblit v1.9.3