From c22db0b72fa99a97ba45a68bc3b1d24db312272c Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 19 Jun 2023 15:28:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=9F=BA=E7=A1=80=E4=BB=A3=E7=A0=811?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataCustomerStoreEntity.java | 15 + .../basicdata/entity/BasicdataShopEntity.java | 20 + .../entity/BasicdataStoreBusinessEntity.java | 80 +++ .../feign/IBasicdataStoreBusinessClient.java | 49 ++ .../logpm/basicdata/vo/BasicdataShopVO.java | 2 + .../vo/BasicdataStoreBusinessVO.java | 35 ++ .../DistributionStockArticleEntity.java | 6 + .../BasicdataStoreBusinessController.java | 150 +++++ .../dto/BasicdataStoreBusinessDTO.java | 34 ++ .../excel/BasicdataStoreBusinessExcel.java | 105 ++++ .../feign/BasicdataStoreBusinessClient.java | 53 ++ .../basicdata/mapper/BasicdataShopMapper.xml | 3 +- .../mapper/BasicdataStoreBusinessMapper.java | 54 ++ .../mapper/BasicdataStoreBusinessMapper.xml | 36 ++ .../IBasicdataStoreBusinessService.java | 52 ++ .../BasicdataStoreBusinessServiceImpl.java | 54 ++ doc/dpm/物流租户系统.pdma.json | 516 +++++++++++++++++- 17 files changed, 1260 insertions(+), 4 deletions(-) create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBusinessEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBusinessVO.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBusinessController.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStoreBusinessDTO.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataStoreBusinessExcel.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBusinessMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBusinessMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBusinessService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBusinessServiceImpl.java diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCustomerStoreEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCustomerStoreEntity.java index 88e656b69..4752f0ac5 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCustomerStoreEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCustomerStoreEntity.java @@ -76,5 +76,20 @@ public class BasicdataCustomerStoreEntity extends TenantEntity { */ @ApiModelProperty(value = "客户ID") private String clientId; + /** + * 办公地址 + */ + @ApiModelProperty(value = "办公地址") + private String businessAddress; + /** + * 联系人 + */ + @ApiModelProperty(value = "联系人") + private String linkman; + /** + * 电话 + */ + @ApiModelProperty(value = "电话") + private String phone; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java index 4ff994b35..f86bd195a 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java @@ -88,6 +88,26 @@ public class BasicdataShopEntity extends TenantEntity { */ @ApiModelProperty(value = "联系电话") private String phone; + /** + * 客户商场ID + */ + @ApiModelProperty(value = "客户商场ID") + private String customerStoreId; + /** + * 业务类型 + */ + @ApiModelProperty(value = "业务类型") + private String business_type; + /** + * 服务类型 + */ + @ApiModelProperty(value = "服务类型") + private String type_service; + /** + * 配送方式 + */ + @ApiModelProperty(value = "配送方式") + private String modeDistribution; /** * 省份 */ diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBusinessEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBusinessEntity.java new file mode 100644 index 000000000..b2656120e --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBusinessEntity.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 门店业务记录 实体类 + * + * @author cyz + * @since 2023-06-19 + */ +@Data +@TableName("logpm_basicdata_store_business") +@ApiModel(value = "BasicdataStoreBusiness对象", description = "门店业务记录") +@EqualsAndHashCode(callSuper = true) +public class BasicdataStoreBusinessEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 服务类型;1 提 2干 3仓 4配 5装 + */ + @ApiModelProperty(value = "服务类型;1 提 2干 3仓 4配 5装") + private Integer typeService; + /** + * 门店ID + */ + @ApiModelProperty(value = "门店ID") + private String shopId; + /** + * 服务类型—类型 + */ + @ApiModelProperty(value = "服务类型—类型") + private Integer mold; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java new file mode 100644 index 000000000..3664ad028 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import org.springblade.core.mp.support.BladePage; +import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 门店业务记录 Feign接口类 + * + * @author cyz + * @since 2023-06-19 + */ +@FeignClient( + value = "blade-basicdataStoreBusiness" +) +public interface IBasicdataStoreBusinessClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取门店业务记录列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataShopVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataShopVO.java index b8b0476a2..14ead197c 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataShopVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataShopVO.java @@ -34,5 +34,7 @@ public class BasicdataShopVO extends BasicdataShopEntity { //客户姓名 private String clientName; + //商场名称 + private String customerStoreName; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBusinessVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBusinessVO.java new file mode 100644 index 000000000..b05922a3b --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBusinessVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 门店业务记录 视图实体类 + * + * @author cyz + * @since 2023-06-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataStoreBusinessVO extends BasicdataStoreBusinessEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index 78389178e..d1d0f3fe4 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -149,4 +149,10 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "状态;1 配送 2 待配送") private Integer state; + /** + * 状态;1 已通知 2 未通知 + */ + @ApiModelProperty(value = "状态;1 已通知 2 未通知") + private Integer notification; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBusinessController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBusinessController.java new file mode 100644 index 000000000..4d9097293 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBusinessController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; +import com.logpm.basicdata.vo.BasicdataStoreBusinessVO; +import com.logpm.basicdata.excel.BasicdataStoreBusinessExcel; +import com.logpm.basicdata.service.IBasicdataStoreBusinessService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 门店业务记录 控制器 + * + * @author cyz + * @since 2023-06-19 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/basicdataStoreBusiness") +@Api(value = "门店业务记录", tags = "门店业务记录接口") +public class BasicdataStoreBusinessController extends BladeController { + + private final IBasicdataStoreBusinessService basicdataStoreBusinessService; + + /** + * 门店业务记录 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入basicdataStoreBusiness") + public R detail(BasicdataStoreBusinessEntity basicdataStoreBusiness) { + BasicdataStoreBusinessEntity detail = basicdataStoreBusinessService.getOne(Condition.getQueryWrapper(basicdataStoreBusiness)); + return R.data(detail); + } + /** + * 门店业务记录 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicdataStoreBusiness") + public R> list(@ApiIgnore @RequestParam Map basicdataStoreBusiness, Query query) { + IPage pages = basicdataStoreBusinessService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataStoreBusiness, BasicdataStoreBusinessEntity.class)); + return R.data(pages); + } + + /** + * 门店业务记录 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataStoreBusiness") + public R> page(BasicdataStoreBusinessVO basicdataStoreBusiness, Query query) { + IPage pages = basicdataStoreBusinessService.selectBasicdataStoreBusinessPage(Condition.getPage(query), basicdataStoreBusiness); + return R.data(pages); + } + + /** + * 门店业务记录 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入basicdataStoreBusiness") + public R save(@Valid @RequestBody BasicdataStoreBusinessEntity basicdataStoreBusiness) { + return R.status(basicdataStoreBusinessService.save(basicdataStoreBusiness)); + } + + /** + * 门店业务记录 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入basicdataStoreBusiness") + public R update(@Valid @RequestBody BasicdataStoreBusinessEntity basicdataStoreBusiness) { + return R.status(basicdataStoreBusinessService.updateById(basicdataStoreBusiness)); + } + + /** + * 门店业务记录 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入basicdataStoreBusiness") + public R submit(@Valid @RequestBody BasicdataStoreBusinessEntity basicdataStoreBusiness) { + return R.status(basicdataStoreBusinessService.saveOrUpdate(basicdataStoreBusiness)); + } + + /** + * 门店业务记录 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(basicdataStoreBusinessService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-basicdataStoreBusiness") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入basicdataStoreBusiness") + public void exportBasicdataStoreBusiness(@ApiIgnore @RequestParam Map basicdataStoreBusiness, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataStoreBusiness, BasicdataStoreBusinessEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicdataStoreBusiness::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(BasicdataStoreBusinessEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = basicdataStoreBusinessService.exportBasicdataStoreBusiness(queryWrapper); + ExcelUtil.export(response, "门店业务记录数据" + DateUtil.time(), "门店业务记录数据表", list, BasicdataStoreBusinessExcel.class); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStoreBusinessDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStoreBusinessDTO.java new file mode 100644 index 000000000..c960ad1f5 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStoreBusinessDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 门店业务记录 数据传输对象实体类 + * + * @author cyz + * @since 2023-06-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataStoreBusinessDTO extends BasicdataStoreBusinessEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataStoreBusinessExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataStoreBusinessExcel.java new file mode 100644 index 000000000..22f982f60 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataStoreBusinessExcel.java @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 门店业务记录 Excel实体类 + * + * @author cyz + * @since 2023-06-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataStoreBusinessExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 服务类型;1 提 2干 3仓 4配 5装 + */ + @ColumnWidth(20) + @ExcelProperty("服务类型;1 提 2干 3仓 4配 5装") + private Integer typeService; + /** + * 门店ID + */ + @ColumnWidth(20) + @ExcelProperty("门店ID") + private String shopId; + /** + * 服务类型—类型 + */ + @ColumnWidth(20) + @ExcelProperty("服务类型—类型") + private Integer mold; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java new file mode 100644 index 000000000..ba89b1f6d --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; +import com.logpm.basicdata.service.IBasicdataStoreBusinessService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 门店业务记录 Feign实现类 + * + * @author cyz + * @since 2023-06-19 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class BasicdataStoreBusinessClient implements IBasicdataStoreBusinessClient { + + private final IBasicdataStoreBusinessService basicdataStoreBusinessService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = basicdataStoreBusinessService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml index c2696df42..8c0b26a57 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml @@ -18,9 +18,10 @@ + select * from logpm_basicdata_store_business where is_deleted = 0 + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBusinessService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBusinessService.java new file mode 100644 index 000000000..bd9fdfb08 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBusinessService.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; +import com.logpm.basicdata.vo.BasicdataStoreBusinessVO; +import com.logpm.basicdata.excel.BasicdataStoreBusinessExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 门店业务记录 服务类 + * + * @author cyz + * @since 2023-06-19 + */ +public interface IBasicdataStoreBusinessService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicdataStoreBusiness + * @return + */ + IPage selectBasicdataStoreBusinessPage(IPage page, BasicdataStoreBusinessVO basicdataStoreBusiness); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataStoreBusiness(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBusinessServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBusinessServiceImpl.java new file mode 100644 index 000000000..200cb11be --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBusinessServiceImpl.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; +import com.logpm.basicdata.vo.BasicdataStoreBusinessVO; +import com.logpm.basicdata.excel.BasicdataStoreBusinessExcel; +import com.logpm.basicdata.mapper.BasicdataStoreBusinessMapper; +import com.logpm.basicdata.service.IBasicdataStoreBusinessService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * 门店业务记录 服务实现类 + * + * @author cyz + * @since 2023-06-19 + */ +@Service +public class BasicdataStoreBusinessServiceImpl extends BaseServiceImpl implements IBasicdataStoreBusinessService { + + @Override + public IPage selectBasicdataStoreBusinessPage(IPage page, BasicdataStoreBusinessVO basicdataStoreBusiness) { + return page.setRecords(baseMapper.selectBasicdataStoreBusinessPage(page, basicdataStoreBusiness)); + } + + + @Override + public List exportBasicdataStoreBusiness(Wrapper queryWrapper) { + List basicdataStoreBusinessList = baseMapper.exportBasicdataStoreBusiness(queryWrapper); + //basicdataStoreBusinessList.forEach(basicdataStoreBusiness -> { + // basicdataStoreBusiness.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataStoreBusiness.getType())); + //}); + return basicdataStoreBusinessList; + } + +} diff --git a/doc/dpm/物流租户系统.pdma.json b/doc/dpm/物流租户系统.pdma.json index 6b6e936bf..471d49ca9 100644 --- a/doc/dpm/物流租户系统.pdma.json +++ b/doc/dpm/物流租户系统.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2023-3-27 13:32:56", - "updatedTime": "2023-6-16 09:47:03", + "updatedTime": "2023-6-19 15:16:48", "dbConns": [], "profile": { "default": { @@ -24933,6 +24933,23 @@ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", "id": "DB8626A2-E661-4BDC-8F76-243120AB7795", "uiHint": null + }, + { + "defKey": "customer_store_id", + "defName": "客户商场id", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "3FA03277-F153-46E5-9C32-922C21230358" } ], "correlations": [], @@ -35263,6 +35280,57 @@ "extProps": {}, "domain": "", "id": "5FCC176E-CF0E-4025-9E59-5398FD5C4CDB" + }, + { + "defKey": "business_address", + "defName": "办公地址", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "4787F255-0CD7-42B3-B5FB-AA40364EFE00" + }, + { + "defKey": "linkman", + "defName": "联系人", + "comment": "", + "type": "VARCHAR", + "len": 50, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "365B2DA1-82A3-47A5-8BE3-D32897DE38C6" + }, + { + "defKey": "phone", + "defName": "联系电话", + "comment": "", + "type": "VARCHAR", + "len": 15, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "10D6EA0D-818C-4A40-A514-F4377228D796" } ], "correlations": [], @@ -48537,6 +48605,447 @@ ], "correlations": [], "indexes": [] + }, + { + "id": "02AD799B-26B6-4490-AC39-A95DC978399D", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "logpm_basicdata_store_business", + "defName": "门店业务记录", + "comment": "", + "properties": { + "partitioned by": "(date string)", + "row format delimited": "", + "fields terminated by ','": "", + "collection items terminated by '-'": "", + "map keys terminated by ':'": "", + "store as textfile;": "" + }, + "nameTemplate": "{defKey}[{defName}]", + "notes": {}, + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "defName", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "notNull", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "domain", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "type", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "len", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "scale", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "comment", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "refDict", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "isStandard", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "uiHint", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "extProps", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr1", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr2", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr3", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr4", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr5", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr6", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr7", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr8", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr9", + "freeze": false, + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "tenant_id", + "defName": "租户号", + "comment": "", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "refDict": "", + "uiHint": "", + "id": "12BD2067-CAA8-409E-A6B8-5F72D7F9A510" + }, + { + "defKey": "create_user", + "defName": "创建人", + "comment": "", + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "28769E8F-A542-4E2C-881F-D4329E927150" + }, + { + "defKey": "create_time", + "defName": "创建时间", + "comment": "", + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "64A4A937-1D4F-46B5-A6EF-16DA38F7B8CE" + }, + { + "defKey": "update_user", + "defName": "更新人", + "comment": "", + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "6BE03747-57D3-4237-90B3-A1E16B3F04FE" + }, + { + "defKey": "update_time", + "defName": "更新时间", + "comment": "", + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "055DAABA-CDCD-46A1-BEA3-FBC2C81C9583" + }, + { + "defKey": "status", + "defName": "状态", + "comment": "", + "type": "INT", + "len": 2, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "6FB3FBF1-CE16-49AB-BE78-61115A5FA49E" + }, + { + "defKey": "is_deleted", + "defName": "是否已删除", + "comment": "", + "type": "INT", + "len": 2, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "ABC334B0-9944-4344-808E-C2B7854EDCFB" + }, + { + "defKey": "create_dept", + "defName": "创建部门", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "97F9783D-0034-4894-B593-B532F2D52499" + }, + { + "defKey": "id", + "defName": "主键", + "comment": "", + "type": "INT", + "len": 20, + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "19FD2935-BCCE-408E-BBF9-E9F3B30B9177" + }, + { + "defKey": "reserve1", + "defName": "预留1", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "45AAA640-AF87-4BA8-A5E1-4FB6F505B4E5" + }, + { + "defKey": "reserve2", + "defName": "预留2", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "EFE52A01-C1A7-471F-A1FB-8C43A3EB31FF" + }, + { + "defKey": "reserve3", + "defName": "预留3", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "AA732F78-0706-4C4B-B490-6614DF338A7A" + }, + { + "defKey": "reserve4", + "defName": "预留4", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "0559AF9B-A241-48CC-815B-5DE35DF947AD" + }, + { + "defKey": "reserve5", + "defName": "预留5", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "6A26F65F-8D0B-4C2E-BD59-32255021D333" + }, + { + "defKey": "type_service", + "defName": "服务类型", + "comment": "1 提 2干 3仓 4配 5装", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "28C73092-7B20-4C92-BD21-24D83AB25B3E" + }, + { + "defKey": "shop_id", + "defName": "门店ID", + "comment": "", + "type": "VARCHAR", + "len": 20, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "188DD6D8-E379-4427-8B22-B7AB80434574" + }, + { + "defKey": "mold", + "defName": "服务类型—类型", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "DC5BE267-18BE-4856-A2EA-8B24AA791292" + } + ], + "correlations": [], + "indexes": [] } ], "views": [], @@ -48618,7 +49127,8 @@ "E537F18D-462D-4551-9BFF-25DF347A2EE5", "B8E50F9F-033E-4F86-8443-D849F4A0F013", "865E2039-46B4-4BF2-948F-696FFB16E73E", - "74441E51-EDB1-49F8-AD27-8506AF889909" + "74441E51-EDB1-49F8-AD27-8506AF889909", + "02AD799B-26B6-4490-AC39-A95DC978399D" ], "refViews": [], "refDiagrams": [], @@ -49200,4 +49710,4 @@ } ], "dbConn": [] -} +} \ No newline at end of file