修复查询

src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@@ -382,6 +382,8 @@ public class TbsActivityController {
             LambdaQueryWrapper<TbsBudget> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsBudget::getBudgetState,1);
             lqw.eq(TbsBudget::getSubjectId,subjectId);
+            //排除随货编码
+            lqw.ne(TbsBudget::getSubjectCode,"FYMC05");
             List<TbsBudget> budgetList = tbsBudgetService.list(lqw);
             List<String> idPaths = new ArrayList<>();
             if(budgetList.size()>0){
@@ -433,6 +435,17 @@ public class TbsActivityController {
                 }
             }
         }
+        //匹配有预算并且成本中心为客户的
+        for (TbsBudget budget : centerBudgetList) {
+            if (budget.getCenterType().equals(TbsCenterType.customer.name())){
+                if(budget.getCenterId().equals(supplier.getId())){
+                    TbsActivityDefaultCenterVo defaultCenterVo = new TbsActivityDefaultCenterVo();
+                    defaultCenterVo.setSupplier(supplier);
+                    return R.ok(defaultCenterVo);
+                }
+            }
+        }
+        //匹配有预算并且成本中心为销售区域的
         for (TbsBudget budget : centerBudgetList) {
             if (budget.getCenterType().equals(TbsCenterType.saleRegion.name())){
                 if(budget.getCenterId().equals(supplier.getRegionThird())

src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java

@@ -34,6 +34,7 @@ public class TbsActivity implements Serializable {
     private Long id;
 
     /** 编码 */
+    @TableField(condition = SqlCondition.LIKE)
     private String activityCode;
 
     /** 活动状态：0-待核销；1-审批中；2-完成；3-冻结;4-已释放；5-已关闭(费用申请拒绝后关闭) */
@@ -63,11 +64,13 @@ public class TbsActivity implements Serializable {
     /** 客户编码 */
     @NotBlank(message = "客户编码不能为空")
     @Length(max = 30,message = "客户编码长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String supplierCode;
 
     /** 客户名称 */
     @NotBlank(message = "客户名称不能为空")
     @Length(max = 30,message = "客户名称长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String supplierName;
 
     /** 活动开始时间 */

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -179,7 +179,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         //拓展添加审批关联
         data.put("biz_region",bizRegionNames);
         data.put("exsp2",saleRegionNames);
-        data.put("data_state",TbsCostApplyState.State_1_apply);
+        data.put("data_state",TbsCostApplyState.State_1_apply.getCode()+"");
 
         //添加跳转地址业务
         String urlKey = "exsp5"+IdUtil.simpleUUID();

src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java

@@ -37,11 +37,13 @@ public class TzcPolicy implements Serializable {
     /** 主题 */
     @NotBlank(message = "主题不能为空")
     @Length(max = 60,message = "主题长度不能超过60字")
+    @TableField(condition = SqlCondition.LIKE)
     private String title;
 
     /** 政策编码 */
     @NotBlank(message = "政策编码不能为空")
     @Length(max = 50,message = "政策编码长度不能超过50字")
+    @TableField(condition = SqlCondition.LIKE)
     private String policyCode;
 
     /** 通过状态(0-未提交；1-审核中；2-已通过待执行；3-拒绝；4-被驳回；5-结束) */
@@ -70,11 +72,13 @@ public class TzcPolicy implements Serializable {
     /** 客户编码 */
     @NotBlank(message = "客户编码不能为空")
     @Length(max = 30,message = "客户编码长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String supplierCode;
 
     /** 客户名称 */
     @NotBlank(message = "客户名称不能为空")
     @Length(max = 30,message = "客户名称长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String supplierName;
 
     /** 申请人 */
@@ -85,11 +89,13 @@ public class TzcPolicy implements Serializable {
     /** 申请人 */
     @NotBlank(message = "申请人不能为空")
     @Length(max = 32,message = "申请人长度不能超过32字")
+    @TableField(condition = SqlCondition.LIKE)
     private String userCode;
 
     /** 申请人 */
     @NotBlank(message = "申请人不能为空")
     @Length(max = 32,message = "申请人长度不能超过32字")
+    @TableField(condition = SqlCondition.LIKE)
     private String userName;
 
     private String syFormId;

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -94,9 +94,7 @@ public class VtbVerificationController {
         }
         if(loadChild!=null&&loadChild.equals(1)){
             List<String> userIds = sysPostUserService.listByChildIds(AuthContextUtils.getSysUserId());
-            if(userIds.size()==0){
+            userIds.add(AuthContextUtils.getSysUserId());
-                return R.byEmptyList();
-            }
             if(userIds.size()==1){
                 lqw.eq(VtbVerification::getUserId,userIds.get(0));
             }else {
@@ -180,6 +178,7 @@ public class VtbVerificationController {
                 }
             }
         }
+        vtbVerification.setActivityInfo(tbsActivityService.getById(vtbVerification.getActivityId()));
         vtbVerification.setSubjectList(subjectList);
         return R.ok(vtbVerification);
     }