From 67a792deedaabf75293e2e3ba9f886ba888a41e7 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 15 Dec 2022 08:37:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=AF=B9=E6=8E=A5OA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qs/serve/common/util/HttpUtil.java | 3 + .../modules/seeyon/entity/CtpAffair.java | 1 + .../modules/seeyon/service/SeeYonService.java | 2 +- .../service/impl/SeeYonServiceImpl.java | 11 +- .../modules/tbs/common/TbsActivityState.java | 2 +- .../tbs/common/VtbVerificationState.java | 24 ---- .../controller/TbsCostApplyController.java | 21 +++- .../modules/tbs/entity/TbsBudgetCostItem.java | 3 + .../tbs/entity/bo/TbsAffairCommitBo.java | 2 +- .../modules/tbs/entity/vo/CtpAffairVo.java | 3 + .../vtb/common/VtbVerificationState.java | 7 +- .../controller/VtbVerificationController.java | 103 +++++++++++++----- .../vtb/entity/VtbVerificationSubject.java | 12 ++ .../vtb/service/VtbVerificationService.java | 6 + .../service/impl/VtbFundFlowServiceImpl.java | 6 + .../impl/VtbVerificationServiceImpl.java | 22 +++- 16 files changed, 160 insertions(+), 68 deletions(-) delete mode 100644 src/main/java/com/qs/serve/modules/tbs/common/VtbVerificationState.java diff --git a/src/main/java/com/qs/serve/common/util/HttpUtil.java b/src/main/java/com/qs/serve/common/util/HttpUtil.java index fc41877f..b6562716 100644 --- a/src/main/java/com/qs/serve/common/util/HttpUtil.java +++ b/src/main/java/com/qs/serve/common/util/HttpUtil.java @@ -125,6 +125,9 @@ public class HttpUtil { public static R doPostResult(String url, String jsonStr, HashMap headers){ String result = HttpUtil.doPost(url,jsonStr,headers); log.debug("url:{},result:{}",url,result); + if(result==null){ + Assert.throwEx("远程服务连接失败"); + } JSONObject jsonObject = JSONObject.parseObject(result); Integer status = jsonObject.getInteger("status"); String msg = jsonObject.getString("msg"); diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java index fdc82b97..e960c7ca 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java @@ -26,6 +26,7 @@ public class CtpAffair { private String formRecordId; + /** 费用申请id、核销id */ private String costApplyId; /** 评论内容 */ diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java index d27a80e5..2e2b9be8 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java @@ -17,7 +17,7 @@ import java.util.List; */ public interface SeeYonService { - R> commonListAffairs(String syFormId, String tmpCode); + R> commonListAffairs(String syFormId, String tmpCode); R commonCommit(TbsAffairCommitBo affairCommit,String formCode); diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java index 3d5e3c1f..3fb634bc 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java @@ -39,7 +39,7 @@ public class SeeYonServiceImpl implements SeeYonService { @Nullable @Override - public R> commonListAffairs(String syFormId, String tmpCode) { + public R> commonListAffairs(String syFormId, String tmpCode) { SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){ return R.error("当前账号未绑定致远用户信息"); @@ -47,8 +47,8 @@ public class SeeYonServiceImpl implements SeeYonService { CtpAffairQo param = new CtpAffairQo(); param.setFormMainId(syFormId); param.setTemplateCodes(Arrays.asList(tmpCode)); - R> syResult = this.listFormAffair(param); - List ctpAffairs = syResult.getData(); + return this.listFormAffair(param); + /*List ctpAffairs = syResult.getData(); if(ctpAffairs.size()>0){ List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); List userList = sysUserService.listByOaMemberIds(oaUserIds); @@ -64,8 +64,7 @@ public class SeeYonServiceImpl implements SeeYonService { result.add(ctpAffairVo); } return R.ok(result); - } - return null; + }*/ } @Override @@ -174,7 +173,7 @@ public class SeeYonServiceImpl implements SeeYonService { if(result.getStatus()!=200){ log.error("致远服务失败[{},{}]\nParam:{}",title,result.getMsg(),JsonUtil.objectToJson(param)); } - log.debug("致远data：{}",result.getData()); + log.debug("致远服务返回R：{}",JsonUtil.objectToJson(result)); return result; } diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsActivityState.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsActivityState.java index c69267a3..137c3516 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsActivityState.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsActivityState.java @@ -7,7 +7,7 @@ package com.qs.serve.modules.tbs.common; public interface TbsActivityState { /** - * 活动状态：0-待核销；1-审批中；2-完成；3-冻结 + * 活动状态：0-待核销；1-审批中；2-完成；3-冻结；4-已释放费用 */ Integer STATE_0_Todo = 0; Integer STATE_1_Checking = 1; diff --git a/src/main/java/com/qs/serve/modules/tbs/common/VtbVerificationState.java b/src/main/java/com/qs/serve/modules/tbs/common/VtbVerificationState.java deleted file mode 100644 index eb39c6bd..00000000 --- a/src/main/java/com/qs/serve/modules/tbs/common/VtbVerificationState.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.qs.serve.modules.tbs.common; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author YenHex - * @since 2022/11/28 - */ -@Getter -@AllArgsConstructor -public enum VtbVerificationState { - - //状态:0=未发布；1=审批中；2=待执行；3=完成；4-被驳回;5-中止 - State_0_unPublish(0), - State_1_apply(1), - State_2_actioning(2), - State_3_finished(3), - State_4_refused(4), - State_5_stop(5); - - private Integer code; - -} diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 31c1d09b..9384002c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -256,7 +256,25 @@ public class TbsCostApplyController { return R.ok(); } String tmpCode = TbsSeeYonConst.COST_APPLY_FORM; - return seeYonService.commonListAffairs(syFormId, tmpCode); + R> syResult = seeYonService.commonListAffairs(syFormId, tmpCode); + List ctpAffairs = syResult.getData(); + if(ctpAffairs.size()>0){ + List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); + List userList = sysUserService.listByOaMemberIds(oaUserIds); + List result = new ArrayList<>(); + for (CtpAffair ctpAffair : ctpAffairs) { + CtpAffairVo ctpAffairVo = new CtpAffairVo(); + ctpAffairVo.setAffairInfo(ctpAffair); + for (SysUser user : userList) { + if(ctpAffair.getMemberId().equals(user.getSyUserId())){ + ctpAffairVo.setUserInfo(user.toSysUserVo()); + } + } + result.add(ctpAffairVo); + } + return R.ok(result); + } + return R.ok(); } /** @@ -336,6 +354,7 @@ public class TbsCostApplyController { apply.setId(costApply.getId()); apply.setChargeState(TbsCostApplyState.State_5_stop.getCode()); tbsCostApplyService.updateById(apply); + //todo 释放预算费用 return R.ok(); }else if ("next".equals(flag)){ return R.ok(); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java index 12118912..d3076e70 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java @@ -205,6 +205,9 @@ public class TbsBudgetCostItem implements Serializable { /** TbsActivityCenterGoods的id */ private Long centerGoodItemId; + /** todo 是否无效（退回，拒绝时使用） */ + private Integer invalidFlag; + /** 请忽略，后端传输参数 */ @TableField(exist = false) diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java index e0771eaa..2f829879 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; public class TbsAffairCommitBo { /** - * 费用申请id、费用申请id + * 费用申请id、核销id */ @NotNull private Long costApplyId; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java index 9c294304..9dae9a01 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java @@ -24,4 +24,7 @@ public class CtpAffairVo { /** 审批人 */ private Object userInfo; + /** 活动 */ + private Object activityInfo; + } diff --git a/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java b/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java index 11560230..0575564d 100644 --- a/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java +++ b/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java @@ -11,9 +11,10 @@ import lombok.Getter; @AllArgsConstructor public enum VtbVerificationState { - Commit(0), - Success(1), - Fail(2), + //状态:0=审批中；1=完成；2-中止;3-回滚 + Commiting(0), + Finished(1), + Stop(2), Rollback(3); private Integer code; diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 5ebbaac2..a0cb2745 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -15,12 +15,16 @@ import com.qs.serve.modules.sys.entity.SysAttach; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysAttachService; import com.qs.serve.modules.sys.service.SysUserService; +import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.common.TbsCostApplyState; import com.qs.serve.modules.tbs.common.TbsSeeYonConst; -import com.qs.serve.modules.tbs.common.VtbVerificationState; +import com.qs.serve.modules.tbs.entity.TbsActivity; import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; +import com.qs.serve.modules.tbs.service.TbsActivityService; +import com.qs.serve.modules.tbs.service.TbsCostApplyService; +import com.qs.serve.modules.vtb.common.VtbVerificationState; import com.qs.serve.modules.vtb.entity.VtbVerificationChannel; import com.qs.serve.modules.vtb.entity.VtbVerificationChannelPoint; import com.qs.serve.modules.vtb.entity.VtbVerificationSubject; @@ -28,8 +32,10 @@ import com.qs.serve.modules.vtb.entity.so.VtbVerificationSubjectSo; import com.qs.serve.modules.vtb.service.VtbVerificationChannelPointService; import com.qs.serve.modules.vtb.service.VtbVerificationChannelService; import com.qs.serve.modules.vtb.service.VtbVerificationSubjectService; +import com.tencentcloudapi.as.v20180419.models.Activity; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -59,6 +65,8 @@ public class VtbVerificationController { private VtbVerificationChannelService vtbVerificationChannelService; private VtbVerificationChannelPointService vtbVerificationChannelPointService; private VtbVerificationSubjectService vtbVerificationSubjectService; + private TbsActivityService tbsActivityService; + private TbsCostApplyService tbsCostApplyService; private SysAttachService attachService; private SysUserService sysUserService; private SeeYonService seeYonService; @@ -129,13 +137,15 @@ public class VtbVerificationController { */ @GetMapping("/ListAffairs") public R> pageMemberAffair(Long verificationId){ - VtbVerification verification = vtbVerificationService.getById(verificationId); - String syFormId = verification.getSyFormId(); + VtbVerification verificationDB = vtbVerificationService.getById(verificationId); + String syFormId = verificationDB.getSyFormId(); if(syFormId==null){ return R.ok(); } String tmpCode = TbsSeeYonConst.VERIFICATION_FORM; - return seeYonService.commonListAffairs(syFormId, tmpCode); + R> result = seeYonService.commonListAffairs(syFormId, tmpCode); + List result2 = this.buildCtpAffairVoList(result.getData()); + return R.ok(result2); } /** @@ -161,31 +171,63 @@ public class VtbVerificationController { PageVo pageVo = syResult.getData(); List ctpAffairs = pageVo.getList(); if(ctpAffairs.size()>0){ - List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); - List userList = sysUserService.listByOaMemberIds(oaUserIds); - List verificationIds = ctpAffairs.stream().map(CtpAffair::getCostApplyId).collect(Collectors.toList()); - List vtbVerificationList = vtbVerificationService.listByIds(verificationIds); - List result = new ArrayList<>(); - for (CtpAffair ctpAffair : ctpAffairs) { - CtpAffairVo ctpAffairVo = new CtpAffairVo(); - for (VtbVerification verification : vtbVerificationList) { - if(verification.getId().toString().equals(ctpAffair.getCostApplyId())){ - ctpAffairVo.setVerification(verification); - break; + List result = this.buildCtpAffairVoList(ctpAffairs); + PageVo costApplyPageVo = PageVo.initNewList(pageVo,result); + return R.ok(costApplyPageVo); + } + return R.byEmptyList(); + } + + @NotNull + private List buildCtpAffairVoList(List ctpAffairs) { + if(CollectionUtil.isEmpty(ctpAffairs)){ + return new ArrayList<>(); + } + List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); + List userList = sysUserService.listByOaMemberIds(oaUserIds); + List verificationIds = ctpAffairs.stream().map(CtpAffair::getCostApplyId).collect(Collectors.toList()); + List vtbVerificationList = new ArrayList<>(); + List activityList = new ArrayList<>(); + List costApplyList = new ArrayList<>(); + if(verificationIds.size()>0){ + vtbVerificationList = vtbVerificationService.listByIds(verificationIds); + List actIds = vtbVerificationList.stream().map(VtbVerification::getActivityId).collect(Collectors.toList()); + if(actIds.size()>0){ + activityList = tbsActivityService.listByIds(actIds); + List costIds = activityList.stream().map(TbsActivity::getCostApplyId).distinct().collect(Collectors.toList()); + costApplyList = tbsCostApplyService.listByIds(costIds); + } + } + List result = new ArrayList<>(); + for (CtpAffair ctpAffair : ctpAffairs) { + CtpAffairVo ctpAffairVo = new CtpAffairVo(); + for (VtbVerification verification : vtbVerificationList) { + if(verification.getId().toString().equals(ctpAffair.getCostApplyId())){ + ctpAffairVo.setVerification(verification); + for (TbsActivity activity : activityList) { + if(verification.getActivityId().equals(activity.getId())){ + ctpAffairVo.setActivityInfo(activity); + for (TbsCostApply costApply : costApplyList) { + if(activity.getCostApplyId().equals(costApply.getId())){ + ctpAffairVo.setCostApply(costApply); + } + break; + } + break; + } } + break; } - for (SysUser user : userList) { - if(ctpAffair.getMemberId().equals(user.getSyUserId())){ - ctpAffairVo.setUserInfo(user.toSysUserVo()); - } + } + for (SysUser user : userList) { + if(ctpAffair.getMemberId().equals(user.getSyUserId())){ + ctpAffairVo.setUserInfo(user.toSysUserVo()); } - ctpAffairVo.setAffairInfo(ctpAffair); - result.add(ctpAffairVo); } - PageVo costApplyPageVo = PageVo.initNewList(pageVo,result); - return R.ok(costApplyPageVo); + ctpAffairVo.setAffairInfo(ctpAffair); + result.add(ctpAffairVo); } - return R.byEmptyList(); + return result; } /** @@ -197,7 +239,7 @@ public class VtbVerificationController { @PreAuthorize("hasRole('tbs:costApply:commit')") public R commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){ VtbVerification verification = vtbVerificationService.getById(affairCommit.getCostApplyId()); - if(!verification.getVerificationState().equals(VtbVerificationState.State_1_apply.getCode())){ + if(!verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){ return R.error("费用申请处于未非审批状态!"); } R result = seeYonService.commonCommit(affairCommit,TbsSeeYonConst.VERIFICATION_FORM); @@ -208,13 +250,20 @@ public class VtbVerificationController { if("finish".equals(flag)){ VtbVerification vtbVer = new VtbVerification(); vtbVer.setId(verification.getId()); - vtbVer.setVerificationState(VtbVerificationState.State_2_actioning.getCode()); + vtbVer.setVerificationState(VtbVerificationState.Finished.getCode()); vtbVerificationService.updateById(vtbVer); + vtbVerificationService.successCommit(verification.getId()); + return R.ok(); }else if ("stop".equals(flag)){ VtbVerification vtbVer = new VtbVerification(); vtbVer.setId(verification.getId()); - vtbVer.setVerificationState(VtbVerificationState.State_5_stop.getCode()); + vtbVer.setVerificationState(VtbVerificationState.Stop.getCode()); vtbVerificationService.updateById(vtbVer); + //还原活动为待核销状态 + TbsActivity activity = new TbsActivity(); + activity.setId(verification.getActivityId()); + activity.setActivityState(TbsActivityState.STATE_0_Todo); + tbsActivityService.updateById(activity); return R.ok(); }else if ("next".equals(flag)){ return R.ok(); diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java index 804c1c92..123848a9 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java @@ -61,6 +61,15 @@ public class VtbVerificationSubject implements Serializable { @Length(max = 50,message = "科目名称长度不能超过50字") private String subjectName; + /** 客户id */ + private Long supplierId; + + /** 客户编码 */ + private String supplierCode; + + /** 客户名称 */ + private String supplierName; + /** 本次核销额 */ @NotNull(message = "本次核销额不能为空") private BigDecimal usedAmount; @@ -110,5 +119,8 @@ public class VtbVerificationSubject implements Serializable { @JsonProperty private String delFlag; + /** 是否有效（0：否；1：是） */ + private Integer effectiveFlag; + } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java index 1e542484..6253d0e6 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java @@ -42,6 +42,12 @@ public interface VtbVerificationService extends IService { */ void successCommit(Long verificationId); + /** + * 释放费用占用（不更改核销状态） + * @param verificationId + */ + void releaseVerification(Long verificationId); + /** * 检测释放正在核销 * @param activityId diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java index fbd7fa51..d5783795 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.vtb.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.util.CollectionUtil; +import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.entity.TbsActivity; import com.qs.serve.modules.tbs.entity.TbsActivityCenter; import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods; @@ -83,6 +84,11 @@ public class VtbFundFlowServiceImpl extends ServiceImpl verificationSubjects = validCreateVeriSubject(verificationBo, activity, costApply); + List verificationSubjects = validCreateVeriSubject(verificationBo, activity, costApply, supplier); //设置总金额 BigDecimal totalAmount = BigDecimal.ZERO; for (VtbVerificationSubject verificationSubject : verificationSubjects) { @@ -202,6 +206,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl validCreateVeriSubject(VtbVerificationBo verificationBo, TbsActivity activity, TbsCostApply costApply) { + private List validCreateVeriSubject(VtbVerificationBo verificationBo, TbsActivity activity, TbsCostApply costApply,BmsSupplier supplier) { List verificationSubjects = new ArrayList<>(); List activitySubjects = activitySubjectService.listByActivityId(activity.getId()); List existFundFlowList = fundFlowService.listByActivity(activity.getId(), VtbFundFlowType.Verification); @@ -343,6 +348,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(VtbVerification::getActivityId,activityId); - lqw.eq(VtbVerification::getVerificationState, VtbVerificationState.Commit.getCode()); + lqw.eq(VtbVerification::getVerificationState, VtbVerificationState.Commiting.getCode()); return this.count(lqw)>0; } }