1.修复部分bug

master
x_z 3 years ago
parent 860e39eb15
commit a8ff3575a0

@ -93,7 +93,7 @@ public class StackRulesController {
} }
} }
stackRulesService.updateStackRules(stackRulesEntity); stackRulesService.updateStackRules(stackRulesEntity);
return ResultVOUtils.success("更新成功"); return ResultVOUtils.success();
} }
/** /**
@ -108,7 +108,7 @@ public class StackRulesController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
} }
stackRulesService.delete(deleteRequest.getId()); stackRulesService.delete(deleteRequest.getId());
return ResultVOUtils.success("删除成功"); return ResultVOUtils.success();
} }
} }

@ -75,7 +75,7 @@ public class StackOrderController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
stackOrderService.updateOrder(stackUploadRequest); stackOrderService.updateOrder(stackUploadRequest);
return ResultVOUtils.success("更新成功"); return ResultVOUtils.success();
} }
@ -86,7 +86,7 @@ public class StackOrderController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
stackOrderService.deleteById(Integer.parseInt(deleteRequest.getId())); stackOrderService.deleteById(Integer.parseInt(deleteRequest.getId()));
return ResultVOUtils.success("更新成功"); return ResultVOUtils.success();
} }

@ -9,6 +9,11 @@ import lombok.Data;
@Data @Data
public class FilterStackRulesRequest extends ListPageRequest { public class FilterStackRulesRequest extends ListPageRequest {
/**
*
*/
private String key;
/** /**
* *
*/ */

@ -49,7 +49,12 @@ public class StackRulesService {
*/ */
private QueryWrapper<StackRulesEntity> buildWrapper(FilterStackRulesRequest filterStockRulesRequest) { private QueryWrapper<StackRulesEntity> buildWrapper(FilterStackRulesRequest filterStockRulesRequest) {
QueryWrapper<StackRulesEntity> wrapper = new QueryWrapper<>(); QueryWrapper<StackRulesEntity> wrapper = new QueryWrapper<>();
wrapper.like(StrUtil.isNotBlank(filterStockRulesRequest.getName()), "name", filterStockRulesRequest.getName()) wrapper.like(StrUtil.isNotBlank(filterStockRulesRequest.getKey()), "name", filterStockRulesRequest.getKey())
.or()
.like(StrUtil.isNotBlank(filterStockRulesRequest.getKey()), "prefix", filterStockRulesRequest.getKey())
.or()
.like(StrUtil.isNotBlank(filterStockRulesRequest.getKey()), "remark", filterStockRulesRequest.getKey())
.like(StrUtil.isNotBlank(filterStockRulesRequest.getName()), "name", filterStockRulesRequest.getName())
.eq(null != filterStockRulesRequest.getStatus(), "status", filterStockRulesRequest.getStatus()) .eq(null != filterStockRulesRequest.getStatus(), "status", filterStockRulesRequest.getStatus())
.eq(StrUtil.isNotBlank(filterStockRulesRequest.getCustomerId()), "customerId", filterStockRulesRequest.getCustomerId()); .eq(StrUtil.isNotBlank(filterStockRulesRequest.getCustomerId()), "customerId", filterStockRulesRequest.getCustomerId());
return wrapper; return wrapper;

Loading…
Cancel
Save