销售台账增加业务状态展示和查询条件

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java

@@ -48,6 +48,8 @@ import lombok.Data;
 @ApiModel(value = "车辆出库单 查询条件", description = "车辆出库单 查询条件")
 public class BaseVehicleOutApplyQueryNew implements Query {
 
+    @ApiModelProperty("业务状态")
+    private String isDelete;
     @ApiModelProperty("物料编码")
     private String materialCode;
     @ApiModelProperty("车架号")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java

@@ -50,6 +50,8 @@ public class BaseVehicleOutApplyVoNew implements Vo {
 
     @ApiModelProperty("sid")
     private String sid;
+    @ApiModelProperty("业务状态")
+    private String isDelete;
     @ApiModelProperty("车辆sid")
     private String vinSid;
     @ApiModelProperty("车架号")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@@ -6,6 +6,7 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew">
         SELECT
         bvo.`sid`,
+        IF(bvo.`isDelete` = 1, '作废','正常') AS isDelete,
         bvo.vinSid,
         bvo.vinNo,
         bvoa.`createOrgSid`,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@@ -120,6 +120,10 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
             } else if ("3".equals(orgLevelKey)) {
                 qw.eq("bvoa.createOrgSid", params.getCreateOrgSid());
             }
+            //业务状态
+            if (StringUtils.isNotBlank(params.getIsDelete())) {
+                qw.eq("bvo.isDelete", params.getIsDelete());
+            }
             //物料编码
             if (StringUtils.isNotBlank(params.getMaterialCode())) {
                 qw.like("bvo.materialCode", params.getMaterialCode());