From 7fee52a75a21656db7e378ca70e505534abd8c66 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 17 Oct 2023 09:35:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=B0=83=E6=95=B4=EF=BC=9B?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/controller/GoodsCategoryRuleController.java | 3 +++ .../com/qs/serve/modules/goods/entity/GoodsCategoryRule.java | 3 +++ src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java | 2 ++ src/main/java/com/qs/serve/modules/sale/entity/SalePlan.java | 4 ++++ .../serve/modules/seeyon/service/SeeYonOperationService.java | 4 ++-- .../modules/vtb/controller/VtbVerificationController.java | 5 +++++ .../modules/vtb/service/VtbVerificationApplication.java | 4 ++-- 7 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java index 1b348773..84c76ddc 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java @@ -58,6 +58,9 @@ public class GoodsCategoryRuleController { @GetMapping("/page") public R> getPage(GoodsCategoryRule param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + if(StringUtils.hasText(param.getBrandName())){ + lqw.like(GoodsCategoryRule::getBrandNames,param.getBrandName()); + } PageUtil.startPage(); List list = goodsCategoryRuleService.list(lqw); return R.byPageHelperList(list); diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java index ca0f323b..b3cec805 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java @@ -34,6 +34,7 @@ public class GoodsCategoryRule implements Serializable { /** 标题 */ @NotBlank(message = "标题不能为空") @Length(max = 255,message = "标题长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String label; /** 品牌id */ @@ -84,6 +85,8 @@ public class GoodsCategoryRule implements Serializable { @TableField(fill = FieldFill.UPDATE) private String updateBy; + @TableField(exist = false) + private String brandName; public static GoodsCategoryRule toNewObject(GoodsCategoryRule source){ GoodsCategoryRule categoryRule = new GoodsCategoryRule(); 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 ec217d25..fd540ea0 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 @@ -48,11 +48,13 @@ public class OmsOrder implements Serializable { /** 供应商编码 */ @NotBlank(message = "供应商编码不能为空") @Length(max = 20,message = "供应商编码长度不能超过20字") + @TableField(condition = SqlCondition.LIKE) private String supplierCode; /** 供应商名称 */ @NotBlank(message = "供应商名称不能为空") @Length(max = 30,message = "供应商名称长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String supplierName; /** 供应商收货地址id */ diff --git a/src/main/java/com/qs/serve/modules/sale/entity/SalePlan.java b/src/main/java/com/qs/serve/modules/sale/entity/SalePlan.java index 234b2eba..0b3e3d7b 100644 --- a/src/main/java/com/qs/serve/modules/sale/entity/SalePlan.java +++ b/src/main/java/com/qs/serve/modules/sale/entity/SalePlan.java @@ -43,11 +43,13 @@ public class SalePlan implements Serializable { /** 编码 */ @NotBlank(message = "编码不能为空") @Length(max = 50,message = "编码长度不能超过50字") + @TableField(condition = SqlCondition.LIKE) private String planCode; /** 标题 */ @NotBlank(message = "标题不能为空") @Length(max = 255,message = "标题长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String planTitle; /** 状态 */ @@ -72,10 +74,12 @@ public class SalePlan implements Serializable { /** 客户编码 */ @Length(max = 255,message = "客户编码长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String supplierCode; /** 客户名称 */ @Length(max = 255,message = "客户名称长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String supplierName; /** 创建时间 */ 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 1a092545..68048776 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 @@ -314,10 +314,10 @@ public interface SeeYonOperationService extends SeeYonBaseService{ } //审批中(next)、完成(finish)、拒绝(refused) - if("finish".equals(flag)){ + if("finished".equals(flag)){ this.doFinished(affairCommit); return R.ok(); - }else if ("stop".equals(flag)){ + }else if ("refuse".equals(flag)||"backed".equals(flag)){ if(isBackCommit){ this.doBacked(affairCommit); return R.ok(); 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 a563458d..f35486d9 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 @@ -29,6 +29,7 @@ import com.qs.serve.modules.tbs.service.TbsActivityPayConditionService; import com.qs.serve.modules.tbs.service.TbsActivityService; import com.qs.serve.modules.tbs.service.TbsActivitySubjectService; import com.qs.serve.modules.tbs.service.TbsCostApplyService; +import com.qs.serve.modules.vtb.common.VtbVerificationState; import com.qs.serve.modules.vtb.entity.*; import com.qs.serve.modules.vtb.entity.bo.VtbVerificationContactBo; import com.qs.serve.modules.vtb.service.*; @@ -179,6 +180,10 @@ public class VtbVerificationController { @PreAuthorize("hasRole('vtb:verification:query')") public R getById(@PathVariable("id") String id){ VtbVerification vtbVerification = vtbVerificationService.getById(id); + if(vtbVerification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){ + vtbVerificationOperationService.runCompensate(id); + vtbVerification = vtbVerificationService.getById(id); + } if(CollectionUtil.isNotEmpty(vtbVerification.getAttachIds())){ List attachIds = Arrays.asList(vtbVerification.getAttachIds()); List attachList = attachService.listByIds(attachIds); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index 986e79f4..601eca28 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -163,9 +163,9 @@ public class VtbVerificationApplication { yard.setComment(affairCommit.getComment()); yard.setCaseRemark(affairCommit.getCaseRemark()); //审批中(next)、完成(finish)、拒绝(refused) - boolean isFinish = "finish".equals(flag); + boolean isFinish = "finished".equals(flag); boolean isNext = "next".equals(flag); - boolean isStop = "stop".equals(flag); + boolean isStop = "backed".equals(flag)||"refuse".equals(flag); //释放费用 boolean isRelease = affairCommit.getReleaseFlag()!=null&&affairCommit.getReleaseFlag().equals(1); if (isStop){