ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -44,6 +44,7 @@ @Autowired private IArdAppTaskService ardAppTaskService; /** * 查询app任务管理列表 */ @@ -88,9 +89,10 @@ /** * 获取app任务管理详细信息 */ @ApiOperation("指挥端-获取app任务管理详细信息") @PreAuthorize("@ss.hasPermi('app:task:query')") @GetMapping(value = "/{id}") public AjaxResult getInfoWithPic(@PathVariable("id") String id) { public AjaxResult getInfo(@PathVariable("id") String id) { return success(ardAppTaskService.selectArdAppTaskById(id)); }
@@ -4,6 +4,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.entity.SysUser; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -42,17 +43,28 @@ /** 用户ID */ @Excel(name = "用户ID") private String userId; /** app任务图片信息 */ @ApiModelProperty(notes = "app任务图片信息") private List<ArdAppTaskPic> ardAppTaskPicList; /** app任务关联多用户 */ /** app任务关联多用户id列表 */ private List<String> userIds; /** app任务关联多用户 */ private List<SysUser> sysUserList; /** app任务详情信息 */ @ApiModelProperty(notes = "app任务详情信息") private List<ArdAppTaskDetail> ardAppTaskDetailList; public List<SysUser> getSysUserList() { return sysUserList; } public void setSysUserList(List<SysUser> sysUserList) { this.sysUserList = sysUserList; } public List<ArdAppTaskPic> getArdAppTaskPicList() { return ardAppTaskPicList; ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
@@ -43,6 +43,13 @@ */ public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask); public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask); /** * 按任务id查询下发的app用户id列表 * */ public List<String> selectArdAppTaskDetailUserIdsByTaskId(String task_id); /** * 新增app任务管理 * ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -9,8 +9,10 @@ import com.ruoyi.app.tasktext.domain.ArdAppTaskText; import com.ruoyi.app.tasktext.mapper.ArdAppTaskTextMapper; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.system.mapper.SysUserMapper; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -39,6 +41,8 @@ private ArdAppTaskMapper ardAppTaskMapper; @Resource private ArdAppTaskTextMapper ardAppTaskTextMapper; @Resource private SysUserMapper sysUserMapper; /** * 查询app任务管理 @@ -48,7 +52,19 @@ */ @Override public ArdAppTask selectArdAppTaskById(String id) { return ardAppTaskMapper.selectArdAppTaskById(id); ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id); List<String> userIds = ardAppTaskMapper.selectArdAppTaskDetailUserIdsByTaskId(id); if (userIds.size() > 0) { ardAppTask.setUserIds(userIds); List<SysUser> sysUserList=new ArrayList<>(); for (String userId : userIds) { SysUser sysUser = sysUserMapper.selectUserById(userId); sysUserList.add(sysUser); } ardAppTask.setSysUserList(sysUserList); } return ardAppTask; } @Override @@ -277,7 +293,7 @@ @Override public ArdAppTask selectNewArdAppTaskByUserId(String userId) { ArdAppTask ardAppTask = ardAppTaskMapper.selectNewArdAppTaskByUserId(userId); if(StringUtils.isNotNull(ardAppTask)) { if (StringUtils.isNotNull(ardAppTask)) { ArdAppTaskDetail detail = new ArdAppTaskDetail(); detail.setViewFlag("1"); detail.setTaskId(ardAppTask.getId()); @@ -285,6 +301,7 @@ } return ardAppTask; } /** * 查询已弹窗但未读的任务数量 * @@ -292,8 +309,7 @@ * @return 结果 */ @Override public int selectUnreadArdAppTaskCount(String userId) { public int selectUnreadArdAppTaskCount(String userId) { return ardAppTaskMapper.selectUnreadArdAppTaskCount(userId); } } ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -27,7 +27,12 @@ <!-- <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List"--> <!-- resultMap="ArdAppTaskDetailResult"/>--> </resultMap> <resultMap id="ArdAppTaskSub1Result" type="ArdAppTask" extends="ArdAppTaskResult"> <collection property="ardAppTaskPicList" notNullColumn="sub2_id" javaType="java.util.List" resultMap="ArdAppTaskPicResult"/> <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List" resultMap="ArdAppTaskDetailResult"/> </resultMap> <resultMap type="ArdAppTaskDetail" id="ArdAppTaskDetailResult"> <result property="id" column="sub1_id"/> <result property="name" column="sub1_name"/> @@ -93,7 +98,8 @@ c.view_time as sub1_view_time, c.view_position as sub1_view_position, c.clock_in_time as sub1_clock_in_time, c.view_flag as sub1_view_flag c.view_flag as sub1_view_flag, c.task_id as sub1_task_id 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 @@ -153,7 +159,7 @@ </where> </select> <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSubResult"> <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSub1Result"> <include refid="selectArdAppTaskDto"/> where a.id = #{id} </select> @@ -165,6 +171,10 @@ <select id="selectArdAppTaskPicListById" resultType="ArdAppTaskPic"> select * from ard_app_task_pic d where d.task_id = #{id} </select> <select id="selectArdAppTaskDetailUserIdsByTaskId" parameterType="String" resultType="java.lang.String"> select DISTINCT(user_id) from ard_app_task_detail where task_id=#{taskId} </select> <insert id="insertArdAppTask" parameterType="ArdAppTask"> insert into ard_app_task
