From 1e11b774f01dc3e5b699d919fd3d5fa491c716ad Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 24 Dec 2024 14:01:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E5=95=86=E7=B1=BB=E5=9E=8B=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/1schema.sql | 7 +++++ .../com/bsd/pjcloud/erp/dto/packge-info.java | 6 ---- .../erp/vo/SmErpSupplierTypeSimpleVo.java | 29 +++++++++++++++++++ .../SmErpSupplierTypeController.java | 15 ++++++++++ .../src/main/resources/logback-spring.xml | 2 +- 5 files changed, 52 insertions(+), 7 deletions(-) delete mode 100644 pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java create mode 100644 pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierTypeSimpleVo.java diff --git a/db/1schema.sql b/db/1schema.sql index 7bb91b244..bb106ca6e 100644 --- a/db/1schema.sql +++ b/db/1schema.sql @@ -27,3 +27,10 @@ create database `pjcloudx_bi` default character set utf8mb4 collate utf8mb4_gene -- pjcloud app 模块相关的数据库 create database `pjcloudx_app` default character set utf8mb4 collate utf8mb4_general_ci; + + +create database `pjcloudx_thirdparty` default character set utf8mb4 collate utf8mb4_general_ci; +create database `pjcloudx_canteen` default character set utf8mb4 collate utf8mb4_general_ci; +create database `pjcloudx_erp` default character set utf8mb4 collate utf8mb4_general_ci; +create database `pjcloudx_supermarket` default character set utf8mb4 collate utf8mb4_general_ci; +create database `pjcloudx_supermarket_erp` default character set utf8mb4 collate utf8mb4_general_ci; diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java deleted file mode 100644 index 006add580..000000000 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @author pigx archetype - *

- * DTO 存放目录 - */ -package com.bsd.pjcloud.erp.dto; \ No newline at end of file diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierTypeSimpleVo.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierTypeSimpleVo.java new file mode 100644 index 000000000..bd68bf870 --- /dev/null +++ b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierTypeSimpleVo.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 SmErpSupplierTypeSimpleVo { + + + /** + * 类别ID + */ + @Schema(description="类别ID") + private Long id; + + /** + * 货商类别名称 + */ + @Schema(description="货商类别名称") + private String typeName; + +} \ No newline at end of file diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java index 83fdf4700..85e4928f8 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java +++ b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java @@ -6,9 +6,11 @@ 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.common.security.util.SecurityUtils; +import com.bsd.pjcloud.erp.vo.SmErpSupplierTypeSimpleVo; import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity; import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierTypeService; import org.springframework.security.access.prepost.PreAuthorize; @@ -120,4 +122,17 @@ public class SmErpSupplierTypeController { public List export(SmErpSupplierTypeEntity smErpSupplierType,Long[] ids) { return smErpSupplierTypeService.list(Wrappers.lambdaQuery(smErpSupplierType).in(ArrayUtil.isNotEmpty(ids), SmErpSupplierTypeEntity::getId, ids)); } + + /** + * 下拉查询 + * @return + */ + @Operation(summary = "下拉查询" , description = "分页查询" ) + @GetMapping("/simpleAll") + public R getSimpleAll() { + List list = smErpSupplierTypeService.list(); + List bean = BeanUtils.toBean(list, SmErpSupplierTypeSimpleVo.class); + return R.ok(bean); + } + } \ No newline at end of file diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml index 9a84839f0..20ed663e5 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml @@ -26,7 +26,7 @@ - + ${log.path}/debug.log ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz