diff --git a/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java b/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java index 079f2780..046c83bf 100644 --- a/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java +++ b/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java @@ -38,15 +38,14 @@ public class UnifiedExceptionHandler { @ResponseBody public R handleBindException(BusinessException e,HttpServletRequest request) { log.warn("自定义异常触发【{},{}】,请求地址:{}",e.getCode(),e.getMessage(),request.getRequestURI()); - e.printStackTrace(); return new R(e.getCode(),e.getMessage()); } @ExceptionHandler(value = NullPointerException.class) @ResponseBody public R handleBindException(NullPointerException e,HttpServletRequest request) { - log.error("空指针【{}】,请求地址:{}",e.getMessage(),request.getRequestURI()); e.printStackTrace(); + log.error("空指针【{}】,请求地址:{}",e.getMessage(),request.getRequestURI()); return R.error("数据不存在或被移除"); } diff --git a/src/main/java/com/qs/serve/common/model/tag/TagFiledUtil.java b/src/main/java/com/qs/serve/common/model/tag/TagFiledUtil.java index 2c4b6c91..d8bb02e1 100644 --- a/src/main/java/com/qs/serve/common/model/tag/TagFiledUtil.java +++ b/src/main/java/com/qs/serve/common/model/tag/TagFiledUtil.java @@ -4,7 +4,10 @@ import cn.hutool.core.collection.CollUtil; import com.qs.serve.common.util.StringUtils; import com.qs.serve.modules.tag.entity.so.TagQuery; import com.qs.serve.modules.tbs.entity.TbsCostApply; +import com.qs.serve.modules.tbs.entity.so.VtbVerificationBatchQuery; +import com.qs.serve.modules.vtb.entity.VtbVerification; import lombok.experimental.UtilityClass; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.HashMap; @@ -19,29 +22,65 @@ import java.util.Map; public class TagFiledUtil { public final static Map TbsCostApplyPageMap = new HashMap(){{ - put("supplier","tbs_cost_apply.supplier_id"); + put("supplierId","tbs_cost_apply.supplier_id"); + }}; + + public final static Map VtbVerificationPageMap = new HashMap(){{ + put("supplierId","vtb_verification.supplier_id"); + }}; + + public final static Map VtbVerificationBatchPageMap = new HashMap(){{ + put("supplierId","vtb_verification_batch.supplier_id"); }}; public static void TbsCostApplyPage(TbsCostApply param){ - List newList = new ArrayList<>(); List paramTagList = param.getTagQueryList(); - for (TagQuery tag : paramTagList) { - if(!StringUtils.hasText(tag.getTargetType())){ - continue; - } - if (StringUtils.hasText(tag.getTagName()) || CollUtil.isNotEmpty(tag.getTagIds())){ - String sqlColumn = TbsCostApplyPageMap.get(tag.getDataField()); - if(StringUtils.hasText(sqlColumn)){ - TagQuery newVal = new TagQuery(); - newVal.setTargetType(tag.getTargetType()); - newVal.setTagName(tag.getTagName()); - newVal.setTagIds(tag.getTagIds()); - newVal.setSqlColumn(sqlColumn); - newList.add(newVal); + List newList = getNewList(paramTagList,TbsCostApplyPageMap); + param.setTagQueryList(newList); + } + + + public static void VtbVerificationPage(VtbVerification param){ + List paramTagList = param.getTagQueryList(); + List newList = getNewList(paramTagList,VtbVerificationPageMap); + param.setTagQueryList(newList); + } + + + public static void VtbVerificationBatchPage(VtbVerificationBatchQuery param){ + List paramTagList = param.getTagQueryList(); + List newList = getNewList(paramTagList,VtbVerificationBatchPageMap); + param.setTagQueryList(newList); + } + + /** + * 创建新的且有效性的查询参数(sql使用了非严谨写法,这里做了sql注入过滤) + * @param paramTagList + * @param columnMap + * @return + */ + @NotNull + private static List getNewList(List paramTagList,Map columnMap) { + List newList = new ArrayList<>(); + if(paramTagList!=null){ + for (TagQuery tag : paramTagList) { + if(!StringUtils.hasText(tag.getTargetType())){ + continue; + } + if (StringUtils.hasText(tag.getTagName()) || CollUtil.isNotEmpty(tag.getTagIds())){ + String sqlColumn = columnMap.get(tag.getDataField()); + if(StringUtils.hasText(sqlColumn)){ + TagQuery newVal = new TagQuery(); + newVal.setTargetType(tag.getTargetType()); + newVal.setTagName(tag.getTagName()); + newVal.setTagIds(tag.getTagIds()); + newVal.setSqlColumn(sqlColumn); + newList.add(newVal); + } } } } - param.setTagQueryList(newList); + return newList; } } diff --git a/src/main/java/com/qs/serve/common/util/AuthContextUtils.java b/src/main/java/com/qs/serve/common/util/AuthContextUtils.java index c8cd5cb2..a0103cae 100644 --- a/src/main/java/com/qs/serve/common/util/AuthContextUtils.java +++ b/src/main/java/com/qs/serve/common/util/AuthContextUtils.java @@ -34,6 +34,11 @@ public class AuthContextUtils { RES_THEME_LOCK.remove(); } + /** + * 标注开发时使用 + */ + public static boolean DEV_INDEX = true; + public static String getAppId(){ return getAppId(true); } diff --git a/src/main/java/com/qs/serve/controller/AdminPortalController.java b/src/main/java/com/qs/serve/controller/AdminPortalController.java index c18a620d..9c5e8d8a 100644 --- a/src/main/java/com/qs/serve/controller/AdminPortalController.java +++ b/src/main/java/com/qs/serve/controller/AdminPortalController.java @@ -312,7 +312,9 @@ public class AdminPortalController { */ @GetMapping("/getOrder/{id}") public R getById(@PathVariable("id") String id,String supplierId){ + AuthContextUtils.setTenant("001"); OmsOrder omsOrder = omsOrderService.getById(id); + if(omsOrder==null){return R.errorNotFound();} omsOrder.setBrandRuleInfo(goodsCategoryRuleService.getById(omsOrder.getBrandRuleId())); omsOrder.setAddressInfo(bmsSupplierAddressService.getById(omsOrder.getSupplierAddrId())); if(omsOrder.getSupplierId().toString().equals(supplierId)){ diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirTbsVtbPayJoinController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirTbsVtbPayJoinController.java index 874d1be9..8cf8aedb 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirTbsVtbPayJoinController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirTbsVtbPayJoinController.java @@ -56,7 +56,6 @@ public class BirTbsVtbPayJoinController { returnMap.put("page",page); returnMap.put("sumData",sumData); - return R.ok(returnMap); } diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java index 3f438b8a..6260c902 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java @@ -301,7 +301,6 @@ public class GoodsCustomerPriceServiceImpl extends ServiceImpl() .eq(GoodsCustomerPrice::getSupplierCode, cusCode) - .in(GoodsCustomerPrice::getSkuCode,goodsSkus) ); if(goodsCustomerPriceList.size()>0){ this.saveBatch(goodsCustomerPriceList); 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 252ff15e..1d21f8cf 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 @@ -198,7 +198,19 @@ public class TbsCostApplyController { } /** - * 翻页(个人及所属的费用申请) + * 列表(个人及下属的费用申请) + * @param param + * @return + */ + @PostMapping("/listMy") + public R> getListMy4Post(@RequestBody TbsCostApplyVo param){ + PageUtil.setPageSize(param.getPageSize()); + PageUtil.setPageNum(param.getPageNum()); + return this.getListMy4Post(param); + } + + /** + * 翻页(个人及所属的费用申请,GET) * @param param * @return */ @@ -218,7 +230,20 @@ public class TbsCostApplyController { } /** - * 翻页 + * 翻页(个人及所属的费用申请,GET) + * @param param + * @return + */ + @PostMapping("/pageMy") + @PreAuthorize("hasRole('tbs:costApply:query')") + public R> getPageMy4Post(TbsCostApplyVo param){ + PageUtil.setPageSize(param.getPageSize()); + PageUtil.setPageNum(param.getPageNum()); + return this.getPageMy(param); + } + + /** + * 翻页(Get) * @param param * @return */ @@ -230,16 +255,17 @@ public class TbsCostApplyController { /** - * 翻页 + * 翻页(Post) * @param param * @return */ - @PostMapping("/pageDev") - public R> getPageDev(@RequestBody TbsCostApply param){ - TagFiledUtil.TbsCostApplyPage(param); - IPage page = tbsCostApplyService.selectPage(param); - return R.byMbpList(page); + @PostMapping("/page") + public R> getPage4Post(@RequestBody TbsCostApply param){ + PageUtil.setPageSize(param.getPageSize()); + PageUtil.setPageNum(param.getPageNum()); + return this.getPage(param); } + /** * ID查询 * @param id @@ -267,16 +293,6 @@ public class TbsCostApplyController { } TbsCostContract contract = costContractService.getByCostApplyId(tbsCostApply.getId()); tbsCostApply.setContractInfo(contract); -// if(tbsCostApply.getContractFlag().equals(1)){ -// //协议类 -// LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); -// lqw.eq(TbsCostTodo::getCostApplyId,tbsCostApply.getId()); -// lqw.eq(TbsCostTodo::getCheckStatus,1); -// List costTodoList = costTodoService.list(lqw); -// for (TbsCostTodo costTodo : costTodoList) { -// costTodoOperationService.runCompensate(costTodo.getId()+""); -// } -// } return R.ok(tbsCostApply); } 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 a0104f0c..52b7f315 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 @@ -17,6 +17,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; import java.util.List; +import java.util.Map; /** * 费用申请 实体类 @@ -284,11 +285,14 @@ public class TbsCostApply implements Serializable { @TableField(exist = false) List changeInfoLogs; - /** - * 选择的标签ID - */ @TableField(exist = false) List tagQueryList; + @TableField(exist = false) + String pageNum; + + @TableField(exist = false) + String pageSize; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/so/VtbVerificationBatchQuery.java b/src/main/java/com/qs/serve/modules/tbs/entity/so/VtbVerificationBatchQuery.java index 5c00ef6c..ffd7cfce 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/so/VtbVerificationBatchQuery.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/so/VtbVerificationBatchQuery.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.tbs.entity.so; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.qs.serve.modules.tag.entity.so.TagQuery; import lombok.Data; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; @@ -55,4 +56,10 @@ public class VtbVerificationBatchQuery { private List userIds; + String pageNum; + + String pageSize; + + @TableField(exist = false) + List tagQueryList; } 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 2d2be233..37338fb6 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 @@ -10,6 +10,7 @@ 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.modules.tag.entity.so.TagQuery; import lombok.Data; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; @@ -109,6 +110,13 @@ public class TbsCostApplyVo implements Serializable { /** * 选择的标签ID */ - List tagIds; + @TableField(exist = false) + List tagQueryList; + + @TableField(exist = false) + String pageNum; + + @TableField(exist = false) + String pageSize; } 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 935d5057..badb5f2a 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 @@ -18,6 +18,7 @@ import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.MonthValues; import com.qs.serve.common.model.oa.OaFormMainProcess; import com.qs.serve.common.model.oa.OaUploadFile; +import com.qs.serve.common.model.tag.TagFiledUtil; import com.qs.serve.common.util.*; import com.qs.serve.common.util.model.DateFormatString; import com.qs.serve.modules.bir.entity.BirActivityCenterGoods; @@ -291,6 +292,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl selectPage(TbsCostApply costApply) { + TagFiledUtil.TbsCostApplyPage(costApply); int sysConfOfWarningDays = 0; try { SysConfigService configService = SpringUtils.getBean(SysConfigService.class); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java index a50d7d3a..eccf7d4b 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java @@ -82,6 +82,12 @@ public class VtbVerificationBatchController { List list = vtbVerificationBatchService.list2(query); return R.byPageHelperList(list); } + @PostMapping("/page2") + public R> getPage2Post(@RequestBody VtbVerificationBatchQuery query){ + PageUtil.setPageNum(query.getPageNum()); + PageUtil.setPageSize(query.getPageSize()); + return this.getPage2(query); + } /** * 翻页2(连表查询-left join tbs_cost_apply) @@ -101,6 +107,12 @@ public class VtbVerificationBatchController { List list = vtbVerificationBatchService.list2(query); return R.byPageHelperList(list); } + @PostMapping("/pageMy") + public R> getPageMy4Post(@RequestBody VtbVerificationBatchQuery query){ + PageUtil.setPageNum(query.getPageNum()); + PageUtil.setPageSize(query.getPageSize()); + return this.getPageMy(query); + } /** * ID查询 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 b75adff0..3d5ca28a 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 @@ -9,6 +9,7 @@ import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.model.tag.TagFiledUtil; import com.qs.serve.common.util.*; import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; import com.qs.serve.modules.seeyon.entity.CtpAffair; @@ -106,13 +107,13 @@ public class VtbVerificationController { /** * 管理员 * @param param - * @param loadMy - * @param loadChild * @return */ @GetMapping("/page") @PreAuthorize("hasRole('vtb:verification:query')") - public R> getPage(VtbVerificationSo param,Integer loadMy,Integer loadChild){ + public R> getPage(VtbVerificationSo param){ + Integer loadMy = param.getLoadMy(); + Integer loadChild = param.getLoadChild(); VtbVerification query = CopierUtil.copy(param,new VtbVerification()); if(loadChild!=null&&loadChild.equals(1)){ List userIds = sysPostUserService.listByChildIds(AuthContextUtils.getSysUserId()); @@ -144,16 +145,41 @@ public class VtbVerificationController { return R.byMbpList(pageResult); } + /** + * 管理员 + * @param param + * @return + */ + @PostMapping("/page") + @PreAuthorize("hasRole('vtb:verification:query')") + public R> getPage4Post(@RequestBody VtbVerificationSo param){ + PageUtil.setPageNum(param.getPageNum()); + PageUtil.setPageSize(param.getPageSize()); + return getPage(param); + } + /** * 翻页(个人) * @param param - * @param loadChild loadChild=1 分页查询所属活动核销 * @return */ @GetMapping("/pageMy") @PreAuthorize("hasRole('vtb:verification:query')") - public R> pageMy(VtbVerificationSo param,Integer loadChild){ - return getPage(param,1,loadChild); + public R> pageMy(VtbVerificationSo param){ + param.setLoadMy(1); + return getPage(param); + } + + /** + * 翻页(个人) + * @param param + * @return + */ + @PostMapping("/pageMy") + @PreAuthorize("hasRole('vtb:verification:query')") + public R> pageMy4Post(@RequestBody VtbVerificationSo param){ + param.setLoadMy(1); + return getPage(param); } /** diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java index fb4e1faf..59f7072d 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java @@ -12,6 +12,7 @@ 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.sys.entity.SysAttach; +import com.qs.serve.modules.tag.entity.so.TagQuery; import lombok.Data; import org.apache.ibatis.type.JdbcType; import org.hibernate.validator.constraints.Length; @@ -240,5 +241,9 @@ public class VtbVerification implements Serializable { @TableField(exist = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime queryEndTime; + + + @TableField(exist = false) + List tagQueryList; } diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java index 6cbb908b..076bb8ae 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java @@ -4,12 +4,14 @@ import java.time.LocalDate; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; 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; +import com.qs.serve.modules.tag.entity.so.TagQuery; import lombok.Data; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; @@ -74,5 +76,18 @@ public class VtbVerificationSo implements Serializable { /** 模板名称 */ private String templateTitle; + Integer loadMy; + + /** + * loadChild=1 分页查询所属活动核销 + */ + Integer loadChild; + + String pageNum; + + String pageSize; + + @TableField(exist = false) + List tagQueryList; } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java index 5c6d6782..8b2f5f0b 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java @@ -10,6 +10,7 @@ import com.qs.serve.common.framework.redis.RedisService; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.oa.OaFormMainProcess; import com.qs.serve.common.model.oa.OaUploadFile; +import com.qs.serve.common.model.tag.TagFiledUtil; import com.qs.serve.common.util.*; import com.qs.serve.common.util.model.DateFormatString; import com.qs.serve.modules.bms.entity.*; @@ -581,6 +582,7 @@ public class VtbVerificationBatchServiceImpl extends ServiceImpl list2(VtbVerificationBatchQuery query) { + TagFiledUtil.VtbVerificationBatchPage(query); return baseMapper.selectList2(query); } } 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 bcd0ad0c..9076962e 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 @@ -13,6 +13,7 @@ import com.qs.serve.common.framework.redis.RedisService; import com.qs.serve.common.model.AmountDTO; import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.tag.TagFiledUtil; import com.qs.serve.common.util.*; import com.qs.serve.common.util.model.DateFormatString; import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; @@ -132,6 +133,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl selectVerificationList(VtbVerification query) { + //初始化标签 + TagFiledUtil.VtbVerificationPage(query); IPage iPage = PageUtil.getMbpPage(); IPage result = baseMapper.selectVerificationList(iPage,query); return result; @@ -213,6 +216,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl activityCenters4Update = new ArrayList<>(); List activitySubject4Update = new ArrayList<>(); int countCode = 1; + //记录只支付一次 + boolean saveOneTimes = false; for (TbsActivitySubject activitySubject : activitySubjectList) { if(tempTotal.compareTo(BigDecimal.ZERO)<1){ break; @@ -314,36 +319,16 @@ public class VtbVerificationServiceImpl extends ServiceImpl addFundFlowList = new ArrayList<>(); + boolean hasPayOneTimes = false; + for (VtbVerificationSubject verificationSubject : verificationSubjects) { Long subjectId = verificationSubject.getSubjectId(); BigDecimal usedAmount = verificationSubject.getUsedAmount(); @@ -1444,15 +1431,18 @@ public class VtbVerificationServiceImpl extends ServiceImpl diff --git a/src/main/resources/mapper/tag/TagDataMapper.xml b/src/main/resources/mapper/tag/TagDataMapper.xml index 0b726517..364ce0da 100644 --- a/src/main/resources/mapper/tag/TagDataMapper.xml +++ b/src/main/resources/mapper/tag/TagDataMapper.xml @@ -71,8 +71,8 @@ - - + + and ${tagQuery.sqlColumn} in ( select target_id from tag_data diff --git a/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml b/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml index aebd0c5c..ce2e643a 100644 --- a/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml +++ b/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml @@ -169,6 +169,7 @@ and `vtb_verification`.`ext_user_code` = #{query.extUserCode} and `vtb_verification`.`ext_user_name` = #{query.extUserName} and `vtb_verification`.`template_title` like concat('%', #{query.templateTitle} ,'%') + order by vtb_verification.id desc diff --git a/src/main/resources/mapper/vtb/VtbVerificationBatchMapper.xml b/src/main/resources/mapper/vtb/VtbVerificationBatchMapper.xml index 29e857f0..e4653c7c 100644 --- a/src/main/resources/mapper/vtb/VtbVerificationBatchMapper.xml +++ b/src/main/resources/mapper/vtb/VtbVerificationBatchMapper.xml @@ -111,6 +111,7 @@ and `tbs_cost_apply`.`supplier_biz_region_first_name` like concat('%', #{query.supplierBizRegionFirstName},'%') and `tbs_cost_apply`.`supplier_biz_region_second_name` like concat('%',#{query.supplierBizRegionSecondName},'%') and `tbs_cost_apply`.`supplier_biz_region_third_name` like concat('%',#{query.supplierBizRegionThirdName},'%') + order by vtb_verification_batch.id desc