From bfc9d5ca46948fbe0623211c030de200df04aba2 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 28 七月 2023 12:39:05 +0800
Subject: [PATCH] 删除任务查看时间和查看位置 增加任务详情打卡时间
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 9 ++
ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java | 8 ++
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 45 ++++++++-------
ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java | 7 ++
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 11 +++
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java | 20 +++++-
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java | 23 -------
7 files changed, 72 insertions(+), 51 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index afe193d..3fc7278 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -39,6 +39,7 @@
private IArdAppTaskService ardAppTaskService;
@Autowired
private ISysUserService sysUserService;
+
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
*/
@@ -58,6 +59,7 @@
List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
return getDataTable(ardAppTasks);
}
+
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/userDetailById")
@@ -65,6 +67,7 @@
List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetailById(ardAppTask);
return AjaxResult.success(ardAppTasks);
}
+
/**
* 瀵煎嚭app浠诲姟绠＄悊鍒楄〃
*/
@@ -100,7 +103,6 @@
/**
* 淇敼app浠诲姟绠＄悊
*/
- @ApiOperation("鎸囨尌绔�-淇敼浠诲姟")
@PreAuthorize("@ss.hasPermi('app:task:edit')")
@Log(title = "app浠诲姟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@@ -128,6 +130,13 @@
public AjaxResult editDetail(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
return toAjax(ardAppTaskService.updateArdAppTaskDetail(ardAppTaskDetail));
}
+ @ApiOperation("鍗曞叺绔�-浠诲姟鏌ョ湅")
+ @PreAuthorize("@ss.hasPermi('app:taskdetail:edit')")
+ @Log(title = "鍗曞叺绔�-浠诲姟鏌ョ湅", businessType = BusinessType.UPDATE)
+ @PutMapping("/detail/view")
+ public AjaxResult editDetailView(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
+ return toAjax(ardAppTaskService.updateArdAppTaskDetailView(ardAppTaskDetail));
+ }
/**
* 鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�
*/
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
index 3bbdfba..fc615b0 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
@@ -52,29 +52,6 @@
/** app浠诲姟璇︽儏淇℃伅 */
@ApiModelProperty(notes = "app浠诲姟璇︽儏淇℃伅")
private List<ArdAppTaskDetail> ardAppTaskDetailList;
- /** 棣栨鏌ョ湅鏃堕棿 */
- @Excel(name = "棣栨鏌ョ湅鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date viewTime;
- /** 棣栨鏌ョ湅浣嶇疆 */
- @Excel(name = "棣栨鏌ョ湅浣嶇疆")
- private String viewPosition;
-
- public Date getViewTime() {
- return viewTime;
- }
-
- public void setViewTime(Date viewTime) {
- this.viewTime = viewTime;
- }
-
- public String getViewPosition() {
- return viewPosition;
- }
-
- public void setViewPosition(String viewPosition) {
- this.viewPosition = viewPosition;
- }
public List<ArdAppTaskPic> getArdAppTaskPicList()
{
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
index 9af3442..8ca5183 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
@@ -68,14 +68,26 @@
/** app浠诲姟璇︽儏鍥剧墖淇℃伅 */
private List<ArdAppTaskDetailPic> ardAppTaskDetailPic;
- /** 鎵撳崱鏃堕棿 */
- @Excel(name = "鎵撳崱鏃堕棿")
+ /** 鏌ョ湅鏃堕棿 */
+ @Excel(name = "鏌ョ湅鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date viewTime;
- /** 鎵撳崱浣嶇疆 */
- @Excel(name = "鎵撳崱浣嶇疆")
+ /** 鏌ョ湅浣嶇疆 */
+ @Excel(name = "鏌ョ湅浣嶇疆")
private String viewPosition;
+ /** 鎵撳崱鏃堕棿*/
+ @Excel(name = "鎵撳崱鏃堕棿")
+ private Date clockInTime;
+
+ public Date getClockInTime() {
+ return clockInTime;
+ }
+
+ public void setClockInTime(Date clockInTime) {
+ this.clockInTime = clockInTime;
+ }
+
public Date getViewTime() {
return viewTime;
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java b/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
index fca91dc..b21b796 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
@@ -132,7 +132,13 @@
* @return 缁撴灉
*/
public int updateArdAppTaskDetail(ArdAppTaskDetail ardAppTaskDetail);
-
+ /**
+ * 淇敼app浠诲姟璇︽儏鏌ョ湅
+ *
+ * @param ardAppTaskDetail app浠诲姟璇︽儏瀵硅薄
+ * @return 缁撴灉
+ */
+ public int updateArdAppTaskDetailView(ArdAppTaskDetail ardAppTaskDetail);
/**
* 鎵归噺鏂板app浠诲姟璇︽儏鍥剧墖
*
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java b/ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java
index 470081c..687fec0 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java
@@ -83,4 +83,11 @@
* @return 缁撴灉
*/
public int updateArdAppTaskDetail(ArdAppTaskDetail ardAppTaskDetail);
+ /**
+ * 淇敼app浠诲姟璇︽儏鏌ョ湅
+ *
+ * @param ardAppTaskDetail app浠诲姟璇︽儏绠＄悊
+ * @return 缁撴灉
+ */
+ public int updateArdAppTaskDetailView(ArdAppTaskDetail ardAppTaskDetail);
}
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..29c1389 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
@@ -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,7 +277,6 @@
list.add(ardAppTaskDetailPic);
}
if (list.size() > 0) {
- ardAppTaskMapper.deleteArdAppTaskDetailPicByTaskDetailId(detailId);
ardAppTaskMapper.batchArdAppTaskDetailPic(list);
}
}
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index 61ed850..de83c72 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -15,8 +15,6 @@
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
- <result property="viewTime" column="view_time"/>
- <result property="viewPosition" column="view_position"/>
</resultMap>
<resultMap id="ArdAppTaskSubResult" type="ArdAppTask" extends="ArdAppTaskResult">
<collection property="ardAppTaskPicList" notNullColumn="sub2_id" javaType="java.util.List"
@@ -38,6 +36,7 @@
<result property="clockInPicUrl" column="sub1_clock_in_pic_url"/>
<result property="viewTime" column="sub1_view_time"/>
<result property="viewPosition" column="sub1_view_position"/>
+ <result property="clockInTime" column="sub1_clock_in_time"/>
</resultMap>
<resultMap type="ArdAppTaskPic" id="ArdAppTaskPicResult">
<result property="id" column="sub2_id"/>
@@ -81,23 +80,21 @@
a.create_time,
a.update_by,
a.update_time,
- a.view_time,
- a.view_position,
- b.id as sub2_id,
- b.task_id as sub2_task_id,
- b.pic_url as sub2_pic_url,
- c.id as sub1_id,
- c.name as sub1_name,
- c.longitude as sub1_longitude,
- c.latitude as sub1_latitude,
- c.altitude as sub1_altitude,
- c.user_id as sub1_user_id,
- c.text as sub1_text,
- c.voice as sub1_voice,
- c.status as sub1_status,
+ b.id as sub2_id,
+ b.task_id as sub2_task_id,
+ b.pic_url as sub2_pic_url,
+ c.id as sub1_id,
+ c.name as sub1_name,
+ c.longitude as sub1_longitude,
+ c.latitude as sub1_latitude,
+ c.altitude as sub1_altitude,
+ c.user_id as sub1_user_id,
+ c.text as sub1_text,
+ c.voice as sub1_voice,
+ c.status as sub1_status,
c.clock_in_pic_url as sub1_clock_in_pic_url,
- c.view_time as sub1_view_time,
- c.view_position as sub1_view_position
+ c.view_time as sub1_view_time,
+ c.view_position as sub1_view_position
from ard_app_task a
left join ard_app_task_pic b on b.task_id = a.id
left join ard_app_task_detail c on c.task_id = a.id
@@ -196,8 +193,6 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="viewTime != null">view_time = #{viewTime},</if>
- <if test="viewPosition != null">view_position = #{viewPosition},</if>
</trim>
where id = #{id}
</update>
@@ -265,10 +260,18 @@
<if test="text != null">text = #{text},</if>
<if test="voice != null">voice = #{voice},</if>
<if test="viewTime != null">view_time = #{viewTime},</if>
- <if test="viewPosition != null">view_position = #{vviewPosition},</if>
+ <if test="viewPosition != null">view_position = #{viewPosition},</if>
+ <if test="clockInTime != null">clock_in_time = #{clockInTime},</if>
</trim>
where id = #{id}
</update>
+ <update id="updateArdAppTaskDetailView" parameterType="ArdAppTaskDetail">
+ update ard_app_task_detail
+ set view_time=#{viewTime},
+ view_position=#{viewPosition}
+ where task_id = #{taskId}
+ and user_id = #{userId}
+ </update>
<insert id="batchArdAppTaskDetailPic">
insert into ard_app_task_detail_pic( id, task_detail_id, pic_url) values
<foreach item="item" index="index" collection="list" separator=",">
--
Gitblit v1.9.3