1、修改签到列表字段

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

 package com.censoft.censoftrongtong.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.censoft.censoftrongtong.domain.*;
 import com.censoft.censoftrongtong.domain.dto.*;
@@ -16,9 +17,11 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysUploadFileService;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -98,6 +101,9 @@ public class RiskPlanAppController extends BaseController {
     @Resource
     private IRiskSignRecordService riskSignRecordService;
 
+    @Resource
+    private ISysUserService userService;
+
 
     /**
      * 服务器地址
@@ -934,7 +940,25 @@ public class RiskPlanAppController extends BaseController {
     {
         startPage();
         riskSignRecord.setUserId(getUserId());
-        return getDataTable(riskSignRecordService.getSignList(riskSignRecord));
+        List<RiskSignRecord> signList = riskSignRecordService.getSignList(riskSignRecord);
+        TableDataInfo dataTable = getDataTable(signList);
+        List<RiskSignRecordAppShowDto> showDtos = signList.stream().map(dto -> {
+            RiskSignRecordAppShowDto showDto = new RiskSignRecordAppShowDto();
+            //风险源照片
+            BeanUtils.copyProperties(dto, showDto);
+            if (!StrUtil.hasEmpty(dto.getFileIds())) {
+                List<Long> fileIds = Arrays.stream(dto.getFileIds().split(","))
+                        .map(Long::parseLong)
+                        .collect(Collectors.toList());
+                showDto.setFiles(uploadFileService.selectSysFileByFileIds(fileIds));
+            }
+            //人员
+            SysUser sysUser = userService.selectUserById(dto.getUserId());
+            showDto.setUserName(sysUser.getNickName());
+            return showDto;
+        }).collect(Collectors.toList());
+        dataTable.setRows(showDtos);
+        return dataTable;
     }
 
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskSignRecordAppShowDto.java

+package com.censoft.censoftrongtong.domain.dto;
+
+
+import com.ruoyi.system.domain.SysUploadFile;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-09-01 11:44:07
+ */
+@Data
+public class RiskSignRecordAppShowDto {
+    private Long id;
+
+    /** 0-签到 1-签退 */
+    private Boolean type;
+
+    /** 用户id */
+    private Long userId;
+
+    /** 用户名称 */
+    private String userName;
+
+    /** 文件ids */
+    private String fileIds;
+
+    /** 文件ids */
+    private List<SysUploadFile> files;
+}