fix: 增加显示属性

guzijian
1 parent f7c7ea33
Showing 13 changed files with 60 additions and 130 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
ruoyi-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
ruoyi-admin/src/main/java/com/ruoyi/in/in/SignInMapper.xml
ruoyi-admin/src/main/java/com/ruoyi/in/mapper/SignInMapper.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportErrorResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportSignInResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportViewResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/SignInResponseVo.java
ruoyi-admin/src/main/resources/mapper/in/SignInMapper.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -138,7 +138,7 @@ public class Driver extends BaseEntity {
      */
     @ApiModelProperty("头像")
     private String image;
-    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("更新时间")
     private Date updateTime;
@@ -106,4 +106,5 @@ public interface DriverMapper
     void updateDriversByJobCodes(@Param("list") List<Driver> list);
     void deleteDeviceIdAssociatedJobCode(@Param("jobCodes") List<String> jobCodes);
+
 }
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
+import com.ruoyi.pojo.response.SignInResponseVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -50,7 +51,7 @@ public class SignInController extends BaseController {
     @ApiOperation("查询签到列表")
     public TableDataInfo list(SignIn signIn) {
         startPage();
-        List<SignIn> list = signInService.selectSignInList(signIn);
+        List<SignInResponseVo> list = signInService.selectSignInList(signIn);
         return getDataTable(list);
     }
@@ -62,8 +63,8 @@ public class SignInController extends BaseController {
     @PostMapping("/export")
     @ApiOperation("导出签到列表")
     public void export(HttpServletResponse response, SignIn signIn) {
-        List<SignIn> list = signInService.selectSignInList(signIn);
-        ExcelUtil<SignIn> util = new ExcelUtil<SignIn>(SignIn.class);
+        List<SignInResponseVo> list = signInService.selectSignInList(signIn);
+        ExcelUtil<SignInResponseVo> util = new ExcelUtil<SignInResponseVo>(SignInResponseVo.class);
         util.exportExcel(response, list, "签到数据");
     }
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.in.mapper.SignInMapper">
-    
-    <resultMap type="SignIn" id="SignInResult">
-        <result property="id"    column="id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="jobCode"    column="jobCode"    />
-        <result property="ip"    column="ip"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="image"    column="image"    />
-        <result property="status"    column="status"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="singnIn"    column="singn_in"    />
-        <result property="alcoholFlag"    column="alcohol_flag"    />
-        <result property="type"    column="type"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectSignInVo">
-        select id, create_time, jobCode, ip, update_time, image, status, update_by, singn_in, alcohol_flag, type, remark from sign_in
-    </sql>
-
-    <select id="selectSignInList" parameterType="SignIn" resultMap="SignInResult">
-        <include refid="selectSignInVo"/>
-        <where>  
-            <if test="jobCode != null  and jobCode != ''"> and jobCode = #{jobCode}</if>
-            <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
-            <if test="image != null  and image != ''"> and image = #{image}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="singnIn != null  and singnIn != ''"> and singn_in = #{singnIn}</if>
-            <if test="alcoholFlag != null "> and alcohol_flag = #{alcoholFlag}</if>
-            <if test="type != null "> and type = #{type}</if>
-        </where>
-    </select>
-    
-    <select id="selectSignInById" parameterType="Long" resultMap="SignInResult">
-        <include refid="selectSignInVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertSignIn" parameterType="SignIn" useGeneratedKeys="true" keyProperty="id">
-        insert into sign_in
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="createTime != null">create_time,</if>
-            <if test="jobCode != null and jobCode != ''">jobCode,</if>
-            <if test="ip != null">ip,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="image != null">image,</if>
-            <if test="status != null">status,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="singnIn != null">singn_in,</if>
-            <if test="alcoholFlag != null">alcohol_flag,</if>
-            <if test="type != null">type,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="createTime != null">#{createTime},</if>
-            <if test="jobCode != null and jobCode != ''">#{jobCode},</if>
-            <if test="ip != null">#{ip},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="image != null">#{image},</if>
-            <if test="status != null">#{status},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="singnIn != null">#{singnIn},</if>
-            <if test="alcoholFlag != null">#{alcoholFlag},</if>
-            <if test="type != null">#{type},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateSignIn" parameterType="SignIn">
-        update sign_in
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="jobCode != null and jobCode != ''">jobCode = #{jobCode},</if>
-            <if test="ip != null">ip = #{ip},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="image != null">image = #{image},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="singnIn != null">singn_in = #{singnIn},</if>
-            <if test="alcoholFlag != null">alcohol_flag = #{alcoholFlag},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSignInById" parameterType="Long">
-        delete from sign_in where id = #{id}
-    </delete>
-
-    <delete id="deleteSignInByIds" parameterType="String">
-        delete from sign_in where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
 \ No newline at end of file
@@ -5,6 +5,7 @@ import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
 import com.ruoyi.pojo.response.ReportViewResponseVo;
+import com.ruoyi.pojo.response.SignInResponseVo;
 /**
  * 签到Mapper接口
@@ -28,7 +29,7 @@ public interface SignInMapper
      * @param signIn 签到
      * @return 签到集合
      */
-    public List<SignIn> selectSignInList(SignIn signIn);
+    public List<SignInResponseVo> selectSignInList(SignIn signIn);
     /**
      * 新增签到
@@ -8,6 +8,7 @@ import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.response.ReportViewResponseVo;
+import com.ruoyi.pojo.response.SignInResponseVo;
 /**
  * 签到Service接口
@@ -31,7 +32,7 @@ public interface ISignInService
      * @param signIn 签到
      * @return 签到集合
      */
-    public List<SignIn> selectSignInList(SignIn signIn);
+    public List<SignInResponseVo> selectSignInList(SignIn signIn);
     /**
      * 新增签到
@@ -9,6 +9,7 @@ import java.util.Base64;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
@@ -87,8 +88,9 @@ public class SignInServiceImpl implements ISignInService {
      * @return 签到
      */
     @Override
-    public List<SignIn> selectSignInList(SignIn signIn) {
-        return signInMapper.selectSignInList(signIn);
+    public List<SignInResponseVo> selectSignInList(SignIn signIn) {
+        List<SignInResponseVo> vos = signInMapper.selectSignInList(signIn);
+        return vos;
     }
     /**
@@ -33,12 +33,12 @@ public class ReportErrorResponseVo {;
     private String deviceId;
     @ApiModelProperty("时间")
     @ExcelProperty(value = "时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss" , timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date createTime;
     @ApiModelProperty("备注")
     @ExcelProperty(value = "备注")
-    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss" , timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private String remark;
 }
@@ -21,6 +21,7 @@ public class ReportSignInResponseVo extends ReportViewResponseVo{
     public ReportSignInResponseVo(ReportViewResponseVo vo){
         this.count = 1;
         this.children = new ArrayList<>();
+        this.setPosts(vo.getPosts());
         this.setCreateTime(vo.getCreateTime());
         this.setId(vo.getId());
         this.setImage(vo.getImage());
@@ -81,4 +81,7 @@ public class ReportViewResponseVo {
     @ExcelProperty(value = "备注")
     @ApiModelProperty("备注")
     private String remark;
+    @ExcelProperty(value = "工种")
+    @ApiModelProperty("工种")
+    private String posts;
 }
 package com.ruoyi.pojo.response;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.in.domain.SignIn;
 import lombok.Data;
 /**
@@ -7,15 +10,15 @@ import lombok.Data;
  * @author 20412
  */
 @Data
-public class SignInResponseVo {
+public class SignInResponseVo extends SignIn {
+    @ExcelIgnore
     String address;
+    @ExcelIgnore
     String deviceId;
+    @ExcelProperty(value = "姓名")
+    String name;
+    @ExcelProperty(value = "工种")
+    String posts;
+
-    @Override
-    public String toString() {
-        return "SignInResponseVo{" +
-                "address='" + address + '\'' +
-                ", deviceId='" + deviceId + '\'' +
-                '}';
-    }
 }
@@ -3,7 +3,24 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.in.mapper.SignInMapper">
-    
+    <resultMap type="com.ruoyi.pojo.response.SignInResponseVo" id="SignInResultVO">
+        <result property="id"    column="id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="jobCode"    column="jobCode"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="ip"    column="ip"    />
+        <result property="image"    column="image"    />
+        <result property="status"    column="status"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="singnIn"    column="singn_in"    />
+        <result property="alcoholFlag"    column="alcohol_flag"    />
+        <result property="type"    column="type"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="alcoholIntake"    column="alcohol_intake"    />
+        <result property="remark"    column="remark"    />
+        <result property="posts"    column="posts"    />
+        <result property="name"    column="personnel_name"    />
+    </resultMap>
     <resultMap type="SignIn" id="SignInResult">
         <result property="id"    column="id"    />
         <result property="createTime"    column="create_time"    />
@@ -25,9 +42,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         select id, create_time, jobCode, device_id,ip,image, status, update_by, singn_in, alcohol_flag, type, update_time, alcohol_intake, remark from sign_in
     </sql>
-    <select id="selectSignInList" parameterType="SignIn" resultMap="SignInResult">
-        <include refid="selectSignInVo"/>
-        <where>  
+    <select id="selectSignInList" parameterType="com.ruoyi.pojo.response.SignInResponseVo" resultMap="SignInResultVO">
+        select sign_in.*,driver.posts,driver.personnel_name
+        from sign_in,driver
+        WHERE
+        driver.job_code = sign_in.jobCode
             <if test="jobCode != null  and jobCode != ''"> and jobCode = #{jobCode}</if>
             <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
             <if test="image != null  and image != ''"> and image = #{image}</if>
@@ -36,8 +55,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="alcoholFlag != null "> and alcohol_flag = #{alcoholFlag}</if>
             <if test="type != null "> and type = #{type}</if>
             <if test="alcoholIntake != null "> and alcohol_intake = #{alcoholIntake}</if>
-        </where>
-        order by id desc
+        order by create_time desc
     </select>
     <select id="selectSignInById" parameterType="Long" resultMap="SignInResult">
@@ -56,7 +74,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         alcohol_flag alcoholFlag,
         alcohol_intake alcoholIntake,
         sign_in.image,
-        sign_in.remark
+        sign_in.remark,
+        driver.posts
         FROM
         sign_in,
         driver
@@ -67,7 +67,7 @@ public class SysUser extends BaseEntity
     private String loginIp;
     /** 最后登录时间 */
-    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss", type = Type.EXPORT)
+    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
     /** 部门对象 */