diff --git a/doc/update.sql b/doc/update.sql index 50998a79..5d65f80f 100644 --- a/doc/update.sql +++ b/doc/update.sql @@ -3,3 +3,7 @@ update tbs_budget_condition set brand_id = SUBSTRING_INDEX(target_level_path_ids update tbs_budget set center_combo = concat(center_type,'_',center_id) +update vtb_verification v + left join tbs_activity act on act.id = v.activity_id + set v.activity_code = act.activity_code +where v.verification_main_code like 'DHX%' diff --git a/src/main/java/com/qs/serve/modules/bir/entity/so/BirCostRoiSo.java b/src/main/java/com/qs/serve/modules/bir/entity/so/BirCostRoiSo.java index 47dfcad0..f4e03d09 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/so/BirCostRoiSo.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/so/BirCostRoiSo.java @@ -18,10 +18,10 @@ public class BirCostRoiSo { * 加载类型 * 0->客户 * 1->申请人的客户(不含当前客户) - * 2->客户的行政区域(不含当前客户) + * 2->客户的行政区域，省份(不含当前客户) * 3->客户的销售区域(不含当前客户) * 4->客户的公司维度(替换原来的0) - * + * 5->客户的行政区域，城市(不含当前客户) */ private Integer loadType; diff --git a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java index 3cbdd3a5..af78fb11 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java @@ -22,7 +22,17 @@ public class BirRoiCostItemVo { private LocalDate yearMonthDate; /** - * 预估金额 + * TODO 预算目标 + */ + private BigDecimal budgetTargetAmt; + + /** + * TODO 预算统计金额 + */ + private BigDecimal budgetTotalAmt; + + /** + * 费用预估金额 */ private BigDecimal preAmt; @@ -42,12 +52,12 @@ public class BirRoiCostItemVo { private BigDecimal costRealAmt; /** - * 核销金额（实际金额） + * 核销金额（重复参数，与checkAmt一样） */ private BigDecimal checkRealAmt; /** - * 利润金额 + * 利润金额(无效参数) */ private BigDecimal returnAmt; @@ -56,8 +66,14 @@ public class BirRoiCostItemVo { */ private BigDecimal dispatchAmt; + /** + * 销售大区费用 + */ private BigDecimal regionTotalCostAmt; + /** + * 销售大区发货 + */ private BigDecimal regionTotalDispatchAmt; private Float ytdPercent; diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java index 6fca688a..0ae07ab5 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java @@ -107,7 +107,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl客户的销售区域 + //3->客户的销售区域，省份 if (checkNotNullVale(bmsSupplier.getRegionSecond())){ lqw.eq(BmsSupplier::getRegionSecond,bmsSupplier.getRegionSecond()); }else if(checkNotNullVale(bmsSupplier.getRegionFirst())){ @@ -447,6 +447,13 @@ public class BirRoiRateServiceImpl extends ServiceImpl城市，行政区域(不含当前客户) + if (checkNotNullVale(bmsSupplier.getRegion2Third())){ + lqw.eq(BmsSupplier::getRegion2Third,bmsSupplier.getRegion2Third()); + }else{ + lqw.eq(BmsSupplier::getId,"0"); + } } if (loadType.equals(2)||loadType.equals(3)||loadType.equals(4)){ List supplierList = bmsSupplierMapper.selectList(lqw); diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java b/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java index bb98dd33..7e5407b3 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.seeyon.entity.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.qs.serve.common.util.model.QsJsonLocalDateTimeDeserializer; @@ -66,6 +67,11 @@ public class SeeYonApproveDataVo { @JsonDeserialize(using = QsJsonLocalDateTimeDeserializer.class) private LocalDateTime commitTime; + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime updateTime; private Object valueInfo; 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 114d2612..f3b13390 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 @@ -206,6 +206,13 @@ public class TbsActivityController { List activityList = tbsActivityService.list(qw); List centerGoodsList = activityCenterGoodsService.list(qw); List voList = new ArrayList<>(); + + //初始化预期状态 + int overflowDays = TbsActivityUtil.getSysConfOfWarningDays(); + for (TbsActivity activity : activityList) { + activity.initWarningDay(overflowDays); + } + for (TbsActivityCenterGoods centerGoods : centerGoodsList) { TbsActivityCenterGoodsVo goods = CopierUtil.copy(centerGoods,new TbsActivityCenterGoodsVo()); for (TbsActivity activity : activityList) { @@ -243,15 +250,18 @@ public class TbsActivityController { } private void buildDetailVo(TbsActivity activity) { - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("activity_id", activity.getId()); - List goodsList = activityGoodsService.list(qw); + LambdaQueryWrapper actGoodsLqw = new LambdaQueryWrapper<>(); + actGoodsLqw.eq(TbsActivityGoods::getActivityId,activity.getId()); + actGoodsLqw.orderByDesc(TbsActivityGoods::getTargetName); + List goodsList = activityGoodsService.list(actGoodsLqw); if(goodsList.size()>0){ activity.setGoodsType(goodsList.get(0).getTargetType()); goodsList.forEach(TbsActivityGoods::initSpuSkuName); goodsList.forEach(TbsActivityGoods::initCategoryNameByPathsName); } activity.setGoodsList(goodsList); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("activity_id", activity.getId()); List activityChannels = activityChannelService.list(qw); activity.setCustomChannelList(activityChannels); if(activityChannels.size()<1){ 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 3d09eb88..2837c74b 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 @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -52,7 +53,6 @@ public class VtbVerificationDataController { } query.setActivityIds(activityIds); query.setOpenPage(1); - List list = verReportMapper.pageActiveAndVtbDataAmount(query); PageVo page = new PageVo<>(); page.initPageByTotal(count);