fix: 修复签退显示无排班

guzijian
1 parent f41bd88c
Showing 3 changed files with 50 additions and 57 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/DriverResponseVo.java
@@ -8,6 +8,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
 import java.util.Date;
 /**
@@ -18,7 +19,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel("驾驶员信息对象")
-public class Driver extends BaseEntity {
+public class Driver extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
@@ -30,63 +31,54 @@ public class Driver extends BaseEntity {
      * 工号
      */
     @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;
     /**
@@ -100,32 +92,27 @@ public class Driver extends BaseEntity {
      * RFID 人卡IC号
      */
     @Excel(name = "RFID 人卡IC号")
-    @JsonIgnoreProperties(ignoreUnknown = true)
     private String icRfid;
     /**
      * RFID 人卡ID号（10进制）
      */
     @Excel(name = "RFID 人卡ID号", readConverterExp = "1=0进制")
-    @JsonIgnoreProperties(ignoreUnknown = true)
     private String idRfid;
     /**
      * 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;
     /**
      * 是否人脸注册
@@ -149,5 +136,4 @@ public class Driver extends BaseEntity {
     @Excel( name ="车队名称")
     private String fleetName;
-
 }
@@ -331,7 +331,7 @@ public class DriverServiceImpl implements IDriverService {
             DriverResponseVo vo = handleRecommendation(item, now, dto, schedulingFlag, alcoholFlag);
             // 无排班
             if (Objects.isNull(vo)) {
-                vos.add(new DriverResponseVo(null, item, null, false, false, "", "", ""));
+                vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, false, false, "", "", ""));
             } else {
                 vos.add(vo);
             }
@@ -339,7 +339,7 @@ public class DriverServiceImpl implements IDriverService {
         return vos;
     }
-    private DriverResponseVo handleRecommendation(Driver drivers, Long now, List<DriverScheduling> dto, Boolean schedulingFlag, Boolean alcoholFlag) {
+    private DriverResponseVo handleRecommendation(Driver driver, Long now, List<DriverScheduling> dto, Boolean schedulingFlag, Boolean alcoholFlag) {
         DriverResponseVo vo = null;
         // 给出计划操作
         if (!CollectionUtil.isEmpty(dto)) {
@@ -347,11 +347,11 @@ public class DriverServiceImpl implements IDriverService {
             if (BC_TYPE_OUT.equals(recommendation.getBcType())) {
                 // 售票员无需酒精测试
                 if (recommendation.getPosts().equals(PERSONNEL_POSTS_DRIVER))
-                    vo = new DriverResponseVo(recommendation.getTimestamps(), drivers, SIGN_IN_STRING, alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
+                    vo = DriverResponseVo.createDriverResponseVo(recommendation.getTimestamps(), driver, SIGN_IN_STRING, alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
                 else
-                    vo = new DriverResponseVo(recommendation.getTimestamps(), drivers, SIGN_IN_STRING, !alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
+                    vo = DriverResponseVo.createDriverResponseVo(recommendation.getTimestamps(), driver, SIGN_IN_STRING, !alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
             } else if (BC_TYPE_IN.equals(recommendation.getBcType())) {
-                vo = new DriverResponseVo(recommendation.getTimestamps(), drivers, SIGN_IN_OUT_STRING, !alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
+               vo= DriverResponseVo.createDriverResponseVo(recommendation.getTimestamps(), driver, SIGN_IN_OUT_STRING, !alcoholFlag, schedulingFlag, recommendation.getNbbm(), recommendation.getLpName(), recommendation.getLineName());
             }
         }
         return vo;
 package com.ruoyi.pojo.response;
+import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.google.common.collect.Maps;
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.driver.domain.Driver;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +16,9 @@ import lombok.Data;
  */
 @Data
 @ApiModel("驾驶员对象")
-public class DriverResponseVo extends Driver {
+public class DriverResponseVo extends Driver implements Serializable {
+    private static final long serialVersionUID = -1L;
+
     @ApiModelProperty("是否需要酒精测试(true:需要 ,false:不需要)")
     private Boolean checkAlcohol;
@@ -27,41 +33,42 @@ public class DriverResponseVo extends Driver {
     @ApiModelProperty("路牌")
     private String lpName;
-    public DriverResponseVo(Long signTime, Driver driver,String planAction,Boolean checkAlcohol,Boolean schedulingFlag,String nbbm,String lpName,String lineName){
-        this.setLineName(lineName);
-        this.setNbbm(nbbm);
-        this.setLpName(lpName);
-        this.setSignTime(signTime);
-        this.setSchedulingFlag(schedulingFlag);
-        this.setCheckAlcohol(checkAlcohol);
-        this.setPlanAction(planAction);
-        this.setId(driver.getId());
-        this.setJobCode(driver.getJobCode());
-        this.setCompanyCode(driver.getCompanyCode());
-        this.setBrancheCompanyCode(driver.getBrancheCompanyCode());
-        this.setPersonnelName(driver.getPersonnelName());
-        this.setPapersCode(driver.getPapersCode());
-        this.setIcCardCode(driver.getIcCardCode());
-        this.setPersonnelType(driver.getPersonnelType());
-        this.setPosts(driver.getPosts());
-        this.setCard(driver.getCard());
-        this.setTelphone(driver.getTelphone());
-        this.setIcRfid(driver.getIcRfid());
-        this.setIdRfid(driver.getIdRfid());
-        this.setTagRfid(driver.getTagRfid());
-        this.setLineName(driver.getLineName());
-        this.setLineCode(driver.getLineCode());
-        this.setFaceSignIn(driver.getFaceSignIn());
-        this.setImage(driver.getImage());
-        this.setUpdateTime(driver.getUpdateTime());
-        this.setSignInEquipment(driver.getSignInEquipment());
-        this.setFleetName(driver.getFleetName());
-        this.setSearchValue(driver.getSearchValue());
-        this.setCreateBy(driver.getCreateBy());
-        this.setCreateTime(driver.getCreateTime());
-        this.setUpdateBy(driver.getUpdateBy());
-        this.setUpdateTime(driver.getUpdateTime());
-        this.setRemark(driver.getRemark());
+
+    public static DriverResponseVo createDriverResponseVo(Long signTime, Driver driver,String planAction,Boolean checkAlcohol,Boolean schedulingFlag,String nbbm,String lpName,String lineName){
+        DriverResponseVo vo = new DriverResponseVo();
+        vo.setLineName(lineName);
+        vo.setNbbm(nbbm);
+        vo.setLpName(lpName);
+        vo.setSignTime(signTime);
+        vo.setSchedulingFlag(schedulingFlag);
+        vo.setCheckAlcohol(checkAlcohol);
+        vo.setPlanAction(planAction);
+        vo.setId(driver.getId());
+        vo.setJobCode(driver.getJobCode());
+        vo.setCompanyCode(driver.getCompanyCode());
+        vo.setBrancheCompanyCode(driver.getBrancheCompanyCode());
+        vo.setPersonnelName(driver.getPersonnelName());
+        vo.setPapersCode(driver.getPapersCode());
+        vo.setIcCardCode(driver.getIcCardCode());
+        vo.setPersonnelType(driver.getPersonnelType());
+        vo.setPosts(driver.getPosts());
+        vo.setCard(driver.getCard());
+        vo.setTelphone(driver.getTelphone());
+        vo.setIcRfid(driver.getIcRfid());
+        vo.setIdRfid(driver.getIdRfid());
+        vo.setTagRfid(driver.getTagRfid());
+        vo.setFaceSignIn(driver.getFaceSignIn());
+        vo.setImage(driver.getImage());
+        vo.setUpdateTime(driver.getUpdateTime());
+        vo.setSignInEquipment(driver.getSignInEquipment());
+        vo.setSearchValue(driver.getSearchValue());
+        vo.setCreateBy(driver.getCreateBy());
+        vo.setCreateTime(driver.getCreateTime());
+        vo.setUpdateBy(driver.getUpdateBy());
+        vo.setUpdateTime(driver.getUpdateTime());
+        vo.setRemark(driver.getRemark());
+        vo.setFleetName(driver.getFleetName());
+        return vo;
     }
     public DriverResponseVo(){}
 }