From 35b207f958eb53876a20193127be1ade09f6bd3f Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 20 Jun 2023 14:39:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HisUserSupplierTempServiceImpl.java | 1 - .../modules/seeyon/entity/CtpAffairQo.java | 2 + .../seeyon/entity/dto/CtpAffairPageSo.java | 1 + .../service/SeeYonOperationService.java | 1 + .../tbs/common/util/TbsActivityUtil.java | 44 +++++++++ .../common/util/TbsBudgetLogBuildUtil.java | 2 +- .../tbs/controller/TbsActivityController.java | 4 + .../controller/TbsCostApplyController.java | 8 +- .../serve/modules/tbs/entity/TbsActivity.java | 24 +++++ .../modules/tbs/entity/TbsCostApply.java | 7 ++ .../tbs/entity/bo/TbsAffairCommitBo.java | 3 + .../modules/tbs/entity/so/TbsActivitySo.java | 3 + .../modules/tbs/entity/so/TbsCostApplySo.java | 30 ++++++ .../modules/tbs/entity/vo/TbsCostApplyVo.java | 7 ++ .../tbs/mapper/TbsCostApplyMapper.java | 13 +++ .../tbs/service/TbsCostApplyService.java | 6 ++ .../service/impl/TbsCostApplyServiceImpl.java | 31 ++++++ .../serve/modules/third/ThirdTokenUtil.java | 2 +- .../controller/TzcPolicyItemController.java | 14 ++- .../modules/tzc/entity/TzcPolicyItem.java | 24 ++++- .../tzc/entity/bo/TzcPolicyItemBo.java | 23 +++++ .../impl/TzcPolicyItemServiceImpl.java | 3 + .../controller/VtbVerificationController.java | 1 + .../vtb/entity/VtbVerificationYard.java | 2 + .../service/VtbVerificationApplication.java | 1 + .../impl/VtbVerificationServiceImpl.java | 3 + .../mapper/tbs/TbsCostApplyMapper.xml | 96 +++++++++++++++++++ 27 files changed, 347 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java create mode 100644 src/main/java/com/qs/serve/modules/tbs/entity/so/TbsCostApplySo.java create mode 100644 src/main/resources/mapper/tbs/TbsCostApplyMapper.xml diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java index fe201090..30f69c39 100644 --- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java @@ -50,7 +50,6 @@ public class HisUserSupplierTempServiceImpl extends ServiceImpl()); baseMapper.selectIntoHis(); } diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java index f084cfa0..bf9f487b 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java @@ -49,4 +49,6 @@ public class CtpAffairQo { String userName; String dataKey; + + String queryBizRegion; } diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/dto/CtpAffairPageSo.java b/src/main/java/com/qs/serve/modules/seeyon/entity/dto/CtpAffairPageSo.java index 92c52cd7..6b0d65ae 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/dto/CtpAffairPageSo.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/dto/CtpAffairPageSo.java @@ -14,4 +14,5 @@ public class CtpAffairPageSo { Integer state; Integer pageNum; Integer pageSize; + Integer queryBizRegion; } 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 fa287b50..9fc908ef 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 @@ -165,6 +165,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{ if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){ Assert.throwEx("当前账号未绑定致远用户信息"); } + param.setQueryBizRegion(param.getQueryBizRegion()); param.setMemberId(sysUser.getSyUserId()); param.setTemplateCode(getTemplateCode()); R> syResult = getRequestService().pageMemberAffair(param); diff --git a/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java b/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java new file mode 100644 index 00000000..4289911d --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java @@ -0,0 +1,44 @@ +package com.qs.serve.modules.tbs.common.util; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.util.SpringUtils; +import com.qs.serve.modules.sys.entity.SysConfig; +import com.qs.serve.modules.sys.service.SysConfigService; +import com.qs.serve.modules.tbs.entity.TbsActivity; +import org.springframework.beans.BeansException; + +import javax.swing.*; +import java.time.LocalDate; + +/** + * @author YenHex + * @since 2023/6/19 + */ +public class TbsActivityUtil { + + public static void buildOverdue(LambdaQueryWrapper lqw,Integer queryState){ + if(queryState!=null){ + if(queryState.equals(0)){ + lqw.gt(TbsActivity::getActEndDate, LocalDate.now()); + }else if(queryState.equals(1)){ + lqw.le(TbsActivity::getActEndDate, LocalDate.now()); + }else if(queryState.equals(2)){ + LocalDate now = LocalDate.now(); + int sysConfOfWarningDays = 0; + try { + SysConfigService configService = SpringUtils.getBean(SysConfigService.class); + SysConfig config = configService.getByKey("ExpenseApplicationActivityWriteOffOverdueWarningDays"); + String val = config.getConfigValue(); + sysConfOfWarningDays = Integer.parseInt(val); + } catch (BeansException | NumberFormatException e) { + e.printStackTrace(); + } + LocalDate startNow = now.plusDays( - sysConfOfWarningDays ); + lqw.between(TbsActivity::getActEndDate,startNow , now); + }else { + lqw.eq(TbsActivity::getId,"0"); + } + } + } + +} diff --git a/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetLogBuildUtil.java b/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetLogBuildUtil.java index 1ff00f40..f256354f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetLogBuildUtil.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetLogBuildUtil.java @@ -72,7 +72,7 @@ public class TbsBudgetLogBuildUtil { budgetLog.setAmount(buildAmount(amount,optType)); budgetLog.setScheduleId(item.getScheduleId()); budgetLog.setScheduleItemId(item.getScheduleItemId()); - budgetLog.setScheduleItemBudgetId(item.getId()); + budgetLog.setScheduleItemBudgetId(item.getScheduleItemBudgetId()); budgetLog.setItemName(item.getScheduleItemName()); budgetLog.setStartDate(item.getActStartDate().atStartOfDay()); budgetLog.setEndDate(item.getActEndDate().atStartOfDay()); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index d44c7ef7..50daa246 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -19,10 +19,12 @@ import com.qs.serve.modules.goods.service.GoodsCategoryService; import com.qs.serve.modules.goods.service.GoodsSkuService; import com.qs.serve.modules.goods.service.GoodsSpuService; import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysConfigService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsCenterType; import com.qs.serve.modules.tbs.common.TbsCostApplyState; import com.qs.serve.modules.tbs.common.TbsGoodsType; +import com.qs.serve.modules.tbs.common.util.TbsActivityUtil; import com.qs.serve.modules.tbs.entity.*; import com.qs.serve.modules.tbs.entity.bo.TbsActivityDefaultCenterBo; import com.qs.serve.modules.tbs.entity.bo.TbsActivityReopenBo; @@ -40,6 +42,7 @@ import com.qs.serve.modules.tbs.entity.so.TbsActivitySo; import com.qs.serve.modules.tbs.entity.bo.TbsActivityBo; import javax.validation.Valid; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -94,6 +97,7 @@ public class TbsActivityController { public R> getList(TbsActivitySo param){ TbsActivity entity = CopierUtil.copy(param,new TbsActivity()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); + TbsActivityUtil.buildOverdue(lqw,param.getOverdueState()); List list = tbsActivityService.list(lqw); for (TbsActivity activity : list) { QueryWrapper qw = new QueryWrapper<>(); 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 c453597d..5ef33c55 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 @@ -28,6 +28,7 @@ import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyActivityBo; import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyBo; import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult; +import com.qs.serve.modules.tbs.entity.so.TbsCostApplySo; import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo; import com.qs.serve.modules.tbs.entity.vo.TbsCostApplyVo; @@ -109,7 +110,8 @@ public class TbsCostApplyController { TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); lqw.orderByDesc(TbsCostApply::getId); - PageUtil.startPage(); + TbsCostApplySo query = new TbsCostApplySo(); + query.setOverdueState(param.getOverdueState()); List list = tbsCostApplyService.list(lqw); return R.ok(list); } @@ -132,6 +134,8 @@ public class TbsCostApplyController { lqw.in(TbsCostApply::getCreateBy,userIds); lqw.orderByDesc(TbsCostApply::getId); PageUtil.startPage(); + TbsCostApplySo query = new TbsCostApplySo(); + query.setOverdueState(param.getOverdueState()); List list = tbsCostApplyService.list(lqw); return R.ok(list); } @@ -170,6 +174,8 @@ public class TbsCostApplyController { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); lqw.orderByDesc(TbsCostApply::getId); PageUtil.startPage(); + TbsCostApplySo query = new TbsCostApplySo(); + query.setOverdueState(param.getOverdueState()); List list = tbsCostApplyService.list(lqw); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java index 58066df1..b6233738 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.tbs.entity; import java.math.BigDecimal; +import java.time.Duration; import java.time.LocalDate; import java.time.LocalDateTime; import java.io.Serializable; @@ -215,5 +216,28 @@ public class TbsActivity implements Serializable { @TableField(exist = false) Object applyUser; + /** + * 逾期值 + */ + @TableField(exist = false) + private Long overdueWarningDays; + + /** + * 系统参数 + */ + @TableField(exist = false) + private Integer expenseApplicationActivityWriteOffOverdueWarningDays; + + /** + * 处理预警时间 + * @param preDays + */ + public void initWarningDay(int preDays){ + if(this.getActivityState().equals(1)){ + Duration duration = Duration.between(this.getActEndDate(),LocalDate.now()); + overdueWarningDays = duration.toDays(); + } + } + } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index b5f1951a..e27fd0cf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java @@ -67,6 +67,12 @@ public class TbsCostApply implements Serializable { @TableField(fill = FieldFill.INSERT) private LocalDateTime submitTime; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime passTime; + /** 申请人 */ @NotBlank(message = "申请人不能为空") @Length(max = 32,message = "申请人长度不能超过32字") @@ -138,5 +144,6 @@ public class TbsCostApply implements Serializable { @TableField(exist = false) private Object contractInfo; + } 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 391972ea..cda3477b 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 @@ -37,6 +37,9 @@ public class TbsAffairCommitBo { @NotNull private String comment; + + private String caseRemark; + /** * 修改金额列表（核销接口专用） */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivitySo.java b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivitySo.java index f83244dc..a068ee73 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivitySo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivitySo.java @@ -79,5 +79,8 @@ public class TbsActivitySo implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime passEndTime; + /** 0=>未逾期、1=>已逾期、2=>即将逾期 */ + private Integer overdueState; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsCostApplySo.java b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsCostApplySo.java new file mode 100644 index 00000000..cd3a8c92 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsCostApplySo.java @@ -0,0 +1,30 @@ +package com.qs.serve.modules.tbs.entity.so; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 费用申请 VO + * @author YenHex + * @since 2022-11-09 + */ +@Data +public class TbsCostApplySo implements Serializable { + + /** + * 0=>未逾期、1=>已逾期、2=>即将逾期 + */ + Integer overdueState; + + LocalDate nowDate; + + LocalDate startNowDate; + +} + diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java index 5c6ad00a..62b5c495 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java @@ -83,5 +83,12 @@ public class TbsCostApplyVo implements Serializable { private Integer loadChild; private Integer contractFlag; + + + /** + * 0=>未逾期、1=>已逾期、2=>即将逾期 + */ + Integer overdueState; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyMapper.java index 973e35cb..83b76048 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyMapper.java @@ -1,11 +1,15 @@ package com.qs.serve.modules.tbs.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.qs.serve.modules.tbs.entity.TbsCostApply; +import com.qs.serve.modules.tbs.entity.so.TbsCostApplySo; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.math.BigDecimal; +import java.util.List; /** * 费用申请 Mapper @@ -14,5 +18,14 @@ import java.math.BigDecimal; */ public interface TbsCostApplyMapper extends BaseMapper { + /** + * 查询列表 + * @param lqw + * @param param + * @return + */ + List selectCostApplyList(@Param(Constants.WRAPPER)Wrapper lqw, + @Param("query")TbsCostApplySo param); + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java index e5738dde..5a06aee5 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java @@ -1,8 +1,12 @@ package com.qs.serve.modules.tbs.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.qs.serve.common.model.dto.R; import com.qs.serve.modules.tbs.entity.TbsCostApply; +import com.qs.serve.modules.tbs.entity.so.TbsCostApplySo; + +import java.util.List; /** * 费用申请 服务接口 @@ -11,6 +15,8 @@ import com.qs.serve.modules.tbs.entity.TbsCostApply; */ public interface TbsCostApplyService extends IService { + List selectList(LambdaQueryWrapper lqw, TbsCostApplySo costApplySo,boolean isPage); + /** * 提交申请 * @param id diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 1a3c7189..7b1f7c35 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -17,7 +17,9 @@ import com.qs.serve.modules.bms.service.BmsSupplierService; import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo; import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo; import com.qs.serve.modules.seeyon.service.SeeYonRequestService; +import com.qs.serve.modules.sys.entity.SysConfig; import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysConfigService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.common.TbsCostApplyState; @@ -26,16 +28,19 @@ import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil; import com.qs.serve.modules.tbs.entity.*; import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult; import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem; +import com.qs.serve.modules.tbs.entity.so.TbsCostApplySo; import com.qs.serve.modules.tbs.mapper.TbsActivityMapper; import com.qs.serve.modules.tbs.mapper.TbsActivityPayConditionMapper; import com.qs.serve.modules.tbs.service.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeansException; import org.springframework.stereotype.Service; import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -67,6 +72,31 @@ public class TbsCostApplyServiceImpl extends ServiceImpl selectList(LambdaQueryWrapper lqw, TbsCostApplySo costApplySo,boolean isPage) { + if(costApplySo!=null){ + LocalDate now = LocalDate.now(); + if(costApplySo.getOverdueState()!=null){ + costApplySo.setNowDate(now); + } + int sysConfOfWarningDays = 0; + try { + SysConfigService configService = SpringUtils.getBean(SysConfigService.class); + SysConfig config = configService.getByKey("ExpenseApplicationActivityWriteOffOverdueWarningDays"); + String val = config.getConfigValue(); + sysConfOfWarningDays = Integer.parseInt(val); + } catch (BeansException | NumberFormatException e) { + e.printStackTrace(); + } + LocalDate startNow = now.plusDays( - sysConfOfWarningDays ); + costApplySo.setStartNowDate(startNow); + } + if(isPage){ + PageUtil.startPage(); + } + return baseMapper.selectCostApplyList(lqw,costApplySo); + } + @Override @Transactional(rollbackFor = Exception.class) public void commitApply(String id) { @@ -334,6 +364,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl goodsList = tzcPolicyGoodsService.listByItemId(tzcPolicyItem.getId()); goodsList.forEach(TzcPolicyGoods::initSpuSkuName); tzcPolicyItem.setPolicyGoodsList(goodsList); + if(CollectionUtil.isNotEmpty(tzcPolicyItem.getAttachIds())){ + List attachIds = Arrays.asList(tzcPolicyItem.getAttachIds()); + List attachList = attachService.listByIds(attachIds); + tzcPolicyItem.setAttachList(attachList); + } return R.ok(tzcPolicyItem); } diff --git a/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyItem.java b/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyItem.java index 37055d78..35545749 100644 --- a/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyItem.java +++ b/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyItem.java @@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler; import com.qs.serve.modules.tbs.entity.TbsBudgetCondition; import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget; import lombok.Data; +import org.apache.ibatis.type.JdbcType; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; @@ -25,7 +27,7 @@ import java.util.List; * @since 2023-02-20 */ @Data -@TableName("tzc_policy_item") +@TableName(value = "tzc_policy_item",autoResultMap = true) public class TzcPolicyItem implements Serializable { private static final long serialVersionUID = 1L; @@ -145,6 +147,22 @@ public class TzcPolicyItem implements Serializable { /** 同步状态 */ private Integer syncStatus; + /** + * 附件id + */ + @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR) + private String[] attachIds; + + /** + * 预计销量 + */ + private Integer preActQuantity; + + /** + * 不做活动预计销量 + */ + private Integer preNotActQuantity; + /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") private String remark; @@ -190,6 +208,10 @@ public class TzcPolicyItem implements Serializable { @TableField(exist = false) List usedConditionList; + /** 附件列表 */ + @TableField(exist = false) + private List attachList; + public void initSetNull(){ this.setId(null); this.setCreateBy(null); diff --git a/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java b/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java index 07934103..9f383335 100644 --- a/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java +++ b/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java @@ -5,10 +5,13 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler; import lombok.Data; +import org.apache.ibatis.type.JdbcType; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; @@ -77,5 +80,25 @@ public class TzcPolicyItemBo implements Serializable { @NotNull(message = "商品列表参数不能为空") List policyGoodsList; + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** + * 附件 + */ + private String[] attachIds; + + /** + * 预计销量 + */ + private Integer preActQuantity; + + /** + * 不做活动预计销量 + */ + private Integer preNotActQuantity; + + } diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java index 8e097c18..93d547e9 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java @@ -111,6 +111,9 @@ public class TzcPolicyItemServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); 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 c8ad0976..2f346ed4 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 @@ -263,6 +263,7 @@ public class VtbVerificationController { param.setSupplierName(costApply.getSupplierName()); param.setSupplierCode(costApply.getSupplierCode()); param.setApplyUserName(costApply.getUserName()); + param.setQueryBizRegion(param.getQueryBizRegion()); param.setTemplateCode(TbsSeeYonConst.CostCheckConf.Code()); R> syResult = seeYonService.pageMemberAffair(param); PageVo pageVo = syResult.getData(); diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationYard.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationYard.java index 7173a91d..647a6256 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationYard.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationYard.java @@ -59,6 +59,8 @@ public class VtbVerificationYard implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + private String caseRemark; + /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index f37bf0d0..e8cb3300 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -112,6 +112,7 @@ public class VtbVerificationApplication { yard.setState(affairCommit.getState()); yard.setAffairId(affairCommit.getAffairId()); yard.setComment(affairCommit.getComment()); + yard.setCaseRemark(affairCommit.getCaseRemark()); //审批中(next)、完成(finish)、拒绝(refused) boolean isFinish = "finish".equals(flag); boolean isNext = "next".equals(flag); 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 ec2afc41..a92ab0f8 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 @@ -603,6 +603,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -611,6 +612,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tbs_cost_apply.`id`, + tbs_cost_apply.`code`, + tbs_cost_apply.`charge_theme`, + tbs_cost_apply.`supplier_id`, + tbs_cost_apply.`supplier_code`, + tbs_cost_apply.`supplier_name`, + tbs_cost_apply.`charge_state`, + tbs_cost_apply.`submit_time`, + tbs_cost_apply.`pass_time`, + tbs_cost_apply.`remark`, + tbs_cost_apply.`user_id`, + tbs_cost_apply.`user_code`, + tbs_cost_apply.`user_name`, + tbs_cost_apply.`sy_form_id`, + tbs_cost_apply.`sy_flow_id`, + tbs_cost_apply.`total_activity`, + tbs_cost_apply.`total_activity_amount`, + tbs_cost_apply.`total_activity_used_amount`, + tbs_cost_apply.`contract_flag`, + tbs_cost_apply.`create_time`, + tbs_cost_apply.`update_time`, + tbs_cost_apply.`tenant_id`, + tbs_cost_apply.`create_by`, + tbs_cost_apply.`update_by`, + tbs_cost_apply.`del_flag`, + tbs_cost_apply.`template_id` + + + + + + +