fix: 修改部分逻辑，追加设备号字段

guzijian
1 parent 2770af39
Showing 16 changed files with 132 additions and 240 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/SignInEnum.java
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/service/impl/EquipmentExceptionServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/equipment/controller/EquipmentController.java
ruoyi-admin/src/main/java/com/ruoyi/equipment/service/impl/EquipmentServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/controller/SignInController.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/request/ReportErrorRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportViewResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -19,7 +19,7 @@ public interface SignInEnum {
     String SIGN_IN_SUCCESS_STRING = "签到成功";
     Integer SIGN_IN_SUCCESS = 1;
-    String SIGN_IN_FAIL_STRING = "签到失败";
+    String SIGN_IN_FAIL_STRING = "签到异常";
     Integer SIGN_IN_FAIL = 2;
     Integer ALCOHOL_FLAG_YES = 1;
@@ -28,5 +28,4 @@ public interface SignInEnum {
     String ALCOHOL_FLAG_NO_STRING = "未测试";
-
 }
@@ -41,17 +41,17 @@ public class ReportController {
     @ApiOperation("签到报表导出")
     @PostMapping("/export")
-    public void exportReport(@ApiParam ReportViewRequestVo requestVo, HttpServletResponse response){
+    public void exportReport(@ApiParam ReportViewRequestVo requestVo, HttpServletResponse response) {
         List<ReportViewResponseVo> list = reportService.getReportScrollViewTable(requestVo);
         ExcelUtil<ReportViewResponseVo> util = new ExcelUtil<ReportViewResponseVo>(ReportViewResponseVo.class);
-        util.exportEasyExcel(response, list, "操作日志");
+        util.exportEasyExcel(response, list, "签到报表");
     }
     @ApiOperation("异常报表导出")
     @PostMapping("/error/export")
-    public void exportErrorReport(@ApiParam ReportErrorRequestVo requestVo,HttpServletResponse response){
+    public void exportErrorReport(@ApiParam ReportErrorRequestVo requestVo, HttpServletResponse response) {
         List<ReportErrorResponseVo> list = reportService.getErrorReportList(requestVo);
         ExcelUtil<ReportErrorResponseVo> util = new ExcelUtil<ReportErrorResponseVo>(ReportErrorResponseVo.class);
-        util.exportEasyExcel(response, list, "操作日志");
+        util.exportEasyExcel(response, list, "异常报表");
     }
 }
@@ -9,14 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -44,8 +37,8 @@ public class DriverController extends BaseController {
      */
     @GetMapping("/{schedulingDate}/{jobCode}")
     @ApiOperation("获取驾驶员排班信息")
-    public AjaxResult getDriverSchedulingInfo(@ApiParam(name = "date",value = "yyyyMMdd",type = "String") @PathVariable("schedulingDate") String schedulingDate, @PathVariable("jobCode") String jobCode) {
-        return driverService.getDriverSchedulingInfo(schedulingDate,jobCode);
+    public AjaxResult getDriverSchedulingInfo(@ApiParam(name = "date", value = "yyyyMMdd", type = "String") @PathVariable("schedulingDate") String schedulingDate, @PathVariable("jobCode") String jobCode) {
+        return driverService.getDriverSchedulingInfo(schedulingDate, jobCode);
     }
     /**
@@ -53,7 +46,7 @@ public class DriverController extends BaseController {
      */
     @GetMapping("/getDriverSchedulingAll")
     @ApiOperation("获取当前所有有班次信息的工号集合")
-    public AjaxResult getDriverSchedulingAll(){
+    public AjaxResult getDriverSchedulingAll() {
         return driverService.getDriverSchedulingAll();
     }
@@ -128,14 +121,16 @@ public class DriverController extends BaseController {
     /**
      * 校验工号
+     *
      * @param jobCode
      * @return
      */
-    @GetMapping("/check/{jobCode}")
-    @ApiOperation("校验jobCode是否存入当前系统")
-    public AjaxResult checkJobCode(@PathVariable("jobCode") String jobCode){
-        return driverService.checkJobCode(jobCode);
+    @GetMapping("/check")
+    @ApiOperation("人事校验，是否为公司员工")
+    public AjaxResult checkJobCode(@ApiParam @ModelAttribute Driver driver) {
+        return driverService.checkJobCode(driver);
     }
+
 //    @ApiOperation("保存员工大头像")
 }
 package com.ruoyi.driver.domain;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -8,257 +11,127 @@ import com.ruoyi.common.core.domain.BaseEntity;
 /**
  * 驾驶员信息对象 driver
- * 
+ *
  * @author 古自健
  * @date 2023-07-04
  */
-public class Driver extends BaseEntity
-{
+@Data
+@ApiModel("驾驶员信息对象")
+public class Driver extends BaseEntity {
     private static final long serialVersionUID = 1L;
-    /** 主键 */
+    /**
+     * 主键
+     */
     private Long id;
-    /** 工号 */
+    /**
+     * 工号
+     */
     @Excel(name = "工号")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String jobCode;
-    /** 公司编码 */
+    /**
+     * 公司编码
+     */
     @Excel(name = "公司编码")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String companyCode;
-    /** 分公司编码 */
+    /**
+     * 分公司编码
+     */
     @Excel(name = "分公司编码")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String brancheCompanyCode;
-    /** 姓名 */
+    /**
+     * 姓名
+     */
     @Excel(name = "姓名")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String personnelName;
-    /** 运营服务证书号 */
+    /**
+     * 运营服务证书号
+     */
     @Excel(name = "运营服务证书号")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String papersCode;
-    /** 一卡通工作卡号 */
+    /**
+     * 一卡通工作卡号
+     */
     @Excel(name = "一卡通工作卡号")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String icCardCode;
-    /** 性别 */
+    /**
+     * 性别
+     */
     @Excel(name = "性别")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String personnelType;
-    /** 所属岗位/工种 */
+    /**
+     * 所属岗位/工种
+     */
     @Excel(name = "所属岗位/工种")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String posts;
-    /** 身份证 */
+    /**
+     * 身份证
+     */
     @Excel(name = "身份证")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String card;
-    /** 联系电话 */
+    /**
+     * 联系电话
+     */
     @Excel(name = "联系电话")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String telphone;
-    /** RFID 人卡IC号 */
+    /**
+     * RFID 人卡IC号
+     */
     @Excel(name = "RFID 人卡IC号")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String icRfid;
-    /** RFID 人卡ID号（10进制） */
+    /**
+     * RFID 人卡ID号（10进制）
+     */
     @Excel(name = "RFID 人卡ID号", readConverterExp = "1=0进制")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String idRfid;
-    /** RFID 标签号 */
+    /**
+     * RFID 标签号
+     */
     @Excel(name = "RFID 标签号")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String tagRfid;
-    /** 线路名称 */
+    /**
+     * 线路名称
+     */
     @Excel(name = "线路名称")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String lineName;
-    /** 线路编码 */
+    /**
+     * 线路编码
+     */
     @Excel(name = "线路编码")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String lineCode;
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
+    @Excel(name = "人脸注册")
+    @ApiModelProperty("是否人脸注册 1 注册 2 未注册")
+    private Integer signIn;
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setJobCode(String jobCode) 
-    {
-        this.jobCode = jobCode;
-    }
-
-    public String getJobCode() 
-    {
-        return jobCode;
-    }
-    public void setCompanyCode(String companyCode) 
-    {
-        this.companyCode = companyCode;
-    }
-
-    public String getCompanyCode() 
-    {
-        return companyCode;
-    }
-    public void setBrancheCompanyCode(String brancheCompanyCode) 
-    {
-        this.brancheCompanyCode = brancheCompanyCode;
-    }
-
-    public String getBrancheCompanyCode() 
-    {
-        return brancheCompanyCode;
-    }
-    public void setPersonnelName(String personnelName) 
-    {
-        this.personnelName = personnelName;
-    }
-
-    public String getPersonnelName() 
-    {
-        return personnelName;
-    }
-    public void setPapersCode(String papersCode) 
-    {
-        this.papersCode = papersCode;
-    }
-
-    public String getPapersCode() 
-    {
-        return papersCode;
-    }
-    public void setIcCardCode(String icCardCode) 
-    {
-        this.icCardCode = icCardCode;
-    }
-
-    public String getIcCardCode() 
-    {
-        return icCardCode;
-    }
-    public void setPersonnelType(String personnelType) 
-    {
-        this.personnelType = personnelType;
-    }
-
-    public String getPersonnelType() 
-    {
-        return personnelType;
-    }
-    public void setPosts(String posts) 
-    {
-        this.posts = posts;
-    }
-
-    public String getPosts() 
-    {
-        return posts;
-    }
-    public void setCard(String card) 
-    {
-        this.card = card;
-    }
-
-    public String getCard() 
-    {
-        return card;
-    }
-    public void setTelphone(String telphone) 
-    {
-        this.telphone = telphone;
-    }
-
-    public String getTelphone() 
-    {
-        return telphone;
-    }
-    public void setIcRfid(String icRfid) 
-    {
-        this.icRfid = icRfid;
-    }
-
-    public String getIcRfid() 
-    {
-        return icRfid;
-    }
-    public void setIdRfid(String idRfid) 
-    {
-        this.idRfid = idRfid;
-    }
-
-    public String getIdRfid() 
-    {
-        return idRfid;
-    }
-    public void setTagRfid(String tagRfid) 
-    {
-        this.tagRfid = tagRfid;
-    }
-
-    public String getTagRfid() 
-    {
-        return tagRfid;
-    }
-    public void setLineName(String lineName) 
-    {
-        this.lineName = lineName;
-    }
-
-    public String getLineName() 
-    {
-        return lineName;
-    }
-    public void setLineCode(String lineCode) 
-    {
-        this.lineCode = lineCode;
-    }
-
-    public String getLineCode() 
-    {
-        return lineCode;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("jobCode", getJobCode())
-            .append("companyCode", getCompanyCode())
-            .append("brancheCompanyCode", getBrancheCompanyCode())
-            .append("personnelName", getPersonnelName())
-            .append("papersCode", getPapersCode())
-            .append("icCardCode", getIcCardCode())
-            .append("personnelType", getPersonnelType())
-            .append("posts", getPosts())
-            .append("card", getCard())
-            .append("telphone", getTelphone())
-            .append("icRfid", getIcRfid())
-            .append("idRfid", getIdRfid())
-            .append("tagRfid", getTagRfid())
-            .append("remark", getRemark())
-            .append("lineName", getLineName())
-            .append("lineCode", getLineCode())
-            .toString();
-    }
 }
@@ -75,5 +75,5 @@ public interface IDriverService
     AjaxResult getDriverSchedulingAll();
-    AjaxResult checkJobCode(String jobCode);
+    AjaxResult checkJobCode(Driver jobCode);
 }
@@ -133,8 +133,8 @@ public class DriverServiceImpl implements IDriverService {
     }
     @Override
-    public AjaxResult checkJobCode(String jobCode) {
-        Integer result = driverMapper.jobCodeIsEmpty(jobCode);
+    public AjaxResult checkJobCode(Driver driver) {
+        Integer result = driverMapper.jobCodeIsEmpty(driver.getJobCode());
         Map<String, Boolean> resultMap = new HashMap<>();
         if (result > 0) {
             resultMap.put("result", true);
@@ -3,6 +3,7 @@ package com.ruoyi.eexception.service.impl;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
@@ -55,6 +56,9 @@ public class EquipmentExceptionServiceImpl implements IEquipmentExceptionService
     public int insertEquipmentException(EquipmentException equipmentException)
     {
         equipmentException.setCreateTime(DateUtils.getNowDate());
+        if (!StringUtils.isNotEmpty(equipmentException.getDeviceId())){
+            throw new RuntimeException("设备号不能为空");
+        }
         return equipmentExceptionMapper.insertEquipmentException(equipmentException);
     }
@@ -2,6 +2,7 @@ package com.ruoyi.equipment.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +24,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 /**
  * 设备信息Controller
- * 
+ *
  * @author guzijian
  * @date 2023-07-05
  */
 @RestController
 @RequestMapping("/equipment/equipment")
-public class EquipmentController extends BaseController
-{
+public class EquipmentController extends BaseController {
     @Autowired
     private IEquipmentService equipmentService;
@@ -39,8 +39,7 @@ public class EquipmentController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('equipment:equipment:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Equipment equipment)
-    {
+    public TableDataInfo list(Equipment equipment) {
         startPage();
         List<Equipment> list = equipmentService.selectEquipmentList(equipment);
         return getDataTable(list);
@@ -52,8 +51,7 @@ public class EquipmentController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('equipment:equipment:export')")
     @Log(title = "设备信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, Equipment equipment)
-    {
+    public void export(HttpServletResponse response, Equipment equipment) {
         List<Equipment> list = equipmentService.selectEquipmentList(equipment);
         ExcelUtil<Equipment> util = new ExcelUtil<Equipment>(Equipment.class);
         util.exportExcel(response, list, "设备信息数据");
@@ -64,8 +62,7 @@ public class EquipmentController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('equipment:equipment:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(equipmentService.selectEquipmentById(id));
     }
@@ -75,8 +72,7 @@ public class EquipmentController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('equipment:equipment:add')")
     @Log(title = "设备信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody Equipment equipment)
-    {
+    public AjaxResult add(@RequestBody Equipment equipment) {
         return toAjax(equipmentService.insertEquipment(equipment));
     }
@@ -86,8 +82,7 @@ public class EquipmentController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('equipment:equipment:edit')")
     @Log(title = "设备信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody Equipment equipment)
-    {
+    public AjaxResult edit(@RequestBody Equipment equipment) {
         return toAjax(equipmentService.updateEquipment(equipment));
     }
@@ -96,9 +91,8 @@ public class EquipmentController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('equipment:equipment:remove')")
     @Log(title = "设备信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(equipmentService.deleteEquipmentByIds(ids));
     }
 }
@@ -3,6 +3,7 @@ package com.ruoyi.equipment.service.impl;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
@@ -55,7 +56,10 @@ public class EquipmentServiceImpl implements IEquipmentService
     public int insertEquipment(Equipment equipment)
     {
         equipment.setCreateTime(DateUtils.getNowDate());
-    equipment.setCreateBy(SecurityUtils.getUsername());
+//        equipment.setCreateBy(SecurityUtils.getUsername());
+        if (!StringUtils.isNotEmpty(equipment.getDeviceId())){
+            throw new RuntimeException("设备号不能为空");
+        }
         return equipmentMapper.insertEquipment(equipment);
     }
@@ -100,7 +100,7 @@ public class SignInController extends BaseController
     @PostMapping("/newAdd")
     @ApiOperation("新增签到（设备传入）")
     public AjaxResult addSignIn(@ApiParam @RequestBody SignIn signIn) throws FileUploadException, IOException {
-        return toAjax(signInService.addSignIn(signIn));
+        return signInService.addSignIn(signIn);
     }
     /**
@@ -3,6 +3,7 @@ package com.ruoyi.in.service;
 import java.io.IOException;
 import java.util.List;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
@@ -69,6 +70,6 @@ public interface ISignInService
      * @param signIn
      * @return
      */
-    int addSignIn(SignIn signIn) throws FileUploadException, IOException;
+    AjaxResult addSignIn(SignIn signIn) throws FileUploadException, IOException;
 }
@@ -3,6 +3,7 @@ package com.ruoyi.in.service.impl;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.Base64;
 import java.util.Date;
 import java.util.List;
@@ -10,6 +11,7 @@ import java.util.Objects;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.SignInEnum;
@@ -28,6 +30,8 @@ import sun.misc.BASE64Decoder;
 import javax.annotation.Resource;
+import static com.ruoyi.common.SignInEnum.*;
+
 /**
  * 签到Service业务层处理
  *
@@ -77,6 +81,10 @@ public class SignInServiceImpl implements ISignInService {
         if (signIn.getType() == null) {
             signIn.setType(SignInEnum.SIGN_IN);
         }
+        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag())){
+            signIn.setStatus(signIn.getAlcoholIntake().compareTo(new BigDecimal(20)) < 0 ? SIGN_IN_SUCCESS : SIGN_IN_FAIL);
+            signIn.setRemark(signIn.getStatus().equals(SIGN_IN_FAIL)? "酒精测试不通过超标:" + signIn.getAlcoholIntake().floatValue() + "%" : "");
+        }
         return signInMapper.insertSignIn(signIn);
     }
@@ -115,7 +123,14 @@ public class SignInServiceImpl implements ISignInService {
     }
     @Override
-    public int addSignIn(SignIn signIn) throws FileUploadException, IOException {
+    public AjaxResult addSignIn(SignIn signIn) throws  IOException {
+        if (!StringUtils.isNotEmpty(signIn.getDeviceId())){
+            throw new RuntimeException("设备号不能为空");
+        }
+        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag())){
+            signIn.setStatus(signIn.getAlcoholIntake().compareTo(new BigDecimal(20)) < 0 ? SIGN_IN_SUCCESS : SIGN_IN_FAIL);
+            signIn.setRemark(signIn.getStatus().equals(SIGN_IN_FAIL)? "酒精测试不通过超标:" + signIn.getAlcoholIntake().floatValue() + "%" : "");
+        }
         // base64转图片
         signIn.setCreateTime(new Date());
         signIn.setIp(IpUtils.getIpAddr());
@@ -135,7 +150,8 @@ public class SignInServiceImpl implements ISignInService {
         signIn.setImage(pathFileName);
         // 异步上传文件
         threadJobConfig.startUpload(absPath,base64);
-        return signInMapper.insertSignIn(signIn);
+        signInMapper.insertSignIn(signIn);
+        return signIn.getStatus().equals(SIGN_IN_SUCCESS) ? AjaxResult.success("签到成功"): AjaxResult.error("签到失败酒精测试超标");
     }
     /**
@@ -11,6 +11,7 @@ import java.util.List;
 /**
  * 异常报表请求
+ *
  * @author 20412
  */
 @ApiModel("异常报表请求")
 package com.ruoyi.pojo.response;
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.pojo.converter.AlcoholFlagConverter;
@@ -21,14 +22,15 @@ import java.util.Date;
 @Data
 public class ReportViewResponseVo {
     @ApiModelProperty("id")
+    @ExcelIgnore
     private Long id;
     @ExcelProperty(value = "工号")
     @ApiModelProperty("工号")
     private String jobCode;
-    @ExcelProperty(value = "签到类型" ,converter = SignInTypeConverter.class)
-    @ApiModelProperty("签到类型" )
+    @ExcelProperty(value = "签到类型", converter = SignInTypeConverter.class)
+    @ApiModelProperty("签到类型")
     private String singnIn;
     @ExcelProperty(value = "姓名")
@@ -41,20 +43,20 @@ public class ReportViewResponseVo {
     @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     private Date createTime;
-    @ExcelProperty(value = "签到状态",converter = SignInStatusConverter.class)
+    @ExcelProperty(value = "签到状态", converter = SignInStatusConverter.class)
     @ApiModelProperty("签到状态1 成功2 异常")
     private Integer status;
     /**
      * 签到签退
      */
     @ApiModelProperty("签到签退")
-    @ExcelProperty(value = "签到签退",converter = SignInConvert.class)
+    @ExcelProperty(value = "签到签退", converter = SignInConvert.class)
     private Integer type;
     /**
      * 是否酒精检测 1 检查 2 未检
      */
     @ApiModelProperty("是否酒精检测 1 检查 2 未检")
-    @ExcelProperty(value = "酒精检测",converter = AlcoholFlagConverter.class)
+    @ExcelProperty(value = "酒精检测", converter = AlcoholFlagConverter.class)
     private Integer alcoholFlag;
     /**
      * 酒精含量
@@ -58,9 +58,9 @@ public class ReportService {
         Map<String, String> names = driverMapper.getNameByJobCode(jobCodes).stream().collect(Collectors.toMap(Driver::getJobCode, Driver::getPersonnelName));
         if (SIGN_IN_ERROR.equals(request.getErrorType())) {
             copyToResponse(names, signInList, responses);
-        }else if (EQUIPMENT_ERROR.equals(request.getErrorType())) {
+        } else if (EQUIPMENT_ERROR.equals(request.getErrorType())) {
             copyToResponseByException(names, exceptionList, responses);
-        }else {
+        } else {
             copyToResponse(names, signInList, responses);
             copyToResponseByException(names, exceptionList, responses);
         }
@@ -41,12 +41,13 @@
                tag_rfid,
                remark,
                line_name,
-               line_code
+               line_code,
+               sign_in
         from driver
     </sql>
     <sql id="insertDriverVo">
         job_code
-        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code
+        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code,sign_in
     </sql>
     <select id="selectDriverList" parameterType="Driver" resultMap="DriverResult">
@@ -166,6 +167,7 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="lineName != null">line_name = #{lineName},</if>
             <if test="lineCode != null">line_code = #{lineCode},</if>
+            <if test="signIn != null">sign_in = #{signIn}</if>
         </trim>
         where id = #{id}
     </update>
@@ -250,7 +252,8 @@
             #{item.tagRfid,jdbcType=VARCHAR},
             #{item.remark,jdbcType=VARCHAR},
             #{item.lineName,jdbcType=VARCHAR},
-            #{item.lineCode,jdbcType=VARCHAR}
+            #{item.lineCode,jdbcType=VARCHAR},
+            #{item.signIn}
             )
         </foreach>
         on duplicate key update