diff --git a/src/main/java/com/glxp/udi/admin/controller/basic/BussinessTypeController.java b/src/main/java/com/glxp/udi/admin/controller/basic/BussinessTypeController.java index 957d071..d6815ed 100644 --- a/src/main/java/com/glxp/udi/admin/controller/basic/BussinessTypeController.java +++ b/src/main/java/com/glxp/udi/admin/controller/basic/BussinessTypeController.java @@ -2,7 +2,6 @@ package com.glxp.udi.admin.controller.basic; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.constant.Constant; @@ -13,7 +12,6 @@ import com.glxp.udi.admin.req.basic.BussinessLocalTypeFilterRequest; import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.udi.admin.req.info.DeleteRequest; import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.res.basic.BussinessTypResponse; import com.glxp.udi.admin.service.auth.AuthAdminService; import com.glxp.udi.admin.service.auth.CustomerService; import com.glxp.udi.admin.service.basic.BussinessTypeService; @@ -91,21 +89,6 @@ public class BussinessTypeController { return ResultVOUtils.success(pageSimpleResponse); } - - @GetMapping("/udiwms/bussinessType/udimsFilter") - public BaseResponse udimsFilter(BussinessTypeFilterRequest bussinessTypeFilterRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - bussinessTypeFilterRequest.setSpUse(true); - Page page = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(page.getTotal()); - pageSimpleResponse.setList(page.getRecords()); - return ResultVOUtils.success(pageSimpleResponse); - } - - @AuthRuleAnnotation("") @PostMapping("/udiwms/bussinessType/delete") public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/udi/admin/dao/basic/BussinessTypeDao.java b/src/main/java/com/glxp/udi/admin/dao/basic/BussinessTypeDao.java index 58f6103..09ba46d 100644 --- a/src/main/java/com/glxp/udi/admin/dao/basic/BussinessTypeDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/basic/BussinessTypeDao.java @@ -2,10 +2,8 @@ package com.glxp.udi.admin.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.basic.BussinessTypeEntity; import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest; -import com.glxp.udi.admin.res.basic.BussinessTypResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,8 +12,6 @@ import java.util.List; @Mapper public interface BussinessTypeDao extends BaseMapper { - Page filterJoinList(Page page, BussinessTypeFilterRequest bussinessTypeFilterRequest); - IPage filterAllByUser(IPage page, String name, String action, String mainAction, String locInvCode, String customerId, Boolean enabled); List filterAllByUserList(BussinessTypeFilterRequest bussinessTypeFilterRequest); diff --git a/src/main/java/com/glxp/udi/admin/service/basic/BussinessTypeService.java b/src/main/java/com/glxp/udi/admin/service/basic/BussinessTypeService.java index 48f2f64..b8b788c 100644 --- a/src/main/java/com/glxp/udi/admin/service/basic/BussinessTypeService.java +++ b/src/main/java/com/glxp/udi/admin/service/basic/BussinessTypeService.java @@ -10,7 +10,6 @@ import com.glxp.udi.admin.constant.TypeConstant; import com.glxp.udi.admin.dao.basic.BussinessTypeDao; import com.glxp.udi.admin.entity.basic.BussinessTypeEntity; import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest; -import com.glxp.udi.admin.res.basic.BussinessTypResponse; import com.glxp.udi.admin.service.auth.AuthAdminService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Lazy; @@ -58,14 +57,6 @@ public class BussinessTypeService { return wrapper; } - public Page filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { - if (bussinessTypeFilterRequest == null) { - return new Page<>(); - } - Page page = new Page<>(bussinessTypeFilterRequest.getPage(), bussinessTypeFilterRequest.getLimit()); - return bussinessTypeDao.filterJoinList(page, bussinessTypeFilterRequest); - } - public IPage filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest) { if (bussinessTypeFilterRequest == null) { return new Page<>(); diff --git a/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 6fd7b05..f600870 100644 --- a/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -3,34 +3,6 @@ - -