From ea7b0f67bac0887206e9d9f4a4c0fa013b18af3b Mon Sep 17 00:00:00 2001 From: Yen Date: Sun, 25 Jun 2023 11:05:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=BE=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bir/controller/BirRoiRateController.java | 8 +-- .../modules/bir/entity/BirBaseActivity.java | 4 ++ .../serve/modules/bir/entity/BirRoiRate.java | 44 ++++++++-------- .../modules/bir/mapper/BirRoiRateMapper.java | 4 ++ .../impl/BirBaseActivityServiceImpl.java | 3 +- .../service/impl/BirRoiRateServiceImpl.java | 13 ++++- .../bms/controller/BmsRegionController.java | 16 +++--- .../serve/modules/bms/entity/BmsSupplier.java | 2 + .../his/controller/HistTestController.java | 4 ++ .../modules/his/entity/HisUserSupplier.java | 3 ++ .../his/entity/HisUserSupplierTemp.java | 3 ++ .../modules/seeyon/entity/CtpAffairQo.java | 6 +++ .../service/SeeYonOperationService.java | 4 +- .../tbs/common/util/TbsActivityUtil.java | 23 +++++---- .../tbs/controller/TbsActivityController.java | 4 ++ .../serve/modules/tbs/entity/TbsActivity.java | 33 ++++++++++-- .../modules/tbs/entity/bo/TbsActivityBo.java | 5 ++ .../service/impl/TbsActivityServiceImpl.java | 10 +++- .../service/impl/TbsCostApplyServiceImpl.java | 1 + .../tzc/controller/TzcPolicyController.java | 4 +- .../impl/TzcPolicyApplicationServiceImpl.java | 1 + .../impl/VtbVerificationServiceImpl.java | 1 + src/main/java/com/qs/serve/task/HisTask.java | 2 +- .../resources/mapper/bir/BirRoiRateMapper.xml | 51 ++++++++++++++++--- .../mapper/tbs/TbsCostApplyMapper.xml | 3 ++ 25 files changed, 192 insertions(+), 60 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index 34983855..4f51332e 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java @@ -16,12 +16,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import com.qs.serve.modules.bir.entity.BirRoiRate; import com.qs.serve.modules.bir.service.BirRoiRateService; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.util.ArrayList; import java.util.List; /** @@ -43,9 +39,9 @@ public class BirRoiRateController { * @return */ @GetMapping("/test") - public R> getPage(){ + public R getPage(){ //移除当年所有 - Integer year = 2023; + int year = 2023; LambdaQueryWrapper rmLqw = new LambdaQueryWrapper<>(); rmLqw.likeRight(BirBaseActivity::getKeyNum,year); activityService.remove(rmLqw); diff --git a/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java b/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java index 9ca20047..fec8c80d 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java @@ -39,6 +39,8 @@ public class BirBaseActivity implements Serializable { @NotNull(message = "活动id不能为空") private Long activityId; + private Long costApplyId; + /** 活动金额(费用投入金额) */ @NotNull(message = "活动金额(费用投入金额)不能为空") private BigDecimal activityAmt; @@ -51,6 +53,8 @@ public class BirBaseActivity implements Serializable { @NotNull(message = "核销金额不能为空") private BigDecimal verificationAmt; + private Long preActQuantity; + /** 客户id */ @NotNull(message = "客户id不能为空") private Long supplierId; diff --git a/src/main/java/com/qs/serve/modules/bir/entity/BirRoiRate.java b/src/main/java/com/qs/serve/modules/bir/entity/BirRoiRate.java index e9f9faad..6ad2caee 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/BirRoiRate.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/BirRoiRate.java @@ -107,28 +107,28 @@ public class BirRoiRate implements Serializable { private String delFlag; - public static BirRoiRate toNewObject(BirRoiRate source){ - BirRoiRate roiRate = new BirRoiRate(); - roiRate.setId(source.getId()); - roiRate.setKeyNum(source.getKeyNum()); - roiRate.setActivityAmt(source.getActivityAmt()); - roiRate.setVerificationAmt(source.getVerificationAmt()); - roiRate.setActivityState(source.getActivityState()); - roiRate.setShipmentType(source.getShipmentType()); - roiRate.setShipmentQty(source.getShipmentQty()); - roiRate.setShipmentAmt(source.getShipmentAmt()); - roiRate.setSupplierId(source.getSupplierId()); - roiRate.setSupplierCode(source.getSupplierCode()); - roiRate.setSupplierName(source.getSupplierName()); - roiRate.setUserId(source.getUserId()); - roiRate.setUserCode(source.getUserCode()); - roiRate.setUserName(source.getUserName()); - roiRate.setCreateTime(source.getCreateTime()); - roiRate.setUpdateTime(source.getUpdateTime()); - roiRate.setTenantId(source.getTenantId()); - roiRate.setDelFlag(source.getDelFlag()); - return roiRate; - } +// public static BirRoiRate toNewObject(BirRoiRate source){ +// BirRoiRate roiRate = new BirRoiRate(); +// roiRate.setId(source.getId()); +// roiRate.setKeyNum(source.getKeyNum()); +// roiRate.setActivityAmt(source.getActivityAmt()); +// roiRate.setVerificationAmt(source.getVerificationAmt()); +// roiRate.setActivityState(source.getActivityState()); +// roiRate.setShipmentType(source.getShipmentType()); +// roiRate.setShipmentQty(source.getShipmentQty()); +// roiRate.setShipmentAmt(source.getShipmentAmt()); +// roiRate.setSupplierId(source.getSupplierId()); +// roiRate.setSupplierCode(source.getSupplierCode()); +// roiRate.setSupplierName(source.getSupplierName()); +// roiRate.setUserId(source.getUserId()); +// roiRate.setUserCode(source.getUserCode()); +// roiRate.setUserName(source.getUserName()); +// roiRate.setCreateTime(source.getCreateTime()); +// roiRate.setUpdateTime(source.getUpdateTime()); +// roiRate.setTenantId(source.getTenantId()); +// roiRate.setDelFlag(source.getDelFlag()); +// return roiRate; +// } } diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java index 4fa5dad8..9b9df5a5 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java @@ -16,6 +16,10 @@ import java.util.List; */ public interface BirRoiRateMapper extends BaseMapper { + + @InterceptorIgnore(tenantLine = "1") + List queryForecastRoiCostItems(@Param("query") BirRoiCostDTO param); + @InterceptorIgnore(tenantLine = "1") List queryRoiCostItems(@Param("query") BirRoiCostDTO param); diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java index 3324291e..10e466e4 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java @@ -38,7 +38,6 @@ public class BirBaseActivityServiceImpl extends ServiceImpl queryRoiCostItems(BirRoiCostDTO param) { - return baseMapper.queryRoiCostItems(param); + List realDataList = baseMapper.queryRoiCostItems(param); + List forecastDataList = baseMapper.queryForecastRoiCostItems(param); + //合并数据 + for (BirRoiCostItemVo data1 : realDataList) { + for (BirRoiCostItemVo data2 : forecastDataList) { + if(data1.getYearMonth().equals(data2.getYearMonth())){ + data1.setCostAmt(data1.getCostAmt().add(data2.getCostAmt())); + data1.setCheckAmt(data1.getCheckAmt().add(data2.getCheckAmt())); + } + } + } + return realDataList; } @Override diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index b8ad256b..2b38abfb 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -111,6 +111,7 @@ public class BmsRegionController { List list3 = listMap.get(3)==null?new ArrayList<>():listMap.get(3); List list4 = listMap.get(4)==null?new ArrayList<>():listMap.get(4); + //return allList替换allSelectList代表 返回含该节点下级的数据，当前使用allSelectList List allList = new ArrayList<>(); if(CollectionUtil.isNotEmpty(list1)){ allList.addAll(list1); @@ -135,21 +136,22 @@ public class BmsRegionController { } } + List allSelectList = new ArrayList<>(); if(CollectionUtil.isNotEmpty(list2)){ List lv02Pids = list2.stream().map(BmsRegion::getId).collect(Collectors.toList()); List level03List = bmsRegionService.listChild(lv02Pids); if(CollectionUtil.isNotEmpty(level03List)){ - allList.addAll(level03List); + allSelectList.addAll(level03List); //list3 去重 list3 = removeExistList(list3,level03List); List lv03Pids = level03List.stream().map(BmsRegion::getId).collect(Collectors.toList()); List level04List = bmsRegionService.listChild(lv03Pids); //list4 去重 list4 = removeExistList(list4,level04List); - allList.addAll(level04List); + allSelectList.addAll(level04List); } list2.forEach(a->a.setPid("0")); - allList.addAll(list2); + allSelectList.addAll(list2); } if(CollectionUtil.isNotEmpty(list3)){ @@ -157,17 +159,17 @@ public class BmsRegionController { List level04List = bmsRegionService.listChild(lv03Pids); //list4 去重 list4 = removeExistList(list4,level04List); - allList.addAll(level04List); + allSelectList.addAll(level04List); list3.forEach(a->a.setPid("0")); - allList.addAll(list3); + allSelectList.addAll(list3); } if(CollectionUtil.isNotEmpty(list4)){ //list4 去重 list4.forEach(a->a.setPid("0")); - allList.addAll(list4); + allSelectList.addAll(list4); } - return toTreeNodeList2(allList); + return toTreeNodeList2(allSelectList); } return null; diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java index 9ea38af7..98baa1dd 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java @@ -301,6 +301,7 @@ public class BmsSupplier implements Serializable { userSupplier.setBizRegionSecond(this.getRegion2Second()); userSupplier.setBizRegionThird(this.getRegion2Third()); userSupplier.setBizRegionFourthly(this.getRegion2Fourthly()); + userSupplier.setSupplierFlag(this.getSupplierFlag()); userSupplier.setType(type); userSupplier.setCostFlag(this.costFlag); return userSupplier; @@ -325,6 +326,7 @@ public class BmsSupplier implements Serializable { userSupplier.setBizRegionSecond(this.getRegion2Second()); userSupplier.setBizRegionThird(this.getRegion2Third()); userSupplier.setBizRegionFourthly(this.getRegion2Fourthly()); + userSupplier.setSupplierFlag(this.getSupplierFlag()); userSupplier.setType(type); userSupplier.setCostFlag(this.costFlag); return userSupplier; diff --git a/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java b/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java index 504a68b9..8c01d8ec 100644 --- a/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java +++ b/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java @@ -2,6 +2,8 @@ package com.qs.serve.modules.his.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.config.DevEnvironmentConfig; +import com.qs.serve.common.framework.redis.RedisService; +import com.qs.serve.common.model.consts.RedisCacheKeys; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.PageUtil; @@ -31,10 +33,12 @@ public class HistTestController { HisUserChannelPointService hisUserChannelPointService; HisTask hisTask; + RedisService redisService; @GetMapping("/initSupplier") public R initSupplier(){ if(DevEnvironmentConfig.isDev()){ + redisService.set(RedisCacheKeys.HIS_UPDATE,1); hisTask.buildTempTable(); } return R.ok(); diff --git a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java index 7969e883..353917ec 100644 --- a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java +++ b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java @@ -105,6 +105,9 @@ public class HisUserSupplier implements Serializable { private Integer costFlag; + /** 是否供应商 */ + private Integer supplierFlag; + @TableField(exist = false) private String queryAddress; diff --git a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java index ccaa1252..55499803 100644 --- a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java +++ b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java @@ -75,6 +75,9 @@ public class HisUserSupplierTemp implements Serializable { @NotNull(message = "主要负责人不能为空") private Integer masterFlag; + /** 是否供应商 */ + private Integer supplierFlag; + /** 创建时间 */ @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/seeyon/entity/CtpAffairQo.java b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java index 5050e52c..d5fa9fa6 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 @@ -43,6 +43,12 @@ public class CtpAffairQo { */ String chargeTheme; + /** + * 记录编码 + */ + String recordCode; + + /** * 申请人名称 */ 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 52345260..aa986f50 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 @@ -157,7 +157,9 @@ public interface SeeYonOperationService extends SeeYonBaseService{ * @return */ default R> pageMemberAffair(CtpAffairQo param){ - param.setTitle(param.getChargeTheme()); + if(param.getChargeTheme()!=null){ + param.setTitle(param.getChargeTheme()); + } if(param.getUserName()!=null){ param.setApplyUserName(param.getUserName()); } 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 index 4289911d..5cbd137a 100644 --- 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 @@ -16,6 +16,19 @@ import java.time.LocalDate; */ public class TbsActivityUtil { + public static Integer getSysConfOfWarningDays(){ + 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(); + } + return sysConfOfWarningDays; + } + public static void buildOverdue(LambdaQueryWrapper lqw,Integer queryState){ if(queryState!=null){ if(queryState.equals(0)){ @@ -24,15 +37,7 @@ public class TbsActivityUtil { 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(); - } + int sysConfOfWarningDays = getSysConfOfWarningDays(); LocalDate startNow = now.plusDays( - sysConfOfWarningDays ); lqw.between(TbsActivity::getActEndDate,startNow , now); }else { 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 ad4bebbd..e6037f86 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 @@ -99,6 +99,7 @@ public class TbsActivityController { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); TbsActivityUtil.buildOverdue(lqw,param.getOverdueState()); List list = tbsActivityService.list(lqw); + int overflowDays = TbsActivityUtil.getSysConfOfWarningDays(); for (TbsActivity activity : list) { QueryWrapper qw = new QueryWrapper<>(); qw.eq("activity_id",activity.getId()); @@ -111,6 +112,7 @@ public class TbsActivityController { List activitySubjects = activitySubjectService.list(qw); activity.setSubjectCenterList(activitySubjects); this.buildDetailVo(activity); + activity.initWarningDay(overflowDays); } return R.ok(list); } @@ -135,6 +137,7 @@ public class TbsActivityController { lqw.orderByDesc(TbsActivity::getId); PageUtil.startPage(); List listObjects = tbsActivityService.list(lqw); + int overflowDays = TbsActivityUtil.getSysConfOfWarningDays(); if(listObjects.size()>0){ List listIds = listObjects.stream().map(a->a.getId()).collect(Collectors.toList()); List list = tbsActivityService.listByIds(listIds); @@ -144,6 +147,7 @@ public class TbsActivityController { } List sysUsers = sysUserService.listByIds(userIds); for (TbsActivity activity : list) { + activity.initWarningDay(overflowDays); if(activity.getCreateBy()==null){ continue; } 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 bd47d2d4..7950baa8 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 @@ -17,6 +17,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; +import java.time.Period; import java.util.List; /** * 费用活动 实体类 @@ -142,6 +143,8 @@ public class TbsActivity implements Serializable { @TableField(fill = FieldFill.UPDATE) private LocalDateTime finishedTime; + private Integer preActFlag; + /** 预计活动销量 */ private Long preActQuantity; @@ -231,14 +234,38 @@ public class TbsActivity implements Serializable { @TableField(exist = false) private Integer expenseApplicationActivityWriteOffOverdueWarningDays; + /** + * overdueState【0=>未逾期、1=>已逾期、2=>即将逾期】 + */ + @TableField(exist = false) + private Integer overdueState; + /** * 处理预警时间 * @param preDays */ public void initWarningDay(int preDays){ - if(this.getActivityState().equals(1)){ - Duration duration = Duration.between(this.getActEndDate(),LocalDate.now()); - overdueWarningDays = duration.toDays(); + overdueWarningDays = 0L; + if( !this.getActivityState().equals(2) + &&!this.getActivityState().equals(5) + &&this.getActEndDate()!=null){ + try { + LocalDate now = LocalDate.now(); + LocalDate end = this.getActEndDate(); + Period duration; + duration = Period.between(now,end); + overdueWarningDays = (long)duration.getDays(); + } catch (Exception e) { + e.printStackTrace(); + } + } + expenseApplicationActivityWriteOffOverdueWarningDays = preDays; + if(overdueWarningDays >= expenseApplicationActivityWriteOffOverdueWarningDays){ + overdueState = 0; + }else if(overdueWarningDays<0){ + overdueState = 1; + }else { + overdueState = 2; } } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java index a1945e6d..a825878b 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java @@ -62,6 +62,11 @@ public class TbsActivityBo implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private LocalDate preCheckDate; + /** + * 预算销量标识 + */ + private Integer preActFlag; + /** 预计活动销量 */ private Long preActQuantity; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index 53e8e7b7..5b28ed3b 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -131,8 +131,14 @@ public class TbsActivityServiceImpl extends ServiceImpl data = new HashMap<>(10); String actTitles = activityList.stream().map(TbsActivity::getActTitle).collect(Collectors.joining("; ")); + data.put("costApplyCode",tbsCostApply.getCode()); data.put("applyUserCode",sysUser.getCode()); data.put("applyUserName",sysUser.getName()); data.put("supplierName",tbsCostApply.getSupplierName()); diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java index 5befdd1b..93ebbe73 100644 --- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java +++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java @@ -262,7 +262,9 @@ public class TzcPolicyController { * @return */ @GetMapping("/pageMemberAffair") - public R> pageMemberAffair(CtpAffairQo param){ + public R> pageMemberAffair(CtpAffairQo param, + String policyCode){ + param.setRecordCode(policyCode); return tzcPolicyOperationService.pageMemberAffair(param); // param.setTitle(param.getChargeTheme()); // param.setApplyUserName(param.getUserName()); diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index ece94392..bb204336 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -162,6 +162,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); sysUser.checkSyAccount(); Map data = new HashMap<>(10); + data.put("exsp3",tzcPolicy.getPolicyCode()); data.put("applyUserCode",sysUser.getCode()); data.put("applyUserName",sysUser.getName()); data.put("supplierName",tzcPolicy.getSupplierName()); 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 51a609fd..878a1fcc 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 @@ -358,6 +358,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl data = new HashMap<>(20); + data.put("costApplyCode",verification.getVerificationCode()); data.put("applyUserCode",sysUser.getCode()); data.put("applyUserName",sysUser.getName()); data.put("supplierName",verification.getSupplierName()); diff --git a/src/main/java/com/qs/serve/task/HisTask.java b/src/main/java/com/qs/serve/task/HisTask.java index 5a89c223..a1c40427 100644 --- a/src/main/java/com/qs/serve/task/HisTask.java +++ b/src/main/java/com/qs/serve/task/HisTask.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Component @AllArgsConstructor -@ConditionalOnProperty(value = "project.task", havingValue = "true") +//@ConditionalOnProperty(value = "project.task", havingValue = "true") public class HisTask { RedisService redisService; diff --git a/src/main/resources/mapper/bir/BirRoiRateMapper.xml b/src/main/resources/mapper/bir/BirRoiRateMapper.xml index a8609b66..837534aa 100644 --- a/src/main/resources/mapper/bir/BirRoiRateMapper.xml +++ b/src/main/resources/mapper/bir/BirRoiRateMapper.xml @@ -46,6 +46,44 @@ + +