更改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApply.java

@@ -31,52 +31,39 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-base(调车开票) <br/>
- * File: BaseShuntingInvoicingApply.java <br/>
- * Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApply <br/>
- * Description: 调车开票申请表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-07-11 15:30:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "调车开票申请表", description = "调车开票申请表")
 @TableName("base_shunting_invoicing_apply")
 public class BaseShuntingInvoicingApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("申请日期")
+    @ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
     @ApiModelProperty("调车类型key")
     private String shuntingTypeKey; // 调车类型key
     @ApiModelProperty("调车类型value")
     private String shuntingTypeValue; // 调车类型value
-	@ApiModelProperty("调出分公司sid")
+    @ApiModelProperty("调出分公司sid")
     private String callOutOrgSid; // 调出分公司sid
-	@ApiModelProperty("调出分公司名称")
+    @ApiModelProperty("调出分公司名称")
     private String callOutOrgName; // 调出分公司名称
-	@ApiModelProperty("调入分公司sid")
+    @ApiModelProperty("调入分公司sid")
     private String callInOrgSid; // 调入分公司sid
-	@ApiModelProperty("调入分公司名称")
+    @ApiModelProperty("调入分公司名称")
     private String callInOrgName; // 调入分公司名称
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("taskId")
+    @ApiModelProperty("taskId")
     private String taskId; // taskId
 
     @ApiModelProperty("申请人组织路径")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyRest.java

@@ -32,7 +32,6 @@ import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoic
 import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyTaskQuery;
 import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.SubmitBaseShuntingInvoicingApplyDto;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
-import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.core.query.PagerQuery;
@@ -43,23 +42,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
-/**
- * Project: anrui-base(调车开票) <br/>
- * File: BaseShuntingInvoicingApplyFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyRest <br/>
- * Description: 调车开票申请表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-07-11 15:30:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "调车开票申请表")
-@RestController("com.yxt.anrui.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyRest")
+@RestController
 @RequestMapping("v1/baseshuntinginvoicingapply")
 public class BaseShuntingInvoicingApplyRest implements BaseShuntingInvoicingApplyFeign {
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -3420,6 +3420,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                     .or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode())
                     .or().eq("bv.vehicleState", VehicleState.StockEnum.RETURN_STOCK.getCode())
             );
+            qw.orderByDesc("bv.createTime");
         }
         return qw;
     }