vfj卡签查询修改

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

@@ -37,7 +37,7 @@ public class InvwQryCardBatch extends StringPropertyUUIDEntity {
 
     /** 批次总张数 */
     @Column(name = "TOTAL_COUNT")
-    private Integer totalCount;
+    private String totalCount;
 
     /** 申请状态
      * APP-申请中
@@ -77,6 +77,10 @@ public class InvwQryCardBatch extends StringPropertyUUIDEntity {
     @Column(name = "CHANEL")
     private String chanel;
 
+    /** 厂商*/
+    @Column(name = "CARD_PROVIDER")
+    private String cardProvider;
+
     /** 入库时间*/
     @Column(name = "INSERT_TIME")
     private LocalDateTime insertTime=LocalDateTime.now();

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

@@ -22,8 +22,8 @@ public class InvwQryCards extends StringPropertyUUIDEntity {
     private String cardNo;
 
     /** 卡片厂商 */
-    @Column(name = "PROVIDER")
-    private String provider;
+    @Column(name = "CARD_PROVIDER")
+    private String cardProvider;
 
     /** 卡片类型 */
     @Column(name = "CARD_TYPE")
@@ -48,10 +48,6 @@ public class InvwQryCards extends StringPropertyUUIDEntity {
     @Column(name = "CARD_SNR")
     private String cardSnr;
 
-    /** 发行次数 */
-    @Column(name = "ISSUE_COUNT")
-    private Integer issueCount;
-
     /** 渠道 */
     @Column(name = "CHANEL")
     private String chanel;
@@ -62,7 +58,7 @@ public class InvwQryCards extends StringPropertyUUIDEntity {
 
     /** 卡片厂商代码 */
     @Column(name = "PROVIDER_ID")
-    private String providerID;
+    private String providerId;
 
     /** 入库时间*/
     @Column(name = "INSERT_TIME")

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

@@ -46,12 +46,16 @@ public class InvwQryObuBatch extends StringPropertyUUIDEntity {
 
     /** 批次总张数 */
     @Column(name = "TOTAL_COUNT")
-    private Integer totalCount;
+    private String totalCount;
 
     /** 渠道名称 */
     @Column(name = "CHANEL")
     private String chanel;
 
+    /** 厂商 */
+    @Column(name = "CARD_PROVIDER")
+    private String cardProvider;
+
     /** 入库时间*/
     @Column(name = "INSERT_TIME")
     private LocalDateTime insertTime=LocalDateTime.now();

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

@@ -25,14 +25,6 @@ public class InvwQryObus extends StringPropertyUUIDEntity {
     @Column(name = "CARD_NO")
     private String cardNo;
 
-    /** 卡片类型
-     * 03-应急卡
-     * 22-储值卡
-     * 23-记账卡
-     */
-    @Column(name = "CARD_TYPE")
-    private String cardType;
-
     /** 卡片厂商 */
     @Column(name = "PROVIDER")
     private String provider;
@@ -76,6 +68,10 @@ public class InvwQryObus extends StringPropertyUUIDEntity {
     @Column(name = "CHANEL_ID")
     private String chanelId;
 
+    /** 版本号 */
+    @Column(name = "VERSION")
+    private String version;
+
     /** 加密类型
      * 0-双片国密OBU
      * 1-单片OBU

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/vfj/model/VfjQryCardBatchModel.java

@@ -31,7 +31,7 @@ public class VfjQryCardBatchModel extends BaseModel {
 
     /** 批次总张数 */
     @JsonProperty(value = "TotalCount")
-    private Integer totalCount;
+    private String totalCount;
 
     /** 申请状态 */
     @JsonProperty(value = "Status")
@@ -52,4 +52,8 @@ public class VfjQryCardBatchModel extends BaseModel {
     /** 渠道 */
     @JsonProperty(value = "Chanel")
     private String chanel;
+
+    /** 厂商 */
+    @JsonProperty(value = "CardProvider")
+    private String cardProvider;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/vfj/model/VfjQryCardsModel.java

@@ -18,8 +18,8 @@ public class VfjQryCardsModel extends BaseModel {
     private String cardNo;
 
     /** 卡片厂商 */
-    @JsonProperty(value = "Provider")
-    private String provider;
+    @JsonProperty(value = "CardProvider")
+    private String cardProvider;
 
     /** 卡片类型 */
     @JsonProperty(value = "CardType")
@@ -41,10 +41,6 @@ public class VfjQryCardsModel extends BaseModel {
     @JsonProperty(value = "CardSnr")
     private String cardSnr;
 
-    /** 发行次数 */
-    @JsonProperty(value = "IssueCount")
-    private Integer issueCount;
-
     /** 渠道 */
     @JsonProperty(value = "Chanel")
     private String chanel;
@@ -55,5 +51,5 @@ public class VfjQryCardsModel extends BaseModel {
 
     /** 卡片厂商代码 */
     @JsonProperty(value = "ProviderID")
-    private String providerID;
+    private String providerId;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/vfj/model/VfjQrySmObuBatchModel.java

@@ -39,9 +39,13 @@ public class VfjQrySmObuBatchModel extends BaseModel {
 
     /** 批次总张数 */
     @JsonProperty(value = "TotalCount")
-    private Integer totalCount;
+    private String totalCount;
 
     /** 渠道名称 */
     @JsonProperty(value = "Chanel")
     private String chanel;
+
+    /** 厂商 */
+    @JsonProperty(value = "CardProvider")
+    private String cardProvider;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/vfj/model/VfjQueryGmobusModel.java

@@ -23,7 +23,7 @@ public class VfjQueryGmobusModel extends BaseModel {
 
     /** 卡片厂商代码 */
     @JsonProperty(value = "ProviderID")
-    private String providerID;
+    private String providerId;
 
     /** 激活日期 */
     @JsonProperty(value = "ActiveDate")
@@ -52,4 +52,8 @@ public class VfjQueryGmobusModel extends BaseModel {
     /** 渠道ID */
     @JsonProperty(value = "ChanelId")
     private String chanelId;
+
+    /** 版本号 */
+    @JsonProperty(value = "Version")
+    private String version;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/vfj/model/VfjQueryScobusModel.java

@@ -21,17 +21,13 @@ public class VfjQueryScobusModel extends BaseModel {
     @JsonProperty(value = "CardNo")
     private String cardNo;
 
-    /** 卡片类型 */
-    @JsonProperty(value = "CardType")
-    private String cardType;
-
     /** 卡片厂商 */
     @JsonProperty(value = "Provider")
     private String provider;
 
     /** 卡片厂商代码 */
     @JsonProperty(value = "ProviderID")
-    private String providerID;
+    private String providerId;
 
     /** 激活日期 */
     @JsonProperty(value = "ActiveDate")
@@ -64,4 +60,8 @@ public class VfjQueryScobusModel extends BaseModel {
     /** 渠道ID */
     @JsonProperty(value = "ChanelId")
     private String chanelId;
+
+    /** 版本号 */
+    @JsonProperty(value = "Version")
+    private String version;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/vfj/model/VfjQueryTriDesObusModel.java

@@ -23,7 +23,7 @@ public class VfjQueryTriDesObusModel extends BaseModel {
 
     /** 卡片厂商代码 */
     @JsonProperty(value = "ProviderID")
-    private String providerID;
+    private String providerId;
 
     /** 激活日期 */
     @JsonProperty(value = "ActiveDate")

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

@@ -16,6 +16,7 @@ public class InvwQryObusPageRequest extends JpaDateTimePageableDataRequest<InvwQ
     private String startSerialNo;  // 起始OBU合同序列号
     private String endSerialNo;    // 结束OBU合同序列号
     private Integer status;        // 发行状态
+    private String encryptType;        // obu类型
 //    private String formatTimeStart;     // 格式化日期
 //    private String formatTimeEnd;       // 格式化日期
 
@@ -41,6 +42,7 @@ public class InvwQryObusPageRequest extends JpaDateTimePageableDataRequest<InvwQ
         }
         hql.append(" and status=:status", status);
         hql.append(" and providerID=:providerID", providerID);
+        hql.append(" and encryptType=:encryptType", encryptType);
 //        if(hasText(formatTimeStart))
 //            hql.append(" and formatTime>=:formatTimeStart", formatTimeStart);
 //        if(hasText(formatTimeEnd))

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

@@ -24,4 +24,6 @@ public class InvwQryObusPageRequestDTO extends AbstractStaffBizPageRequestDTO {
     private String endSerialNo;    // 结束OBU合同序列号
     @ApiModelProperty(value = "发行状态 0-流通中 2-一发成功")
     private Integer status;        // 发行状态
+    @ApiModelProperty(value = "OBU类型")
+    private String encryptType;
 }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwQryCardBatchManagerImpl.java

@@ -33,6 +33,9 @@ public class InvwQryCardBatchManagerImpl extends AbstractCommManager implements
     public Pagination page(InvwQryCardBatchPageRequestDTO request) {
         InvwQryCardBatchPageRequest req = new InvwQryCardBatchPageRequest();
         BeanUtils.copyProperties(request, req);
+        if(hasText(request.getBatchDateEnd())){
+            req.setBatchDateEnd(request.getBatchDateEnd() + "235959");
+        }
         return invwQryCardBatchRepo.page(req);
     }
 
@@ -40,6 +43,9 @@ public class InvwQryCardBatchManagerImpl extends AbstractCommManager implements
     public CommExcelFileResponseDTO export(InvwQryCardBatchPageRequestDTO request) throws ManagerException {
         InvwQryCardBatchPageRequest req = new InvwQryCardBatchPageRequest();
         BeanUtils.copyProperties(request, req);
+        if(hasText(request.getBatchDateEnd())){
+            req.setBatchDateEnd(request.getBatchDateEnd() + "235959");
+        }
         List<InvwQryCardBatch> list = invwQryCardBatchRepo.list(req);
         if (list.size() > 10000) {
             throw new ManagerException("导出数据超过10000条，请缩小范围");

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwQryObuBatchManagerImpl.java

@@ -33,6 +33,9 @@ public class InvwQryObuBatchManagerImpl extends AbstractCommManager implements I
     public Pagination page(InvwQryObuBatchPageRequestDTO request) {
         InvwQryObuBatchPageRequest req = new InvwQryObuBatchPageRequest();
         BeanUtils.copyProperties(request, req);
+        if(hasText(request.getApplyDateEnd())){
+            req.setApplyDateEnd(request.getApplyDateEnd() + "235959");
+        }
         return invwQryObuBatchRepo.page(req);
     }
 
@@ -40,6 +43,9 @@ public class InvwQryObuBatchManagerImpl extends AbstractCommManager implements I
     public CommExcelFileResponseDTO export(InvwQryObuBatchPageRequestDTO request) throws ManagerException {
         InvwQryObuBatchPageRequest req = new InvwQryObuBatchPageRequest();
         BeanUtils.copyProperties(request, req);
+        if(hasText(request.getApplyDateEnd())){
+            req.setApplyDateEnd(request.getApplyDateEnd() + "235959");
+        }
         List<InvwQryObuBatch> list = invwQryObuBatchRepo.list(req);
         if (list.size() > 10000) {
             throw new ManagerException("导出数据超过10000条，请缩小范围");

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/model/card/InvwQryCardBatchExcelModel.java

@@ -66,6 +66,10 @@ public class InvwQryCardBatchExcelModel implements Serializable {
     @ExcelProperty(value = "渠道")
     private String chanel;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "厂商")
+    private String cardProvider;
+
     @ColumnWidth(20)
     @ExcelProperty(value = "入库时间")
     private LocalDateTime insertTime;
@@ -81,11 +85,7 @@ public class InvwQryCardBatchExcelModel implements Serializable {
     //申请状态 APP-申请中 ISSUEING-发行中 DONE-发行完成 PERMIT-审批完成[数据就绪] REJECT-拒绝 JUDGEING-审批中 REJNOTRDY-驳回，待修正 FAIL-失败 APPROVAL-审批通过[待预制] PRECUT-预制数据中
     public String getStatus() {
         if (StringTools.hasText(status)) {
-            statusMap.forEach((k, v) -> {
-                if (status.equals(k)) {
-                    status = v;
-                }
-            });
+            statusMap.get(status);
         }
         return "";
     }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/model/card/InvwQryCardsExcelModel.java

@@ -29,7 +29,7 @@ public class InvwQryCardsExcelModel {
 
     @ColumnWidth(20)
     @ExcelProperty(value = "卡片厂商")
-    private String provider;
+    private String cardProvider;
 
     @ColumnWidth(15)
     @ExcelProperty(value = "卡片类型")
@@ -53,10 +53,6 @@ public class InvwQryCardsExcelModel {
     @ExcelProperty(value = "卡片SNR")
     private String cardSnr;
 
-    @ColumnWidth(15)
-    @ExcelProperty(value = "发行次数")
-    private Integer issueCount;
-
     @ColumnWidth(15)
     @ExcelProperty(value = "渠道")
     private String chanel;
@@ -67,7 +63,7 @@ public class InvwQryCardsExcelModel {
 
     @ColumnWidth(15)
     @ExcelProperty(value = "卡片厂商代码")
-    private String providerID;
+    private String providerId;
 
     @ColumnWidth(20)
     @ExcelProperty(value = "入库时间")

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/model/obu/InvwQryObuBatchExcelModel.java

@@ -48,12 +48,16 @@ public class InvwQryObuBatchExcelModel {
 
     @ColumnWidth(15)
     @ExcelProperty(value = "批次总张数")
-    private String totalCount;
+    private Integer totalCount;
 
     @ColumnWidth(20)
     @ExcelProperty(value = "渠道名称")
     private String chanel;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "厂商")
+    private String cardProvider;
+
     @ColumnWidth(20)
     @ExcelProperty(value = "入库时间")
     private LocalDateTime insertTime;