fix: 新增显示字段

guzijian
1 parent 87a98801
Showing 4 changed files with 33 additions and 2 deletions
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportDetailResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -3,7 +3,36 @@ package com.ruoyi.pojo.response;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
  
+import java.util.Date;
+
+/**
+ * @author 20412
+ */
 @Data
 @ApiModel("签到报表查看详情vo")
 public class ReportDetailResponseVo {
+    private String name;
+    private String posts;
+    private String lineName;
+    private String lpName;
+    /**
+     * 计划操作
+     */
+    private String planAction;
+    /**
+     * 实际操作
+     */
+    private String actualAction;
+    /**
+     * 是否酒精测试
+     */
+    private Boolean alcoholFlag;
+    /**
+     * 签到时间
+     */
+    private Date createTime;
+    /**
+     * 原因
+     */
+    private String remark;
 }
@@ -10,6 +10,7 @@ import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.pojo.entity.DriverScheduling;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
+import com.ruoyi.pojo.response.ReportDetailResponseVo;
 import com.ruoyi.pojo.response.ReportErrorResponseVo;
 import com.ruoyi.pojo.response.ReportSignInResponseVo;
 import com.ruoyi.pojo.response.ReportViewResponseVo;
@@ -128,7 +129,7 @@ public class ReportService {
         return null;
     }
  
-    public List<DriverScheduling> getReportDetail(ReportViewRequestVo vo, HttpServletResponse response) {
+    public List<ReportDetailResponseVo> getReportDetail(ReportViewRequestVo vo, HttpServletResponse response) {
         List<DriverScheduling> toDay = schedulingMapper.queryToDay(vo.getDate(), vo.getName(), vo.getJobCode(), vo.getLineName());
         return null;
     }
@@ -24,6 +24,6 @@ public class SysIndexController
     @RequestMapping("/")
     public String index()
     {
-        return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
+        return "访问首页请通过前端。";
     }
 }
@@ -58,6 +58,7 @@
  
     <select id="selectDriverList" parameterType="Driver" resultMap="DriverResult">
         select
+        distinct
         driver.id,
         driver.job_code,
         driver.company_code,