From 00af1a40cb1fd740049d7d29546a1c5860730497 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 28 Jun 2024 17:54:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=88=E5=B9=B6=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/seeyon/SeeYonController.java | 5 +++++ .../controller/TbsBudgetBatchController.java | 17 +++++++++++++++ .../VtbVerificationBatchController.java | 21 ++++++++++++------- .../modules/vtb/entity/VtbVerification.java | 6 ++++++ .../vtb/entity/VtbVerificationBatch.java | 5 ++++- .../vtb/entity/bo/VtbVerificationBatchBo.java | 4 ++++ ...VerificationBatchOperationServiceImpl.java | 18 ++++++++-------- .../impl/VtbVerificationBatchServiceImpl.java | 20 +++++++++++++++--- 8 files changed, 75 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java b/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java index 791b6135..0d6d7c6c 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java +++ b/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java @@ -25,6 +25,8 @@ import com.qs.serve.modules.tbs.service.TbsCostTodoService; import com.qs.serve.modules.tzc.entity.TzcPolicy; import com.qs.serve.modules.tzc.service.TzcPolicyService; import com.qs.serve.modules.vtb.entity.VtbVerification; +import com.qs.serve.modules.vtb.entity.VtbVerificationBatch; +import com.qs.serve.modules.vtb.service.VtbVerificationBatchService; import com.qs.serve.modules.vtb.service.VtbVerificationService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -55,6 +57,7 @@ public class SeeYonController { private TbsActivityService activityService; private CommonCheckService commonCheckService; private TbsCostTodoService tbsCostTodoService; + private VtbVerificationBatchService vtbVerificationBatchService; /** * 我的审批列表 @@ -225,6 +228,8 @@ public class SeeYonController { info = policyService.getById(obj.getTargetId()); }else if (tempCode.equals("CheckCostAgree")){ info = tbsCostTodoService.getById(obj.getTargetId()); + }else if (tempCode.equals("BatchCheckCost")){ + info = vtbVerificationBatchService.getById(obj.getTargetId()); } obj.setValueInfo(info); affairList.add(obj); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java index 66ea799d..49438fef 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java @@ -7,6 +7,7 @@ import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; @@ -16,6 +17,7 @@ import com.qs.serve.modules.sys.service.SysAttachService; import com.qs.serve.modules.tbs.common.consts.ChangeTypeEnum; import com.qs.serve.modules.tbs.entity.TbsBudgetBatchItem; import com.qs.serve.modules.tbs.entity.TbsBudgetChange; +import com.qs.serve.modules.tbs.entity.TbsBudgetChangeScheduleItem; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import com.qs.serve.modules.tbs.entity.bo.TbsBudgetBatchBo; import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; @@ -99,6 +101,21 @@ public class TbsBudgetBatchController { changeList.add(budgetChange); } } + + for (TbsBudgetChange change : changeList) { + if(!change.getNewBudgetTitle().equals(change.getBudgetTitle())){ + List items = (List)change.getChangeScheduleItemList(); + if(items==null){ + items = new ArrayList<>(); + } + if(CollectionUtil.isEmpty(items)){ + TbsBudgetChangeScheduleItem changeTitle = new TbsBudgetChangeScheduleItem(); + items.add(changeTitle); + } + change.setChangeScheduleItemList(items); + } + } + budgetBatch.setChangeList(changeList); List attachList = sysAttachService.listByIdArrs(budgetBatch.getAttachIds()); budgetBatch.setAttachList(attachList); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java index f5e7a954..7229a31b 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java @@ -31,6 +31,8 @@ import org.springframework.web.bind.annotation.*; import com.qs.serve.modules.vtb.entity.VtbVerificationBatch; import javax.validation.Valid; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -164,19 +166,22 @@ public class VtbVerificationBatchController { * @return */ @GetMapping("/listCommitChanges") - public R getList(Long batchId){ + public R> getList(Long batchId){ List verifications = vtbVerificationService.list(new LambdaQueryWrapper() .eq(VtbVerification::getBatchId,batchId)); if(CollectionUtil.isEmpty(verifications)){ return R.error("批次参数异常"); } - VtbVerification verification = verifications.get(0); - LambdaQueryWrapper yardLqw = new LambdaQueryWrapper<>(); - yardLqw.eq(VtbVerificationYard::getVerificationId,verification.getId()); - yardLqw.orderByDesc(VtbVerificationYard::getId); - List yardList = verificationYardService.list(yardLqw); - Map result = vtbVerificationApplication2.buildCommentChangeList(verification, yardList); - return R.ok(result); + List rsList = new ArrayList(); + for (VtbVerification verification : verifications) { + LambdaQueryWrapper yardLqw = new LambdaQueryWrapper<>(); + yardLqw.eq(VtbVerificationYard::getVerificationId,verification.getId()); + yardLqw.orderByDesc(VtbVerificationYard::getId); + List yardList = verificationYardService.list(yardLqw); + Map itemRs = vtbVerificationApplication2.buildCommentChangeList(verification, yardList); + rsList.add(itemRs); + } + return R.ok(rsList); } } 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 f45ea963..a9682f0f 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 @@ -207,6 +207,12 @@ public class VtbVerification implements Serializable { @TableField(exist = false) List subjectList; + /** + * 批次ID信息 + */ + @TableField(exist = false) + private Object batchInfo; + /** * 活动信息 */ diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationBatch.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationBatch.java index d3458d26..158cd03a 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationBatch.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationBatch.java @@ -104,6 +104,9 @@ public class VtbVerificationBatch implements Serializable { @Length(max = 32,message = "致远流程id长度不能超过32字") private String syFlowId; + /** 申请时的金额合计 */ + private BigDecimal applyCheckAmount; + /** 客户id */ @NotNull(message = "客户id不能为空") private String supplierId; @@ -162,7 +165,7 @@ public class VtbVerificationBatch implements Serializable { int CHECKING = 0; int CHECK_OK = 1; int CHECK_REFUSE = 2; - int CHECK_BACK = 2; + int CHECK_BACK = 3; } } diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBatchBo.java b/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBatchBo.java index d63acd94..ed733071 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBatchBo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBatchBo.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.vtb.entity.bo; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -26,4 +27,7 @@ public class VtbVerificationBatchBo { /** 费用申请ID */ private Long costApplyId; + /** 申请时的合计金额 */ + private BigDecimal totalAmount; + } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java index 194a0768..9b4fbbdb 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java @@ -49,8 +49,8 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification @Override public String getSyFormIdByTargetInfo(TbsAffairCommitBo affairCommit) { - Assert.throwEx("方法未定义getSyFormIdByTargetInfo"); - return null; + VtbVerificationBatch batch = vtbVerificationBatchService.getById(affairCommit.getTargetId()); + return batch.getSyFormId(); } @Override @@ -70,10 +70,10 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification @Override public Object doFinished(TbsAffairCommitBo param) { - //退回 + //完成 VtbVerificationBatch batch = vtbVerificationBatchService.getById(param.getTargetId()); List verificationList = vtbVerificationBatchService.listVerifications(batch.getId()); - batch.setVtbBatchStatus(VtbVerificationBatch.BatchState.CHECK_BACK); + batch.setVtbBatchStatus(VtbVerificationBatch.BatchState.CHECK_OK); batch.setBackedTime(LocalDateTime.now()); vtbVerificationBatchService.updateById(batch); for (VtbVerification verification : verificationList) { @@ -157,7 +157,7 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification //保存到每个核销 for (VtbVerification verification : verificationList) { DataAffairCommit obj = CopierUtil.copy(dataAffairCommit,new DataAffairCommit()); - obj.setId(null); + obj.setId(commitParam.getAffairId()+"_"+verification.getId()); obj.setTargetId(verification.getId()+""); obj.setTargetCode(verification.getVerificationCode()); dataAffairCommitMapper.insert(obj); @@ -192,10 +192,10 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification yard.setBatchId(Long.parseLong(commitParam.getTargetId())); yard.setVerificationId(verification.getId()); yard.setVerificationSubCode(verification.getVerificationCode()); - yard.setState(itemCommit.getState()); - yard.setAffairId(itemCommit.getAffairId()); - yard.setComment(itemCommit.getComment()); - yard.setCaseRemark(itemCommit.getCaseRemark()); + yard.setState(commitParam.getState()); + yard.setAffairId(commitParam.getAffairId()); + yard.setComment(commitParam.getComment()); + yard.setCaseRemark(commitParam.getCaseRemark()); //审批中(next)、完成(finish)、拒绝(refused) boolean isFinish = "finished".equals(flag); boolean isNext = "next".equals(flag); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java index 2369b7f9..82a747dc 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java @@ -148,14 +148,18 @@ public class VtbVerificationBatchServiceImpl extends ServiceImpl formIdResult = seeYonService.getFormId(templateCode,verificationBatch.getId()); + if(formIdResult.getStatus()==200){ + formId = formIdResult.getData(); + } + verificationBatch.setSyFormId(formId); + this.updateById(verificationBatch); + //移除历史提交记录 for (Long orgVerificationId : orgVerificationIds) { verificationChannelService.removeByVerificationId(orgVerificationId); @@ -382,6 +394,8 @@ public class VtbVerificationBatchServiceImpl extends ServiceImpl