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任务详情的详细信息 */ 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() { 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; } 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任务详情图片 * 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); } 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); } } 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=",">
