From 7ac9e0a83ed1f3f3b192e1c5dcaf9898eb2e8c7e Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 4 Jan 2023 17:33:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmsMasterUserController.java | 2 +- .../controller/GoodsCategoryController.java | 1 + .../impl/GoodsCategoryServiceImpl.java | 1 + .../serve/modules/pay/entity/PayPayment.java | 1 + .../serve/modules/qms/entity/QmsCategory.java | 1 + .../qs/serve/modules/qms/entity/QmsForm.java | 1 + .../TbsActivityTemplateController.java | 24 ++++++++++++++----- .../controller/TbsCostApplyController.java | 1 + .../tbs/entity/TbsActivityTemplate.java | 1 + .../modules/tbs/entity/TbsCostApply.java | 3 +++ .../serve/modules/tbs/entity/TbsSchedule.java | 2 ++ .../modules/tbs/entity/so/TbsBudgetSo.java | 3 +++ .../service/TbsBudgetApplicationService.java | 14 +++++------ .../resources/mapper/tbs/TbsBudgetMapper.xml | 1 + 14 files changed, 41 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java index d1d9d106..8c0f92e1 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java @@ -158,7 +158,7 @@ public class BmsMasterUserController { @PreAuthorize("hasRole('bms:masterUser:insert')") public R save(@RequestBody @Valid BmsMasterUserBo param){ String type = param.getType(); - if(!type.equals(MasterUserType.Center) || !type.equals(MasterUserType.Channel) || !type.equals(MasterUserType.Point)){ + if(!type.equals(MasterUserType.Center) && !type.equals(MasterUserType.Channel) && !type.equals(MasterUserType.Point )){ Assert.throwEx("没有对应的"+param.getType()+"类型！"); } List masterUsers = new ArrayList<>(); diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java index 4c772901..f962fa28 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java @@ -92,6 +92,7 @@ public class GoodsCategoryController { treeNode.setId(cate.getId()+""); treeNode.setParentId(cate.getParentId().toString()); treeNode.setSort(0); + treeNode.setEnable(cate.getEnable()+""); if(loadSpuData && cate.getLevel().equals(3)){ LambdaQueryWrapper spuLqw = new LambdaQueryWrapper<>(); spuLqw.eq(GoodsSpu::getCategoryThird,cate.getId()); diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java index 84b9e76a..4f8b6695 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java @@ -47,6 +47,7 @@ public class GoodsCategoryServiceImpl extends ServiceImpl> listMyTemplate(){ + public R> listMyTemplate(String templateName){ String userId = AuthContextUtils.getSysUserId(); LambdaQueryWrapper regionUseLqw = new LambdaQueryWrapper<>(); regionUseLqw.eq(BmsRegionUser::getUserId,userId); @@ -193,7 +193,6 @@ public class TbsActivityTemplateController { Map> listMap = regionUsers.stream().collect(Collectors.groupingBy(BmsRegionUser::getType)); List saleRegion = listMap.get(0); List bizRegion = listMap.get(1); - //TODO 有重复现象 LambdaQueryWrapper tempLqw = new LambdaQueryWrapper<>(); if(CollectionUtil.isNotEmpty(saleRegion)){ List regionIds = saleRegion.stream().map(BmsRegionUser::getRegionId).collect(Collectors.toList()); @@ -209,13 +208,26 @@ public class TbsActivityTemplateController { con.in(TbsActivityTemplateRegion::getRegionId,regionIds); }); } - PageUtil.startPage(); List templateRegions = tbsActivityTemplateRegionService.list(tempLqw); if(CollectionUtil.isNotEmpty(templateRegions)){ List templateIds = templateRegions.stream() - .map(TbsActivityTemplateRegion::getTemplateId).collect(Collectors.toList()); - List templates = tbsActivityTemplateService.listByIds(templateIds); - return R.byPageHelperList(templateRegions,templates); + .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList()); + LambdaQueryWrapper tmpLqw = new LambdaQueryWrapper<>(); + tmpLqw.and(a->{ + if(CollectionUtil.isNotEmpty(saleRegion)){ + a.or(b->b.eq(TbsActivityTemplate::getSaleRegionFlag,0)); + } + if(CollectionUtil.isNotEmpty(bizRegion)){ + a.or(b->b.eq(TbsActivityTemplate::getBizRegionFlag,0)); + } + a.or(b->b.in(TbsActivityTemplate::getId,templateIds)); + }); + if(StringUtils.hasText(templateName)){ + tmpLqw.like(TbsActivityTemplate::getTemplateName,templateName); + } + PageUtil.startPage(); + List templates = tbsActivityTemplateService.list(tmpLqw); + return R.byPageHelperList(templates); }else { return R.byEmptyList(); } 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 e2cff5e5..6c7b4c88 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 @@ -242,6 +242,7 @@ public class TbsCostApplyController { ValidateTools.valid(costApplyBo); TbsCostApply entity = CopierUtil.copy(costApplyBo,new TbsCostApply()); BmsSupplier supplier = bmsSupplierService.getById(entity.getSupplierId()); + entity.setCode("CA"+IdUtil.timeStampId()); entity.setTemplateId(param.getTemplateId()); entity.setSupplierCode(supplier.getCode()); entity.setSupplierName(supplier.getName()); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java index 853175c4..b7b92a5d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java @@ -35,6 +35,7 @@ public class TbsActivityTemplate implements Serializable { /** 模板名称 */ @NotBlank(message = "模板名称不能为空") @Length(max = 30,message = "模板名称长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String templateName; /** 模板状态 */ 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 5be10b5e..4c95da42 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 @@ -36,6 +36,7 @@ public class TbsCostApply implements Serializable { /** 主题 */ @NotBlank(message = "主题不能为空") @Length(max = 60,message = "主题长度不能超过60字") + @TableField(condition = SqlCondition.LIKE) private String chargeTheme; /** 客户id */ @@ -50,6 +51,7 @@ public class TbsCostApply implements Serializable { /** 客户名称 */ @NotBlank(message = "客户名称不能为空") @Length(max = 30,message = "客户名称长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String supplierName; /** 状态:0=未发布；1=审批中；2=待执行；3=完成；4-被驳回 */ @@ -71,6 +73,7 @@ public class TbsCostApply implements Serializable { /** 用户名称 */ @Length(max = 32,message = "长度不能超过32字") + @TableField(condition = SqlCondition.LIKE) private String userName; private String syFormId; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsSchedule.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsSchedule.java index 71fca3f0..c3f8a670 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsSchedule.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsSchedule.java @@ -36,11 +36,13 @@ public class TbsSchedule implements Serializable { /** 考核名称 */ @NotBlank(message = "考核名称不能为空") @Length(max = 30,message = "考核名称长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String code; /** 考核编码 */ @NotBlank(message = "考核编码不能为空") @Length(max = 30,message = "考核编码长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String name; /** 备注 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java index 89438007..6beb84af 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java @@ -23,6 +23,9 @@ import javax.validation.constraints.NotBlank; @Data public class TbsBudgetSo implements Serializable { + /** 预算编码 */ + private String budgetCode; + /** 科目编码搜索值 */ private String subjectValue; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 2a697c9e..4041bf41 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -463,14 +463,12 @@ public class TbsBudgetApplicationService { if(throwEx){ Assert.throwEx("品类["+ activityCostItem.getTargetName()+"]无可用预算"); } - if(overspend){ - //添加到预算超支表 - activityCostItem.setBudgetId(0L); - activityCostItem.setScheduleId(0L); - activityCostItem.setScheduleItemId(0L); - activityCostItem.setScheduleItemBudgetId(0L); - actUnMatchList.add(activityCostItem); - } + //添加到预算超支表 + activityCostItem.setBudgetId(0L); + activityCostItem.setScheduleId(0L); + activityCostItem.setScheduleItemId(0L); + activityCostItem.setScheduleItemBudgetId(0L); + actUnMatchList.add(activityCostItem); } } diff --git a/src/main/resources/mapper/tbs/TbsBudgetMapper.xml b/src/main/resources/mapper/tbs/TbsBudgetMapper.xml index 9faa72d6..86858465 100644 --- a/src/main/resources/mapper/tbs/TbsBudgetMapper.xml +++ b/src/main/resources/mapper/tbs/TbsBudgetMapper.xml @@ -73,6 +73,7 @@ FROM `tbs_budget` `tbs_budget` LEFT JOIN `tbs_budget_condition` `tbs_budget_condition` ON `tbs_budget`.`id` = `tbs_budget_condition`.`budget_id` + and `tbs_budget`.`budget_code` like concat('%',#{query.budgetCode},'%') and ( `tbs_budget`.`subject_code` like concat('%',#{query.subjectValue},'%')