审批调整；订单查询修复

src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java

@@ -58,6 +58,9 @@ public class GoodsCategoryRuleController {
     @GetMapping("/page")
     public R<PageVo<GoodsCategoryRule>> getPage(GoodsCategoryRule param){
         LambdaQueryWrapper<GoodsCategoryRule> lqw = new LambdaQueryWrapper<>(param);
+        if(StringUtils.hasText(param.getBrandName())){
+            lqw.like(GoodsCategoryRule::getBrandNames,param.getBrandName());
+        }
         PageUtil.startPage();
         List<GoodsCategoryRule> list = goodsCategoryRuleService.list(lqw);
         return R.byPageHelperList(list);

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();

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 */

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;
 
     /** 创建时间 */

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();

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<VtbVerification> 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<String> attachIds = Arrays.asList(vtbVerification.getAttachIds());
             List<SysAttach> attachList = attachService.listByIds(attachIds);

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){