卡签续期调整

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/ass/AssDeviceRenewalPageRequest.java

@@ -17,10 +17,6 @@ import lombok.Setter;
 @Setter
 public class AssDeviceRenewalPageRequest extends JpaDateTimePageableDataRequest<AssDeviceRenewal> {
 
-    private String vehiclePlate;//车牌号
-
-    private String vehiclePlateColor;//车牌颜色
-
     private String cardId;//卡号
 
     private String obuId;//签号
@@ -35,8 +31,6 @@ public class AssDeviceRenewalPageRequest extends JpaDateTimePageableDataRequest<
     @Override
     public HqlBuilder toSelectHql() {
         HqlBuilder hql = new HqlBuilder("from AssDeviceRenewal where 1=1 ");
-        hql.append(" and vehiclePlate = :vehiclePlate", vehiclePlate);
-        hql.append(" and vehiclePlateColor = :vehiclePlateColor", vehiclePlateColor);
         hql.append(" and cardId = :cardId", cardId);
         hql.append(" and obuId = :obuId", obuId);
         hql.append(" and renewalType = :renewalType", renewalType);

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/DeviceRenewalManagerImpl.java

@@ -8,8 +8,8 @@ import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.basic.QtkCardInfo;
 import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
 import cn.com.taiji.core.entity.basic.QtkObuInfo;
-import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
+import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
 import cn.com.taiji.core.entity.dict.ass.AssOrderType;
 import cn.com.taiji.core.entity.dict.basic.CardStatus;
 import cn.com.taiji.core.entity.dict.basic.ObuStatus;
@@ -161,8 +161,6 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
             deviceRenewal.setObuExpireTime(obuInfo.getObuExpireTime());
             deviceRenewal.setOldObuExpireTime(dto.getOldObuExpireTime());
         }
-        deviceRenewal.setVehiclePlate(orderinfo.getVehicleId().split("_")[0]);
-        deviceRenewal.setVehiclePlateColor(Integer.valueOf(orderinfo.getVehicleId().split("_")[1]));
         deviceRenewal.setInsertTime(LocalDateTime.now());
         deviceRenewalRepo.save(deviceRenewal);
     }
@@ -230,7 +228,7 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
         }
         orderinfo.setOrderSource(dto.getOrderSource());
         orderinfo.setOrderStatus(AssOrderStatus.FINISHED);
-        orderinfo.setAuditStatus(AuditStatus.COMPLETE);
+        orderinfo.setOrderStep(AssOrderStep.COMPLETED);
         orderinfo.setOrderType(AssOrderType.RENEWAL);
         orderinfo.setChannelId(channelId);
         orderinfo.setApplyTime(now);

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/RenewalPageRequestDTO.java

@@ -11,11 +11,6 @@ import lombok.Setter;
 @Setter
 public class RenewalPageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
-    @ApiModelProperty(value = "车牌号")
-    private String vehiclePlate;
-
-    @ApiModelProperty(value = "车牌颜色")
-    private String vehiclePlateColor;
 
     @ApiModelProperty(value = "卡号")
     private String cardId;