From 082af49046435abe0f30304e82d82c0a2e295a61 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 5 Sep 2023 09:39:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=94=AF=E6=8C=81=E6=83=85?= =?UTF-8?q?=E5=86=B5=E6=9F=A5=E8=AF=A2=EF=BC=9B=E4=BF=AE=E5=A4=8D=E9=A2=84?= =?UTF-8?q?=E7=AE=97=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SeeYonOperationService.java | 1 + .../impl/TbsBudgetChangeServiceImpl.java | 10 +++++++++ .../service/impl/TbsBudgetServiceImpl.java | 2 +- .../VtbVerificationDataController.java | 5 ++++- .../vtb/entity/so/VtbActivityCheckSo.java | 6 ++--- .../vtb/entity/so/VtbVerificationCheckSo.java | 5 +++++ .../mapper/vtb/VtbVerReportMapper.xml | 22 ++++++++++++++++++- 7 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java index d79dcfcb..ac2c4fbd 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java @@ -118,6 +118,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{ addNodeDTO.setUserCode(sysUser.getAccount()); addNodeDTO.setUserSyId(sysUser.getSyUserId()); addNodeDTO.setTemplateCode(getTemplateCode()); + addNodeDTO.setComment(param.getComment()); R result = getRequestService().addNode(addNodeDTO); if(result.getData()!=null&&result.getData().toLowerCase(Locale.ROOT).contains("ok")){ return R.ok(); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java index f8d548e7..96fd3c99 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java @@ -153,6 +153,16 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl() + .in(TbsBudgetChange::getBudgetId,budget.getId()) + .eq(TbsBudgetChange::getBudgetCheckState,TbsBudgetCheckState.State_1_apply) + ); + if(countExist>0){ + Assert.throwEx("当前预算已存在修改审批"); + } + if(param.getOrgChangeId()!=null){ TbsBudgetChange orgBudgetChange = this.getById(param.getOrgChangeId()); if(orgBudgetChange.getBudgetCheckState().equals(TbsBudgetCheckState.State_3_setback)){ diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index c0036929..378ed119 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -329,7 +329,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl budget.setBudgetState(1); budget.setBudgetCheckState(TbsBudgetCheckState.State_2_finished); this.updateById(budget); - SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); + SysUser sysUser = sysUserService.getById(budget.getUserId()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsScheduleItemBudget::getBudgetId,id); List scheduleItemBudgets = scheduleItemBudgetService.list(lqw); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java index ed0b2ecb..cafd70ee 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.vtb.controller; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.util.PageUtil; import com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO; import com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO; import com.qs.serve.modules.vtb.entity.so.VtbActivityCheckSo; @@ -37,6 +38,7 @@ public class VtbVerificationDataController { public R> getActivityData(VtbActivityCheckSo query){ Long count = verReportMapper.countActivityCheck(query); if(count>0){ + query.setStartRow(PageUtil.getStartRow()); List list = verReportMapper.pageActivityCheck(query); PageVo page = new PageVo<>(); page.initPageByTotal(count); @@ -52,9 +54,10 @@ public class VtbVerificationDataController { * @return */ @GetMapping("pageVerificationCheck") - public R getVerificationData(VtbVerificationCheckSo query){ + public R> getVerificationData(VtbVerificationCheckSo query){ Long count = verReportMapper.countVerificationCheck(query); if(count>0){ + query.setStartRow(PageUtil.getStartRow()); List list = verReportMapper.pageVerificationCheck(query); PageVo page = new PageVo<>(); page.initPageByTotal(count); diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java index a619c9bc..5460a63a 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java @@ -39,17 +39,17 @@ public class VtbActivityCheckSo { /** 提交结束时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime queryEndSubmitTime; + private String queryEndSubmitTime; /** 核销开始时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime queryStartCheckTime; + private String queryStartCheckTime; /** 核销开始时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime queryEndCheckTime; + private String queryEndCheckTime; private Integer pageSize; diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java index 633fc80f..3b3282b4 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java @@ -27,6 +27,7 @@ public class VtbVerificationCheckSo { /** 活动内容 */ private String actTitle; + /** 开始核销时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime startCheckTime; @@ -35,6 +36,7 @@ public class VtbVerificationCheckSo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime endCheckTime; + /** 开始支付时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime startPayTime; @@ -43,4 +45,7 @@ public class VtbVerificationCheckSo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime endPayTime; + private Integer pageSize; + + private Integer startRow; } diff --git a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml index 5682a1f4..be385929 100644 --- a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml +++ b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml @@ -20,6 +20,10 @@ and `tbs_cost_apply`.`charge_theme` like concat('%',#{query.costTitle},'%') + + + + + + + + + + + + + + + + + + - select vtb.verification_code , vtb.supplier_code , @@ -123,6 +141,7 @@ left join tbs_activity act on act.id = vtb.activity_id where vtb.del_flag = 0 + and vtb.verification_state = 1 and act.del_flag = 0 and act.cancel_flag = 0 and cost.del_flag = 0 @@ -136,6 +155,7 @@ and `cost`.`charge_theme` like concat('%',#{query.chargeTheme},'%') and `vtb`.`finished_time` >= #{query.startCheckTime} and `vtb`.`finished_time` <= #{query.endCheckTime} + limit #{query.startRow},#{query.pageSize}