From bae204b51fe1b1d5b079415f9c8bb2df64f6f4af Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 23 Aug 2023 10:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E5=A4=8D=EF=BC=9B=E4=BF=AE=E5=A4=8D=E6=A0=B8?=
 =?UTF-8?q?=E9=94=80=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qs/serve/modules/vtb/entity/VtbVerification.java | 9 +++++++++
 .../vtb/service/impl/VtbVerificationServiceImpl.java     | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java
index c42d5e13..cfe0adf7 100644
--- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java
+++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java
@@ -42,9 +42,15 @@ public class VtbVerification implements Serializable {
     /** 申请id */
     private Long costApplyId;
 
+    @TableField(condition = SqlCondition.LIKE)
+    private String costApplyCode;
+
     /** 活动id */
     private Long activityId;
 
+    @TableField(condition = SqlCondition.LIKE)
+    private String activityCode;
+
     /** 政策项id */
     private Long policyItemId;
 
@@ -87,11 +93,13 @@ public class VtbVerification implements Serializable {
     /** 客户编码 */
     @NotBlank(message = "客户编码不能为空")
     @Length(max = 30,message = "客户编码长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String supplierCode;
 
     /** 客户名称 */
     @NotBlank(message = "客户名称不能为空")
     @Length(max = 30,message = "客户名称长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String supplierName;
 
     /** 支付方式id */
@@ -143,6 +151,7 @@ public class VtbVerification implements Serializable {
     private String userId;
 
     /** 用户编码 */
+    @TableField(condition = SqlCondition.LIKE)
     @Length(max = 32,message = "长度不能超过32字")
     private String userCode;
 
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
index fae01f2f..cda4df67 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
@@ -135,10 +135,12 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         if(condition!=null){
             verification.setPayConditionId(condition.getId());
         }
+        verification.setActivityCode(activity.getActivityCode());
+        verification.setCostApplyCode(costApply.getCode());
         verification.setAmountRecord(param.getTotalCheckAmount());
         verification.setAmount(param.getTotalCheckAmount());
         verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification));
-        verification.setVerificationState(VtbVerificationState.Commiting.getCode());
+        verification.setVerificationState(VtbVerificationState.Finished.getCode());
         verification.setCostApplyId(costApply.getId());
         verification.setActivityId(activity.getId());
         verification.setSupplierId(activity.getSupplierId());
@@ -601,6 +603,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         validActivity(cotractFlag,activity,true,isCurrentCommit);
         VtbVerification verification = new VtbVerification();
         verification.setId(verificationBo.getId());
+        verification.setCostApplyCode(costApply.getCode());
+        verification.setActivityCode(activity.getActivityCode());
         verification.setPayConditionId(verificationBo.getPayConditionId());
         verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification));
         verification.setVerificationState(VtbVerificationState.Commiting.getCode());