Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud

pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierSimpleVo.java

@@ -0,0 +1,29 @@
+package com.bsd.pjcloud.erp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 货商类别
+ *
+ * @author zjf
+ * @date 2024-12-20 11:08:08
+ */
+@Data
+@Schema(description = "货商类别下拉")
+public class SmErpSupplierSimpleVo {
+
+
+	/**
+	* 类别ID
+	*/
+    @Schema(description="类别ID")
+    private Long id;
+
+	/**
+	* 货商类别名称
+	*/
+    @Schema(description="货商类别名称")
+    private String typeName;
+
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierController.java

@@ -6,8 +6,10 @@ 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.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.erp.vo.SmErpSupplierSimpleVo;
 import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
 import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -120,4 +122,16 @@ public class SmErpSupplierController {
     public List<SmErpSupplierEntity> export(SmErpSupplierEntity smErpSupplier,Long[] ids) {
         return smErpSupplierService.list(Wrappers.lambdaQuery(smErpSupplier).in(ArrayUtil.isNotEmpty(ids), SmErpSupplierEntity::getSupplierId, ids));
     }
+
+    /**
+     * 货商下拉
+     * @return R
+     */
+    @Operation(summary = "通过id查询" , description = "通过id查询" )
+    @GetMapping("/selectSimpleAll" )
+    public R selectSimpleAll() {
+        List<SmErpSupplierEntity> list = smErpSupplierService.selectSimpleAllScope();
+        List<SmErpSupplierSimpleVo> bean = BeanUtils.toBean(list, SmErpSupplierSimpleVo.class);
+        return R.ok(bean);
+    }
 }

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/SmErpSupplierService.java

@@ -3,6 +3,14 @@ package com.bsd.pjcloud.supermarketerp.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
 
+import java.util.List;
+
 public interface SmErpSupplierService extends IService<SmErpSupplierEntity> {
 
+
+    /**
+     * 隔离查询
+     * @return
+     */
+    List<SmErpSupplierEntity> selectSimpleAllScope();
 }

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/impl/SmErpSupplierServiceImpl.java

@@ -1,10 +1,15 @@
 package com.bsd.pjcloud.supermarketerp.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
 import com.bsd.pjcloud.supermarketerp.mapper.SmErpSupplierMapper;
 import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+
 /**
  * 货商管理
  *
@@ -13,4 +18,8 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SmErpSupplierServiceImpl extends ServiceImpl<SmErpSupplierMapper, SmErpSupplierEntity> implements SmErpSupplierService {
+    @Override
+    public List<SmErpSupplierEntity> selectSimpleAllScope() {
+       return baseMapper.selectListByScope(new LambdaQueryWrapper<SmErpSupplierEntity>().eq(SmErpSupplierEntity::getStatus, "0"), DataScope.of());
+    }
 }