From 983b1b703149e58a4cb03b776ca15a3b6cfda3c5 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 11 Oct 2023 17:53:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=9B=E6=B7=BB=E5=8A=A0=E6=8B=9C=E8=AE=BF?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qs/serve/modules/baz/entity/BazVisitInstance.java | 4 ++-- .../java/com/qs/serve/modules/oms/entity/OmsOrder.java | 2 +- .../modules/oms/service/impl/OmsOrderServiceImpl.java | 9 ++++++--- .../modules/tbs/service/TbsBudgetApplicationService.java | 4 +++- .../tbs/service/impl/TbsBudgetChangeServiceImpl.java | 1 + src/main/resources/mapper/tag/TagDataMapper.xml | 1 + 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java b/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java index 1fe06606..28793f93 100644 --- a/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java +++ b/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java @@ -145,12 +145,12 @@ public class BazVisitInstance implements Serializable { /** 签到时间 */ @TableField(exist = false) - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime signTime; /** 签退时间 */ @TableField(exist = false) - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime outTime; /** 查询开始时间 */ diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java index c79bfbfd..ec217d25 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java @@ -99,7 +99,7 @@ public class OmsOrder implements Serializable { /** 是否加急 */ private Integer urgentFlag; - /** 订单状态 0->待 */ + /** 订单状态 0->草稿；1->下单；2->已确认 */ private Integer status; /** 备注 */ diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index 6b5b87d0..4612a5b6 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -164,10 +164,13 @@ public class OmsOrderServiceImpl extends ServiceImpl im //todo 计算是否有活动优惠 //收货地址 BmsSupplierAddress supplierAddress; - if(confirmOrder.getAddressId()!=null){ - supplierAddress = bmsSupplierAddressService.getById(confirmOrder.getAddressId()); - }else { + if(confirmOrder.getAddressId()==null){ supplierAddress = bmsSupplierAddressService.getDefault(Long.parseLong(supplier.getId())); + }else if (confirmOrder.getAddressId().equals(0L)){ + supplierAddress = new BmsSupplierAddress(); + supplierAddress.setId(0L); + }else { + supplierAddress = bmsSupplierAddressService.getById(confirmOrder.getAddressId()); } OmsConfirmOrderResult confirmOrderResult = new OmsConfirmOrderResult(); confirmOrderResult.setSupplier(supplier); 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 165d0468..4d4ac26f 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 @@ -212,7 +212,9 @@ public class TbsBudgetApplicationService { } } // budgetIds交集 - budgetIds = (List) CollectionUtils.intersection(budgetIds, limitBudgetIds); + if(limitBudgetIds.size()>0){ + budgetIds = (List) CollectionUtils.intersection(budgetIds, limitBudgetIds); + } // 加载所有条件 List budgetList; if(budgetIds.size()>0){ 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 96fd3c99..3d869d24 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 @@ -234,6 +234,7 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl + and tag_info.del_flag = 0 and `tag_data`.del_flag = 0 and `tag_data`.`id` = #{query.id} and `tag_data`.`tag_name` = #{query.tagName} and `tag_data`.`tag_id` = #{query.tagId} From 02bcf3b4699ec8157bb63b3ef58c5302a4a86256 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 12 Oct 2023 16:19:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B=E6=A0=87=E7=AD=BE=E7=B1=BB=E7=9B=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BazVisitFlowServiceImpl.java | 10 +++ .../bms/controller/BmsSupplierController.java | 5 ++ .../serve/modules/bms/entity/BmsSupplier.java | 24 +++++++ .../modules/bms/entity/bo/BmsSupplierBo.java | 22 ++++++ .../service/impl/BmsSupplierServiceImpl.java | 6 ++ .../tag/controller/TagDataController.java | 6 +- .../modules/tag/entity/so/TagInfoSo.java | 5 ++ .../service/impl/TagCategoryServiceImpl.java | 67 +++++++++++++------ .../service/impl/TbsBudgetServiceImpl.java | 27 ++++++++ .../VtbVerificationDataController.java | 2 +- .../mapper/baz/BazVisitInstanceMapper.xml | 16 ++--- 11 files changed, 160 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitFlowServiceImpl.java b/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitFlowServiceImpl.java index 08ae780c..d6fffb1d 100644 --- a/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitFlowServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitFlowServiceImpl.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.baz.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.util.Assert; import com.qs.serve.modules.baz.entity.BazVisit; import com.qs.serve.modules.baz.entity.bo.BazVisitFlowBo; import com.qs.serve.modules.baz.mapper.BazVisitMapper; @@ -34,6 +35,15 @@ public class BazVisitFlowServiceImpl extends ServiceImpl0){ + LambdaQueryWrapper lqwErrCount = new LambdaQueryWrapper<>(); + lqwErrCount.eq(BazVisitFlow::getVisitId,bazVisit.getId()); + lqwErrCount.eq(BazVisitFlow::getFlowBizType,param.getFlowBizType()); + if(this.count(lqwErrCount)>0){ + Assert.throwEx("流程中业务类型不能重复"); + } + } //设置排序 LambdaQueryWrapper lqwCount = new LambdaQueryWrapper<>(); lqwCount.eq(BazVisitFlow::getVisitId,param.getVisitId()); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 99bbf1d5..f074cade 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -28,6 +28,7 @@ import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam; import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam2; import com.qs.serve.modules.sys.entity.dto.SysUserSimpleVo; import com.qs.serve.modules.sys.entity.dto.SysUserVo; +import com.qs.serve.modules.sys.service.SysAttachService; import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsCenterType; @@ -68,6 +69,7 @@ public class BmsSupplierController { private RedisService redisService; private TbsBudgetService tbsBudgetService; private BmsSupplierMyController supplierMyController; + private SysAttachService attachService; /** * 翻页查询 @@ -550,6 +552,9 @@ public class BmsSupplierController { bmsSupplier.setRegion2ThirdInfo(obj33); bmsSupplier.setRegion2FourthlyInfo(obj44); } + if(bmsSupplier.getSupplierAttachIds()!=null&&bmsSupplier.getSupplierAttachIds().length>0){ + bmsSupplier.setSupplierAttachInfoList(attachService.listByIds(Arrays.asList(bmsSupplier.getSupplierAttachIds()))); + } bmsSupplier.setUserVos(userVos); return R.ok(bmsSupplier); } 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 ea6a2c05..f49fbc89 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 @@ -121,6 +121,26 @@ public class BmsSupplier implements Serializable { /** 是否供应商 */ private Integer supplierFlag; + /** 供应商是否填写信息 */ + @NotNull(message = "供应商是否填写信息不能为空") + private Integer supplierInfoFlag; + + /** 供应商税号 */ + @Length(max = 255,message = "供应商税号长度不能超过255字") + private String supplierTaxNumber; + + /** 供应商联系人 */ + @Length(max = 255,message = "供应商联系人长度不能超过255字") + private String supplierUser; + + /** 营业执照地址 */ + @Length(max = 255,message = "营业执照地址长度不能超过255字") + private String supplierLicenseImg; + + /** 附件列表 */ + @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR) + private String[] supplierAttachIds; + private Integer cooperatePauseFlag; /** 暂不合作日期 */ @@ -260,6 +280,10 @@ public class BmsSupplier implements Serializable { @TableField(exist = false) private Integer pageSize; + /** 供应商附件 */ + @TableField(exist = false) + private List supplierAttachInfoList; + @TableField(exist = false) private List selectSaleRegionIds; diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java index c3ebef6e..7fce1649 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java @@ -1,9 +1,12 @@ package com.qs.serve.modules.bms.entity.bo; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +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; @@ -57,6 +60,25 @@ public class BmsSupplierBo { /** 是否供应商 */ private Integer supplierFlag; + /** 供应商是否填写信息 */ + @NotNull(message = "供应商是否填写信息不能为空") + private Integer supplierInfoFlag; + + /** 供应商税号 */ + @Length(max = 255,message = "供应商税号长度不能超过255字") + private String supplierTaxNumber; + + /** 供应商联系人 */ + @Length(max = 255,message = "供应商联系人长度不能超过255字") + private String supplierUser; + + /** 营业执照地址 */ + @Length(max = 255,message = "营业执照地址长度不能超过255字") + private String supplierLicenseImg; + + /** 附件列表 */ + private String[] supplierAttachIds; + private String belong; /** 闭户 */ diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java index aa4cedc5..e5a4c39c 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java @@ -99,6 +99,12 @@ public class BmsSupplierServiceImpl extends ServiceImpl save(@RequestBody @Valid TagInfoBindBo param){ Integer saveType = param.getSaveType(); - List tagInfoList = tagInfoService.listByIds(param.getTagIds()); + List tagInfoList = new ArrayList<>(); + if(CollUtil.isNotEmpty(param.getTagIds())){ + tagInfoList = tagInfoService.listByIds(param.getTagIds()); + } for (TargetObjectDTO objectDTO : param.getTargetList()) { if(objectDTO.getTargetType().equals(TagTypeConst.Customer)){ BmsSupplier bmsSupplier = bmsSupplierService.getById(objectDTO.getTargetId()); diff --git a/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java b/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java index 34f69123..6ae11e1c 100644 --- a/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java +++ b/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java @@ -5,6 +5,8 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.SqlCondition; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -29,6 +31,9 @@ public class TagInfoSo implements Serializable { /** id */ private Long id; + /** 标签名 */ + private String tagCode; + /** 标签名 */ private String tagName; diff --git a/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java b/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java index fb31cd2b..12645270 100644 --- a/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java @@ -27,49 +27,76 @@ public class TagCategoryServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.and(v1->{ - v1.eq(TagCategory::getPathIds,dbData.getPathIds()) - .or().likeRight(TagCategory::getPathIds,dbData.getPathIds()+"_"); + v1.eq(TagCategory::getPathIds,orgData.getPathIds()) + .or().likeRight(TagCategory::getPathIds,orgData.getPathIds()+"_"); }); List childList = this.list(lqw); List categoryList = childList.stream().map(obj->{ TagCategory par = new TagCategory(); par.setId(obj.getId()); - par.setPathIds(obj.getPathIds().replace(dbData.getPathIds(),category.getPathIds())); + par.setPathIds(obj.getPathIds().replace(orgData.getPathIds(),current.getPathIds())); return par; }).collect(Collectors.toList()); this.updateBatchById(categoryList); + //补充上下级互换 + if(newParentPathIds!=null){ + LambdaQueryWrapper lqwParent = new LambdaQueryWrapper<>(); + TagCategory finalParent = parent; + lqwParent.and(v1->{ + v1.eq(TagCategory::getPathIds, finalParent.getPathIds()) + .or().likeRight(TagCategory::getPathIds,finalParent.getPathIds()+"_"); + }); + List parentChildList = this.list(lqwParent); + String finalNewParentPathIds = newParentPathIds; + List parentCategoryList = parentChildList.stream().map(obj->{ + TagCategory par = new TagCategory(); + par.setId(obj.getId()); + par.setPathIds(obj.getPathIds().replace(finalParent.getPathIds(), finalNewParentPathIds)); + return par; + }).collect(Collectors.toList()); + this.updateBatchById(parentCategoryList); + } }else { //不进行更新 - category.setPathIds(null); - category.setPid(null); + current.setPathIds(null); + current.setPid(null); } - this.updateById(category); + this.updateById(current); } 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 378ed119..56592a41 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 @@ -513,7 +513,34 @@ public class TbsBudgetServiceImpl extends ServiceImpl budgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getScheduleItemBudgetId, a.getId()); List logList = budgetLogService.list(budgetLogLambdaQueryWrapper); a.setBudgetAmount(logList.stream().map(b -> b.getAmount()).reduce(BigDecimal.ZERO, BigDecimal::add)); + }); +// scheduleItemBudgets.forEach(a -> { +// LambdaQueryWrapper budgetLogLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// budgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getScheduleItemBudgetId, a.getId()); +// List logList = budgetLogService.list(budgetLogLambdaQueryWrapper); +// +// BigDecimal finalOrgBudget = BigDecimal.ZERO; +// BigDecimal usedOrgBudget = BigDecimal.ZERO; +// BigDecimal surplusOrgBudget = BigDecimal.ZERO; +// for (TbsBudgetLog budgetLog : logList) { +// boolean finalMatch = BudgetLogOptFlag.getFinalBudgetOptFlag() +// .stream().anyMatch(opt->budgetLog.getOptType().equals(opt)); +// if(finalMatch){ +// finalOrgBudget = finalOrgBudget.add(budgetLog.getAmount()); +// }else { +// usedOrgBudget = usedOrgBudget.add(budgetLog.getAmount()); +// } +// surplusOrgBudget = surplusOrgBudget.add(budgetLog.getAmount()); +// } +// +// //原预算金额 +// //a.setBudgetAmount(); +// //调整后预算金额 +// a.setFinalBudgetAmount(finalOrgBudget); +// a.setUsedBudgetAmount(usedOrgBudget); +// a.setUnUsedBudgetAmount(surplusOrgBudget); +// }); } budgetVo.setScheduleItem(scheduleItemBudgets); 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 839f000f..01a21c6d 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 @@ -50,7 +50,7 @@ public class VtbVerificationDataController { activityIds.add(0L); } query.setActivityIds(activityIds); - query.setOpenPage(0); + query.setOpenPage(1); List list = verReportMapper.pageActiveAndVtbDataAmount(query); PageVo page = new PageVo<>(); diff --git a/src/main/resources/mapper/baz/BazVisitInstanceMapper.xml b/src/main/resources/mapper/baz/BazVisitInstanceMapper.xml index e274fb8d..8bd131db 100644 --- a/src/main/resources/mapper/baz/BazVisitInstanceMapper.xml +++ b/src/main/resources/mapper/baz/BazVisitInstanceMapper.xml @@ -64,18 +64,18 @@