库存

gly-base-core/src/main/java/cn/com/taiji/core/entity/invw/InvwQryCardBatch.java

@@ -21,7 +21,9 @@ public class InvwQryCardBatch extends StringPropertyUUIDEntity {
     @Column(name = "BATCH_DATE")
     private String batchDate;
 
-    /** 卡片类型 */
+    /** 卡片类型
+     * 03-应急卡；22-储值卡；23-记账卡
+     * */
     @Column(name = "CARD_TYPE")
     private String cardType;
 

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/invw/InvwQryCardBatchPageRequest.java

@@ -12,7 +12,7 @@ import lombok.Setter;
 public class InvwQryCardBatchPageRequest extends JpaDateTimePageableDataRequest<InvwQryCardBatch> {
 
 	private String batchNo;                // 批次号
-	private String providerID;             // 卡片厂商代码
+//	private String providerID;             // 卡片厂商代码
 	private String version;                // 卡片版本号
 	private String cardType;               // 卡片类型
 	private String batchDateStart;         // 申请时间开始
@@ -27,7 +27,7 @@ public class InvwQryCardBatchPageRequest extends JpaDateTimePageableDataRequest<
 	public HqlBuilder toSelectHql() {
 		HqlBuilder hql = new HqlBuilder("from InvwQryCardBatch where 1=1 ");
 		hql.append(" and batchNo=:batchNo", batchNo);
-		hql.append(" and version=:version", version);
+		hql.append(" and cardVersion=:version", version);
 		hql.append(" and cardType=:cardType", cardType);
 		if (StringTools.hasText(batchDateStart)) {
 			hql.append(" and batchDate >= :batchDateStart", batchDateStart);
@@ -35,7 +35,7 @@ public class InvwQryCardBatchPageRequest extends JpaDateTimePageableDataRequest<
 		if (StringTools.hasText(batchDateEnd)) {
 			hql.append(" and batchDate <= :batchDateEnd", batchDateEnd);
 		}
-		hql.append(" and providerID=:providerID", providerID);
+//		hql.append(" and providerID=:providerID", providerID);
 		return hql;
 	}
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/invw/InvwQryCardsPageRequest.java

@@ -1,6 +1,5 @@
 package cn.com.taiji.core.repo.request.invw;
 
-import cn.com.taiji.common.pub.StringTools;
 import cn.com.taiji.common.pub.dao.HqlBuilder;
 import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
 import cn.com.taiji.core.entity.invw.InvwQryCards;
@@ -31,16 +30,23 @@ public class InvwQryCardsPageRequest extends JpaDateTimePageableDataRequest<Invw
     public HqlBuilder toSelectHql() {
         HqlBuilder hql = new HqlBuilder("from InvwQryCards where 1=1 ");
         hql.append(" and batchNo=:batchNo", batchNo);
-        hql.append(" and cardNo=:cardNo", cardNo);
-        hql.append(" and startCardNo=:startCardNo", startCardNo);
-        hql.append(" and endCardNo=:endCardNo", endCardNo);
+        if(hasText(cardNo)){
+            hql.append(" and cardNo=:cardNo", cardNo);
+        }else {
+            if (hasText(startCardNo)) {
+                hql.append(" and cardNo>=:startCardNo", startCardNo);
+            }
+            if (hasText(endCardNo)) {
+                hql.append(" and cardNo<=:endCardNo", endCardNo);
+            }
+        }
         hql.append(" and providerID=:providerID", providerID);
         hql.append(" and version=:version", version);
         hql.append(" and cardType=:cardType", cardType);
         hql.append(" and status=:status", status);
-//        if(StringTools.hasText(formatTimeStart))
+//        if(hasText(formatTimeStart))
 //            hql.append(" and formatTime>=:formatTimeStart", formatTimeStart);
-//        if(StringTools.hasText(formatTimeEnd))
+//        if(hasText(formatTimeEnd))
 //            hql.append(" and formatTime<=:formatTimeEnd", formatTimeEnd);
         return hql;
     }

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/invw/InvwQryObuBatchPageRequest.java

@@ -12,8 +12,8 @@ import lombok.Setter;
 public class InvwQryObuBatchPageRequest extends JpaDateTimePageableDataRequest<InvwQryObuBatch> {
 
     private String batchNo;             // 批次号
-    private String providerID;          // 厂商代码
-    private String version;             // 版本号
+//    private String providerID;          // 厂商代码
+//    private String version;             // 版本号
     private String obuType;             // OBU类型
     private String applyDateStart; 		// 申请时间开始
     private String applyDateEnd;   		// 申请时间结束
@@ -27,13 +27,13 @@ public class InvwQryObuBatchPageRequest extends JpaDateTimePageableDataRequest<I
     public HqlBuilder toSelectHql() {
         HqlBuilder hql = new HqlBuilder("from InvwQryObuBatch where 1=1 ");
         hql.append(" and batchNo=:batchNo", batchNo);
-        hql.append(" and version=:version", version);
+//        hql.append(" and version=:version", version);
         hql.append(" and obuType=:obuType", obuType);
         if (StringTools.hasText(applyDateStart))
             hql.append(" and applyDate>=:applyDateStart", applyDateStart);
         if (StringTools.hasText(applyDateEnd))
             hql.append(" and applyDate<=:applyDateEnd", applyDateEnd);
-        hql.append(" and providerID=:providerID", providerID);
+//        hql.append(" and providerID=:providerID", providerID);
         return hql;
     }
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/invw/InvwQryObusPageRequest.java

@@ -29,14 +29,21 @@ public class InvwQryObusPageRequest extends JpaDateTimePageableDataRequest<InvwQ
     public HqlBuilder toSelectHql() {
         HqlBuilder hql = new HqlBuilder("from InvwQryObus where 1=1 ");
         hql.append(" and batchNo=:batchNo", batchNo);
-        hql.append(" and serialNo=:serialNo", serialNo);
-        hql.append(" and startSerialNo=:startSerialNo", startSerialNo);
-        hql.append(" and endSerialNo=:endSerialNo", endSerialNo);
+        if(hasText(serialNo)) {
+            hql.append(" and serialNo=:serialNo", serialNo);
+        }else {
+            if(hasText(startSerialNo)){
+                hql.append(" and serialNo>=:startSerialNo", startSerialNo);
+            }
+            if(hasText(endSerialNo)){
+                hql.append(" and serialNo<=:endSerialNo", endSerialNo);
+            }
+        }
         hql.append(" and status=:status", status);
         hql.append(" and providerID=:providerID", providerID);
-//        if(StringTools.hasText(formatTimeStart))
+//        if(hasText(formatTimeStart))
 //            hql.append(" and formatTime>=:formatTimeStart", formatTimeStart);
-//        if(StringTools.hasText(formatTimeEnd))
+//        if(hasText(formatTimeEnd))
 //            hql.append(" and formatTime<=:formatTimeEnd", formatTimeEnd);
         return hql;
     }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/card/InvwQryCardBatchPageRequestDTO.java

@@ -14,19 +14,14 @@ import lombok.experimental.Accessors;
 public class InvwQryCardBatchPageRequestDTO extends AbstractStaffBizPageRequestDTO {
     @ApiModelProperty(value = "批次号")
     private String batchNo;                // 批次号
-    @ApiModelProperty(value = "卡片厂商代码")
-    private String providerID;             // 卡片厂商代码
+//    @ApiModelProperty(value = "卡片厂商代码")
+//    private String providerID;             // 卡片厂商代码
     @ApiModelProperty(value = "版本号")
     private String version;                // 卡片版本号
-    @ApiModelProperty(value = "卡片类型")
+    @ApiModelProperty(value = "卡片类型 03-应急卡 22-储值卡 23-记账卡")
     private String cardType;               // 卡片类型
-    @ApiModelProperty(value = "起始卡号")
+    @ApiModelProperty(value = "申请时间开始 格式yyyyMMdd字符串")
     private String batchDateStart;         // 申请时间开始
-    @ApiModelProperty(value = "结束卡号")
+    @ApiModelProperty(value = "申请时间结束 格式yyyyMMdd字符串")
     private String batchDateEnd;           // 申请时间结束
-    //    @ApiModelProperty(value = "起始卡号")
-    //    private String lastUpdateTimeStart;    // 最新更新日期开始
-    //    @ApiModelProperty(value = "结束卡号")
-    //    private String lastUpdateTimeEnd;      // 最新更新日期结束
-
 }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/card/InvwQryCardsPageRequestDTO.java

@@ -24,12 +24,9 @@ public class InvwQryCardsPageRequestDTO extends AbstractStaffBizPageRequestDTO {
     private String providerID;     // 厂商代码
     @ApiModelProperty(value = "版本号")
     private String version;        // 卡片版本号
-    @ApiModelProperty(value = "卡片类型")
+    @ApiModelProperty(value = "卡片类型 03-应急卡 22-储值卡 23-记账卡")
     private String cardType;       // 卡片类型
-    @ApiModelProperty(value = "发行状态")
+    @ApiModelProperty(value = "发行状态 0-流通中 2-一发成功")
     private Integer status;        // 发行状态
-//    @ApiModelProperty(value = "开始时间")
-//    private String formatTimeStart;     // 格式化日期
-//    @ApiModelProperty(value = "结束时间")
-//    private String formatTimeEnd;       // 格式化日期
+
 }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/obu/InvwQryObuBatchPageRequestDTO.java

@@ -14,14 +14,14 @@ import lombok.experimental.Accessors;
 public class InvwQryObuBatchPageRequestDTO extends AbstractStaffBizPageRequestDTO {
     @ApiModelProperty(value = "批次号")
     private String batchNo;             // 批次号
-    @ApiModelProperty(value = "卡片厂商代码")
-    private String providerID;          // 厂商代码
-    @ApiModelProperty(value = "卡片版本号")
-    private String version;             // 版本号
-    @ApiModelProperty(value = "卡片类型")
+//    @ApiModelProperty(value = "OBU厂商代码")
+//    private String providerID;          // 厂商代码
+//    @ApiModelProperty(value = "OBU版本号")
+//    private String version;             // 版本号
+    @ApiModelProperty(value = "OBU类型 0-单片 1-双片")
     private String obuType;             // OBU类型
-    @ApiModelProperty(value = "申请时间开始")
+    @ApiModelProperty(value = "申请时间开始 格式yyyyMMdd字符串")
     private String applyDateStart; 		// 申请时间开始
-    @ApiModelProperty(value = "申请时间结束")
+    @ApiModelProperty(value = "申请时间结束 格式yyyyMMdd字符串")
     private String applyDateEnd;   		// 申请时间结束
 }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/obu/InvwQryObusPageRequestDTO.java

@@ -22,10 +22,6 @@ public class InvwQryObusPageRequestDTO extends AbstractStaffBizPageRequestDTO {
     private String startSerialNo;  // 起始OBU合同序列号
     @ApiModelProperty(value = "结束OBU合同序列号")
     private String endSerialNo;    // 结束OBU合同序列号
-    @ApiModelProperty(value = "发行状态")
+    @ApiModelProperty(value = "发行状态 0-流通中 2-一发成功")
     private Integer status;        // 发行状态
-//    @ApiModelProperty(value = "开始时间")
-//    private String formatTimeStart;     // 格式化日期
-//    @ApiModelProperty(value = "结束时间")
-//    private String formatTimeEnd;       // 格式化日期
 }