@@ -1,7 +1,7 @@ | |||
package cn.com.taiji.managew.dto.issueOrder; | |||
import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO; | |||
import cn.com.taiji.core.entity.dict.basic.VehiclePlateColorType; | |||
import cn.com.taiji.core.entity.dict.basic.PlateColorType; | |||
import cn.com.taiji.core.model.comm.protocol.constraint.EnumInteger; | |||
import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant; | |||
import io.swagger.annotations.ApiModel; | |||
@@ -38,7 +38,7 @@ public class OrderExaminePageReqDTO extends AbstractStaffBizPageRequestDTO { | |||
private String vehiclePlate; | |||
@ApiModelProperty("车牌颜色") | |||
@EnumInteger(enumClazz = VehiclePlateColorType.class) | |||
@EnumInteger(enumClazz = PlateColorType.class) | |||
private Integer vehiclePlateColor; | |||
@ApiModelProperty("客货类型 1-客车 2-货车 3-专项作业车") |
@@ -2,7 +2,7 @@ package cn.com.taiji.managew.dto.issueOrder; | |||
import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO; | |||
import cn.com.taiji.core.entity.dict.basic.SecretKeyType; | |||
import cn.com.taiji.core.entity.dict.basic.VehiclePlateColorType; | |||
import cn.com.taiji.core.entity.dict.basic.PlateColorType; | |||
import cn.com.taiji.core.entity.dict.issue.IssueOrderStatus; | |||
import cn.com.taiji.core.entity.dict.issue.IssueOrderStep; | |||
import cn.com.taiji.core.model.comm.protocol.constraint.EnumInteger; | |||
@@ -42,7 +42,7 @@ public class OrderPageReqDTO extends AbstractStaffBizPageRequestDTO { | |||
private String vehiclePlate; | |||
@ApiModelProperty(value = "车牌颜色") | |||
@EnumInteger(enumClazz = VehiclePlateColorType.class) | |||
@EnumInteger(enumClazz = PlateColorType.class) | |||
private Integer vehiclePlateColor; | |||
@ApiModelProperty(value = "审核类型 1-人工,2-系统") |
@@ -130,7 +130,7 @@ public class IssueOrderExamineManageImpl extends AbstractManagewManager implemen | |||
} else { | |||
order.setOrderStep(IssueOrderStep.AUDIT_FAIL); | |||
} | |||
order.setAuditOpId(staff.getOpenId()); | |||
order.setAuditOpenId(staff.getOpenId()); | |||
order.setAuditTime(LocalDateTime.now()); | |||
order.setArtificialStatus(1); | |||
issueOrderinfoRepo.merge(order); |
@@ -6,7 +6,7 @@ package cn.com.taiji.managew.repo.jpa.request; | |||
import cn.com.taiji.common.pub.dao.HqlBuilder; | |||
import cn.com.taiji.common.repo.request.jpa.JpaPageableDataRequest; | |||
import cn.com.taiji.core.entity.dict.basic.VehiclePlateColorType; | |||
import cn.com.taiji.core.entity.dict.basic.PlateColorType; | |||
import cn.com.taiji.core.entity.dict.issue.IssueOrderStep; | |||
import cn.com.taiji.core.entity.issue.IssueOrderinfo; | |||
import cn.com.taiji.core.model.comm.protocol.constraint.EnumInteger; | |||
@@ -37,7 +37,7 @@ public class IssueOrderExaminePageRequest extends JpaPageableDataRequest<IssueOr | |||
private String vehiclePlate; | |||
@ApiModelProperty("车牌颜色") | |||
@EnumInteger(enumClazz = VehiclePlateColorType.class) | |||
@EnumInteger(enumClazz = PlateColorType.class) | |||
private Integer vehiclePlateColor; | |||
@ApiModelProperty("客货类型 1-客车 2-货车 3-专项作业车") |
@@ -3,7 +3,7 @@ package cn.com.taiji.managew.repo.jpa.request; | |||
import cn.com.taiji.common.pub.dao.HqlBuilder; | |||
import cn.com.taiji.common.repo.request.jpa.JpaPageableDataRequest; | |||
import cn.com.taiji.core.entity.dict.basic.SecretKeyType; | |||
import cn.com.taiji.core.entity.dict.basic.VehiclePlateColorType; | |||
import cn.com.taiji.core.entity.dict.basic.PlateColorType; | |||
import cn.com.taiji.core.entity.dict.issue.IssueOrderStatus; | |||
import cn.com.taiji.core.entity.dict.issue.IssueOrderStep; | |||
import cn.com.taiji.core.entity.issue.IssueOrderinfo; | |||
@@ -41,7 +41,7 @@ public class IssueOrderPageRequest extends JpaPageableDataRequest<IssueOrderinfo | |||
private String vehiclePlate; | |||
@ApiModelProperty(value = "车牌颜色") | |||
@EnumInteger(enumClazz = VehiclePlateColorType.class) | |||
@EnumInteger(enumClazz = PlateColorType.class) | |||
private Integer vehiclePlateColor; | |||
@ApiModelProperty(value = "审核类型 1-人工,2-系统") |