From 8e4752fd6db3f394be8c7565c50cb965f21e3e71 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 13 May 2025 09:59:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=A0=82=E8=BF=9B=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/erp/CanteenSupplierSimpleVo.java | 23 +++++++++++++++++++ .../controller/CanteenSupplierController.java | 20 ++++++++++++++-- .../service/CanteenSupplierService.java | 21 +++++++++++++++++ .../impl/CanteenSupplierServiceImpl.java | 22 ++++++++++++++++++ 4 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenSupplierSimpleVo.java diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenSupplierSimpleVo.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenSupplierSimpleVo.java new file mode 100644 index 000000000..dd54d897e --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenSupplierSimpleVo.java @@ -0,0 +1,23 @@ +package com.bsd.pjcloud.canteen.vo.erp; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + +@Data +@Schema(description = "货商下拉") +public class CanteenSupplierSimpleVo { + + /** + * id + */ + @Schema(description="id") + private Long supplierId; + + /** + * 货商类别名称 + */ + @Schema(description="货商名称") + private String supplierName; + +} diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSupplierController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSupplierController.java index 282a47e52..4dcd0e0b5 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSupplierController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSupplierController.java @@ -6,10 +6,13 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.canteen.vo.erp.CanteenSupplierSimpleVo; +import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.canteen.entity.CanteenSupplierEntity; import com.bsd.pjcloud.canteen.service.CanteenSupplierService; +import com.bsd.pjcloud.common.security.util.SecurityUtils; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -21,7 +24,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 货商信息 @@ -51,7 +53,7 @@ public class CanteenSupplierController { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(canteenSupplier.getSupplierName()),CanteenSupplierEntity::getSupplierName,canteenSupplier.getSupplierName()); wrapper.eq(StrUtil.isNotBlank(canteenSupplier.getPhone()),CanteenSupplierEntity::getPhone,canteenSupplier.getPhone()); - return R.ok(canteenSupplierService.page(page, wrapper)); + return R.ok(canteenSupplierService.pageScope(page, wrapper)); } @@ -77,6 +79,7 @@ public class CanteenSupplierController { @PostMapping @PreAuthorize("@pms.hasPermission('canteen_canteenSupplier_add')" ) public R save(@RequestBody CanteenSupplierEntity canteenSupplier) { + canteenSupplier.setDeptId(SecurityUtils.getUser().getDeptId()); return R.ok(canteenSupplierService.save(canteenSupplier)); } @@ -119,4 +122,17 @@ public class CanteenSupplierController { public List export(CanteenSupplierEntity canteenSupplier,Long[] ids) { return canteenSupplierService.list(Wrappers.lambdaQuery(canteenSupplier).in(ArrayUtil.isNotEmpty(ids), CanteenSupplierEntity::getSupplierId, ids)); } + + /** + * 货商下拉 + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/selectSimpleAll" ) + public R selectSimpleAll(@RequestParam(value = "name",required = false)String name, + @RequestParam(value = "supplierId",required = false)Long supplierId) { + List list = canteenSupplierService.selectSimpleAllScope(name,supplierId); + List bean = BeanUtils.toBean(list, CanteenSupplierSimpleVo.class); + return R.ok(bean); + } } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSupplierService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSupplierService.java index 2d8ce0357..345074f21 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSupplierService.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSupplierService.java @@ -1,8 +1,29 @@ package com.bsd.pjcloud.canteen.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.canteen.entity.CanteenSupplierEntity; +import java.util.List; + public interface CanteenSupplierService extends IService { + + /** + * 数据权限分页查询 + * @param page + * @param wrapper + * @return + */ + Object pageScope(Page page, LambdaQueryWrapper wrapper); + + + /** + * 货商下拉 + * @param name + * @param supplierId + * @return + */ + List selectSimpleAllScope(String name, Long supplierId); } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSupplierServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSupplierServiceImpl.java index 79e8d4bdb..1b664169d 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSupplierServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSupplierServiceImpl.java @@ -1,10 +1,18 @@ package com.bsd.pjcloud.canteen.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.canteen.entity.CanteenSupplierEntity; import com.bsd.pjcloud.canteen.mapper.CanteenSupplierMapper; import com.bsd.pjcloud.canteen.service.CanteenSupplierService; +import com.bsd.pjcloud.common.data.datascope.DataScope; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 货商信息 * @@ -12,5 +20,19 @@ import org.springframework.stereotype.Service; * @date 2025-05-09 13:18:19 */ @Service +@AllArgsConstructor public class CanteenSupplierServiceImpl extends ServiceImpl implements CanteenSupplierService { + @Override + public Object pageScope(Page page, LambdaQueryWrapper wrapper) { + return baseMapper.selectPageByScope(page, wrapper, DataScope.of()); + } + + @Override + public List selectSimpleAllScope(String name, Long supplierId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(CanteenSupplierEntity::getStatus, "0"); + wrapper.like(StringUtils.isNotBlank(name),CanteenSupplierEntity::getSupplierName,name); + wrapper.eq(supplierId!=null,CanteenSupplierEntity::getSupplierId,supplierId); + return baseMapper.selectListByScope(wrapper, DataScope.of()); + } } \ No newline at end of file