修复模糊查询

src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java

@@ -158,7 +158,7 @@ public class BmsMasterUserController {
     @PreAuthorize("hasRole('bms:masterUser:insert')")
     public R<?> save(@RequestBody @Valid BmsMasterUserBo param){
         String type = param.getType();
-        if(!type.equals(MasterUserType.Center) || !type.equals(MasterUserType.Channel) || !type.equals(MasterUserType.Point)){
+        if(!type.equals(MasterUserType.Center) && !type.equals(MasterUserType.Channel) && !type.equals(MasterUserType.Point )){
             Assert.throwEx("没有对应的"+param.getType()+"类型！");
         }
         List<BmsMasterUser> masterUsers = new ArrayList<>();

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

@@ -92,6 +92,7 @@ public class GoodsCategoryController {
             treeNode.setId(cate.getId()+"");
             treeNode.setParentId(cate.getParentId().toString());
             treeNode.setSort(0);
+            treeNode.setEnable(cate.getEnable()+"");
             if(loadSpuData && cate.getLevel().equals(3)){
                 LambdaQueryWrapper<GoodsSpu> spuLqw = new LambdaQueryWrapper<>();
                 spuLqw.eq(GoodsSpu::getCategoryThird,cate.getId());

src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java

@@ -47,6 +47,7 @@ public class GoodsCategoryServiceImpl extends ServiceImpl<GoodsCategoryMapper,Go
     public void add(GoodsCategory category) {
         category.setId(null);
         if(category.getParentId()==null||category.getParentId().equals(0L)){
+            category.setParentId(0L);
             category.setLevel(1);
             this.save(category);
             category.setLevelPath(category.getId().toString());

src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java

@@ -45,6 +45,7 @@ public class PayPayment implements Serializable {
     /** 供应商编码 */
     @NotBlank(message = "供应商编码不能为空")
     @Length(max = 30,message = "供应商编码长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String supplierCode;
 
     /** 供应商 */

src/main/java/com/qs/serve/modules/qms/entity/QmsCategory.java

@@ -32,6 +32,7 @@ public class QmsCategory implements Serializable {
     /** 分类名称 */
     @NotBlank(message = "分类名称不能为空")
     @Length(max = 30,message = "分类名称长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String name;
 
     /** 创建时间 */

src/main/java/com/qs/serve/modules/qms/entity/QmsForm.java

@@ -32,6 +32,7 @@ public class QmsForm implements Serializable {
     /** 标题 */
     @NotBlank(message = "标题不能为空")
     @Length(max = 40,message = "标题长度不能超过40字")
+    @TableField(condition = SqlCondition.LIKE)
     private String title;
 
     /** 子标题 */

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

@@ -185,7 +185,7 @@ public class TbsActivityTemplateController {
      * @return
      */
     @GetMapping("/listMyTemplate")
-    public R<PageVo<TbsActivityTemplate>> listMyTemplate(){
+    public R<PageVo<TbsActivityTemplate>> listMyTemplate(String templateName){
         String userId = AuthContextUtils.getSysUserId();
         LambdaQueryWrapper<BmsRegionUser> regionUseLqw = new LambdaQueryWrapper<>();
         regionUseLqw.eq(BmsRegionUser::getUserId,userId);
@@ -193,7 +193,6 @@ public class TbsActivityTemplateController {
         Map<Integer,List<BmsRegionUser>> listMap = regionUsers.stream().collect(Collectors.groupingBy(BmsRegionUser::getType));
         List<BmsRegionUser> saleRegion = listMap.get(0);
         List<BmsRegionUser> bizRegion = listMap.get(1);
-        //TODO 有重复现象
         LambdaQueryWrapper<TbsActivityTemplateRegion> tempLqw = new LambdaQueryWrapper<>();
         if(CollectionUtil.isNotEmpty(saleRegion)){
             List<String> regionIds = saleRegion.stream().map(BmsRegionUser::getRegionId).collect(Collectors.toList());
@@ -209,13 +208,26 @@ public class TbsActivityTemplateController {
                 con.in(TbsActivityTemplateRegion::getRegionId,regionIds);
             });
         }
-        PageUtil.startPage();
         List<TbsActivityTemplateRegion> templateRegions = tbsActivityTemplateRegionService.list(tempLqw);
         if(CollectionUtil.isNotEmpty(templateRegions)){
             List<Long> templateIds = templateRegions.stream()
-                    .map(TbsActivityTemplateRegion::getTemplateId).collect(Collectors.toList());
+                    .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList());
-            List<TbsActivityTemplate> templates = tbsActivityTemplateService.listByIds(templateIds);
+            LambdaQueryWrapper<TbsActivityTemplate> tmpLqw = new LambdaQueryWrapper<>();
-            return R.byPageHelperList(templateRegions,templates);
+            tmpLqw.and(a->{
+                if(CollectionUtil.isNotEmpty(saleRegion)){
+                    a.or(b->b.eq(TbsActivityTemplate::getSaleRegionFlag,0));
+                }
+                if(CollectionUtil.isNotEmpty(bizRegion)){
+                    a.or(b->b.eq(TbsActivityTemplate::getBizRegionFlag,0));
+                }
+                a.or(b->b.in(TbsActivityTemplate::getId,templateIds));
+            });
+            if(StringUtils.hasText(templateName)){
+                tmpLqw.like(TbsActivityTemplate::getTemplateName,templateName);
+            }
+            PageUtil.startPage();
+            List<TbsActivityTemplate> templates = tbsActivityTemplateService.list(tmpLqw);
+            return R.byPageHelperList(templates);
         }else {
             return R.byEmptyList();
         }

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

@@ -242,6 +242,7 @@ public class TbsCostApplyController {
         ValidateTools.valid(costApplyBo);
         TbsCostApply entity = CopierUtil.copy(costApplyBo,new TbsCostApply());
         BmsSupplier supplier = bmsSupplierService.getById(entity.getSupplierId());
+        entity.setCode("CA"+IdUtil.timeStampId());
         entity.setTemplateId(param.getTemplateId());
         entity.setSupplierCode(supplier.getCode());
         entity.setSupplierName(supplier.getName());

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

@@ -35,6 +35,7 @@ public class TbsActivityTemplate implements Serializable {
     /** 模板名称 */
     @NotBlank(message = "模板名称不能为空")
     @Length(max = 30,message = "模板名称长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String templateName;
 
     /** 模板状态 */

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

@@ -36,6 +36,7 @@ public class TbsCostApply implements Serializable {
     /** 主题 */
     @NotBlank(message = "主题不能为空")
     @Length(max = 60,message = "主题长度不能超过60字")
+    @TableField(condition = SqlCondition.LIKE)
     private String chargeTheme;
 
     /** 客户id */
@@ -50,6 +51,7 @@ public class TbsCostApply implements Serializable {
     /** 客户名称 */
     @NotBlank(message = "客户名称不能为空")
     @Length(max = 30,message = "客户名称长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String supplierName;
 
     /** 状态:0=未发布；1=审批中；2=待执行；3=完成；4-被驳回 */
@@ -71,6 +73,7 @@ public class TbsCostApply implements Serializable {
 
     /** 用户名称 */
     @Length(max = 32,message = "长度不能超过32字")
+    @TableField(condition = SqlCondition.LIKE)
     private String userName;
 
     private String syFormId;

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

@@ -36,11 +36,13 @@ public class TbsSchedule implements Serializable {
     /** 考核名称 */
     @NotBlank(message = "考核名称不能为空")
     @Length(max = 30,message = "考核名称长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String code;
 
     /** 考核编码 */
     @NotBlank(message = "考核编码不能为空")
     @Length(max = 30,message = "考核编码长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String name;
 
     /** 备注 */

src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java

@@ -23,6 +23,9 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class TbsBudgetSo implements Serializable {
 
+    /** 预算编码 */
+    private String budgetCode;
+
     /** 科目编码搜索值 */
     private String subjectValue;
 

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@@ -463,7 +463,6 @@ public class TbsBudgetApplicationService {
             if(throwEx){
                 Assert.throwEx("品类["+ activityCostItem.getTargetName()+"]无可用预算");
             }
-            if(overspend){
             //添加到预算超支表
             activityCostItem.setBudgetId(0L);
             activityCostItem.setScheduleId(0L);
@@ -472,7 +471,6 @@ public class TbsBudgetApplicationService {
             actUnMatchList.add(activityCostItem);
         }
     }
-    }
 
     /**
      * 按品类条件,提取可用预算

src/main/resources/mapper/tbs/TbsBudgetMapper.xml

@@ -73,6 +73,7 @@
         FROM `tbs_budget` `tbs_budget`
         LEFT JOIN `tbs_budget_condition` `tbs_budget_condition` ON `tbs_budget`.`id` = `tbs_budget_condition`.`budget_id`
         <where>
+            <if test="query.budgetCode != null and query.budgetCode != ''"> and `tbs_budget`.`budget_code` like concat('%',#{query.budgetCode},'%')</if>
             <if test="query.subjectValue != null and query.subjectValue != ''">
                 and (
                     `tbs_budget`.`subject_code` like concat('%',#{query.subjectValue},'%')