From 5e25306bf17715d8f120c03ca7fedd84f664ef61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Tue, 26 Sep 2023 11:11:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=B3=E7=B3=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-admin-vben-master/src/utils/dict.ts | 1 + ...usinessEnterpriseRelationalController.java | 102 +++++++++++ .../BusinessEnterpriseRelationalBaseVO.java | 25 +++ ...sinessEnterpriseRelationalCreateReqVO.java | 14 ++ .../BusinessEnterpriseRelationalExcelVO.java | 31 ++++ ...sinessEnterpriseRelationalExportReqVO.java | 26 +++ ...BusinessEnterpriseRelationalPageReqVO.java | 28 +++ .../BusinessEnterpriseRelationalRespVO.java | 19 ++ ...sinessEnterpriseRelationalUpdateReqVO.java | 18 ++ .../BusinessUserRelationalController.java | 102 +++++++++++ .../vo/BusinessUserRelationalBaseVO.java | 25 +++ .../vo/BusinessUserRelationalCreateReqVO.java | 14 ++ .../vo/BusinessUserRelationalExcelVO.java | 31 ++++ .../vo/BusinessUserRelationalExportReqVO.java | 26 +++ .../vo/BusinessUserRelationalPageReqVO.java | 28 +++ .../vo/BusinessUserRelationalRespVO.java | 19 ++ .../vo/BusinessUserRelationalUpdateReqVO.java | 18 ++ .../vo/BusinessWarehouseBaseVO.java | 6 + .../vo/BusinessWarehouseExcelVO.java | 7 + .../vo/BusinessWarehouseExportReqVO.java | 6 + .../vo/BusinessWarehousePageReqVO.java | 6 + .../BusinessEnterpriseRelationalConvert.java | 34 ++++ .../BusinessUserRelationalConvert.java | 34 ++++ .../BusinessEnterpriseRelationalDO.java | 39 ++++ .../BusinessUserRelationalDO.java | 39 ++++ .../BusinessWarehouseDO.java | 8 + .../BusinessEnterpriseRelationalMapper.java | 36 ++++ .../BusinessUserRelationalMapper.java | 36 ++++ .../BusinessWarehouseMapper.java | 4 + .../module/xxjj/enums/ErrorCodeConstants.java | 6 + .../BusinessEnterpriseRelationalService.java | 70 ++++++++ ...sinessEnterpriseRelationalServiceImpl.java | 82 +++++++++ .../BusinessUserRelationalService.java | 70 ++++++++ .../BusinessUserRelationalServiceImpl.java | 82 +++++++++ .../BusinessEnterpriseRelationalMapper.xml | 12 ++ .../BusinessUserRelationalMapper.xml | 12 ++ ...ssEnterpriseRelationalServiceImplTest.java | 167 ++++++++++++++++++ ...BusinessUserRelationalServiceImplTest.java | 167 ++++++++++++++++++ 38 files changed, 1450 insertions(+) create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/BusinessEnterpriseRelationalController.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalBaseVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalCreateReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExcelVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExportReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalPageReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalRespVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalUpdateReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/BusinessUserRelationalController.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalBaseVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalCreateReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExcelVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExportReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalPageReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalRespVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalUpdateReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessenterpriserelational/BusinessEnterpriseRelationalConvert.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessuserrelational/BusinessUserRelationalConvert.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessenterpriserelational/BusinessEnterpriseRelationalDO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessuserrelational/BusinessUserRelationalDO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessenterpriserelational/BusinessEnterpriseRelationalMapper.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessuserrelational/BusinessUserRelationalMapper.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalService.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImpl.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalService.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImpl.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessenterpriserelational/BusinessEnterpriseRelationalMapper.xml create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java diff --git a/yudao-ui-admin-vben-master/src/utils/dict.ts b/yudao-ui-admin-vben-master/src/utils/dict.ts index 7ebce2f..77a9e0f 100644 --- a/yudao-ui-admin-vben-master/src/utils/dict.ts +++ b/yudao-ui-admin-vben-master/src/utils/dict.ts @@ -156,4 +156,5 @@ export enum DICT_TYPE { // ============= BUSINESSLINE 模块================= BUSINESS_TYPE = 'business_type', //业务线类型 DIFF_FLAG = 'diff_flag', + CLASS_STATUS = 'class_status', } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/BusinessEnterpriseRelationalController.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/BusinessEnterpriseRelationalController.java new file mode 100644 index 0000000..f359fa6 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/BusinessEnterpriseRelationalController.java @@ -0,0 +1,102 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational; + +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.yunxi.scm.framework.common.pojo.PageResult; +import com.yunxi.scm.framework.common.pojo.CommonResult; +import static com.yunxi.scm.framework.common.pojo.CommonResult.success; + +import com.yunxi.scm.framework.excel.core.util.ExcelUtils; + +import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; +import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO; +import com.yunxi.scm.module.xxjj.convert.businessenterpriserelational.BusinessEnterpriseRelationalConvert; +import com.yunxi.scm.module.xxjj.service.businessenterpriserelational.BusinessEnterpriseRelationalService; + +@Tag(name = "管理后台 - 业务线和机构关联") +@RestController +@RequestMapping("/xxjj/business-enterprise-relational") +@Validated +public class BusinessEnterpriseRelationalController { + + @Resource + private BusinessEnterpriseRelationalService businessEnterpriseRelationalService; + + @PostMapping("/create") + @Operation(summary = "创建业务线和机构关联") + @PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:create')") + public CommonResult createBusinessEnterpriseRelational(@Valid @RequestBody BusinessEnterpriseRelationalCreateReqVO createReqVO) { + return success(businessEnterpriseRelationalService.createBusinessEnterpriseRelational(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新业务线和机构关联") + @PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:update')") + public CommonResult updateBusinessEnterpriseRelational(@Valid @RequestBody BusinessEnterpriseRelationalUpdateReqVO updateReqVO) { + businessEnterpriseRelationalService.updateBusinessEnterpriseRelational(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除业务线和机构关联") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:delete')") + public CommonResult deleteBusinessEnterpriseRelational(@RequestParam("id") Long id) { + businessEnterpriseRelationalService.deleteBusinessEnterpriseRelational(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得业务线和机构关联") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:query')") + public CommonResult getBusinessEnterpriseRelational(@RequestParam("id") Long id) { + BusinessEnterpriseRelationalDO businessEnterpriseRelational = businessEnterpriseRelationalService.getBusinessEnterpriseRelational(id); + return success(BusinessEnterpriseRelationalConvert.INSTANCE.convert(businessEnterpriseRelational)); + } + + @GetMapping("/list") + @Operation(summary = "获得业务线和机构关联列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:query')") + public CommonResult> getBusinessEnterpriseRelationalList(@RequestParam("ids") Collection ids) { + List list = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalList(ids); + return success(BusinessEnterpriseRelationalConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得业务线和机构关联分页") + @PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:query')") + public CommonResult> getBusinessEnterpriseRelationalPage(@Valid BusinessEnterpriseRelationalPageReqVO pageVO) { + PageResult pageResult = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalPage(pageVO); + return success(BusinessEnterpriseRelationalConvert.INSTANCE.convertPage(pageResult)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出业务线和机构关联 Excel") + @PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:export')") + @OperateLog(type = EXPORT) + public void exportBusinessEnterpriseRelationalExcel(@Valid BusinessEnterpriseRelationalExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalList(exportReqVO); + // 导出 Excel + List datas = BusinessEnterpriseRelationalConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "业务线和机构关联.xls", "数据", BusinessEnterpriseRelationalExcelVO.class, datas); + } + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalBaseVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalBaseVO.java new file mode 100644 index 0000000..cdfcea1 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalBaseVO.java @@ -0,0 +1,25 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import javax.validation.constraints.*; + +/** + * 业务线和机构关联 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class BusinessEnterpriseRelationalBaseVO { + + @Schema(description = "业务线id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7685") + @NotNull(message = "业务线id不能为空") + private Long businessId; + + @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7361") + @NotNull(message = "企业id不能为空") + private Long enterpriseId; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalCreateReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalCreateReqVO.java new file mode 100644 index 0000000..324e69d --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalCreateReqVO.java @@ -0,0 +1,14 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 业务线和机构关联创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BusinessEnterpriseRelationalCreateReqVO extends BusinessEnterpriseRelationalBaseVO { + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExcelVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExcelVO.java new file mode 100644 index 0000000..3f56cbd --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExcelVO.java @@ -0,0 +1,31 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 业务线和机构关联 Excel VO + * + * @author 长江云息 + */ +@Data +public class BusinessEnterpriseRelationalExcelVO { + + @ExcelProperty("主键id") + private Long id; + + @ExcelProperty("业务线id") + private Long businessId; + + @ExcelProperty("企业id") + private Long enterpriseId; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExportReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExportReqVO.java new file mode 100644 index 0000000..37a400f --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExportReqVO.java @@ -0,0 +1,26 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.yunxi.scm.framework.common.pojo.PageParam; +import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 业务线和机构关联 Excel 导出 Request VO，参数和 BusinessEnterpriseRelationalPageReqVO 是一致的") +@Data +public class BusinessEnterpriseRelationalExportReqVO { + + @Schema(description = "业务线id", example = "7685") + private Long businessId; + + @Schema(description = "企业id", example = "7361") + private Long enterpriseId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalPageReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalPageReqVO.java new file mode 100644 index 0000000..7290529 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalPageReqVO.java @@ -0,0 +1,28 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.yunxi.scm.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 业务线和机构关联分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BusinessEnterpriseRelationalPageReqVO extends PageParam { + + @Schema(description = "业务线id", example = "7685") + private Long businessId; + + @Schema(description = "企业id", example = "7361") + private Long enterpriseId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalRespVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalRespVO.java new file mode 100644 index 0000000..63d2a3c --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalRespVO.java @@ -0,0 +1,19 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 业务线和机构关联 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BusinessEnterpriseRelationalRespVO extends BusinessEnterpriseRelationalBaseVO { + + @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29174") + private Long id; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalUpdateReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalUpdateReqVO.java new file mode 100644 index 0000000..4bf202a --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 业务线和机构关联更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BusinessEnterpriseRelationalUpdateReqVO extends BusinessEnterpriseRelationalBaseVO { + + @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29174") + @NotNull(message = "主键id不能为空") + private Long id; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/BusinessUserRelationalController.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/BusinessUserRelationalController.java new file mode 100644 index 0000000..6495753 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/BusinessUserRelationalController.java @@ -0,0 +1,102 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational; + +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.yunxi.scm.framework.common.pojo.PageResult; +import com.yunxi.scm.framework.common.pojo.CommonResult; +import static com.yunxi.scm.framework.common.pojo.CommonResult.success; + +import com.yunxi.scm.framework.excel.core.util.ExcelUtils; + +import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; +import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; +import com.yunxi.scm.module.xxjj.convert.businessuserrelational.BusinessUserRelationalConvert; +import com.yunxi.scm.module.xxjj.service.businessuserrelational.BusinessUserRelationalService; + +@Tag(name = "管理后台 - 业务线和用户关联") +@RestController +@RequestMapping("/xxjj/business-user-relational") +@Validated +public class BusinessUserRelationalController { + + @Resource + private BusinessUserRelationalService businessUserRelationalService; + + @PostMapping("/create") + @Operation(summary = "创建业务线和用户关联") + @PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:create')") + public CommonResult createBusinessUserRelational(@Valid @RequestBody BusinessUserRelationalCreateReqVO createReqVO) { + return success(businessUserRelationalService.createBusinessUserRelational(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新业务线和用户关联") + @PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:update')") + public CommonResult updateBusinessUserRelational(@Valid @RequestBody BusinessUserRelationalUpdateReqVO updateReqVO) { + businessUserRelationalService.updateBusinessUserRelational(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除业务线和用户关联") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:delete')") + public CommonResult deleteBusinessUserRelational(@RequestParam("id") Long id) { + businessUserRelationalService.deleteBusinessUserRelational(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得业务线和用户关联") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:query')") + public CommonResult getBusinessUserRelational(@RequestParam("id") Long id) { + BusinessUserRelationalDO businessUserRelational = businessUserRelationalService.getBusinessUserRelational(id); + return success(BusinessUserRelationalConvert.INSTANCE.convert(businessUserRelational)); + } + + @GetMapping("/list") + @Operation(summary = "获得业务线和用户关联列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:query')") + public CommonResult> getBusinessUserRelationalList(@RequestParam("ids") Collection ids) { + List list = businessUserRelationalService.getBusinessUserRelationalList(ids); + return success(BusinessUserRelationalConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得业务线和用户关联分页") + @PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:query')") + public CommonResult> getBusinessUserRelationalPage(@Valid BusinessUserRelationalPageReqVO pageVO) { + PageResult pageResult = businessUserRelationalService.getBusinessUserRelationalPage(pageVO); + return success(BusinessUserRelationalConvert.INSTANCE.convertPage(pageResult)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出业务线和用户关联 Excel") + @PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:export')") + @OperateLog(type = EXPORT) + public void exportBusinessUserRelationalExcel(@Valid BusinessUserRelationalExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = businessUserRelationalService.getBusinessUserRelationalList(exportReqVO); + // 导出 Excel + List datas = BusinessUserRelationalConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "业务线和用户关联.xls", "数据", BusinessUserRelationalExcelVO.class, datas); + } + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalBaseVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalBaseVO.java new file mode 100644 index 0000000..d069929 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalBaseVO.java @@ -0,0 +1,25 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import javax.validation.constraints.*; + +/** + * 业务线和用户关联 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class BusinessUserRelationalBaseVO { + + @Schema(description = "业务线id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6353") + @NotNull(message = "业务线id不能为空") + private Long businessId; + + @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5981") + @NotNull(message = "用户id不能为空") + private Long userId; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalCreateReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalCreateReqVO.java new file mode 100644 index 0000000..6597c4e --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalCreateReqVO.java @@ -0,0 +1,14 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 业务线和用户关联创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BusinessUserRelationalCreateReqVO extends BusinessUserRelationalBaseVO { + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExcelVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExcelVO.java new file mode 100644 index 0000000..f42cf32 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExcelVO.java @@ -0,0 +1,31 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 业务线和用户关联 Excel VO + * + * @author 长江云息 + */ +@Data +public class BusinessUserRelationalExcelVO { + + @ExcelProperty("主键id") + private Long id; + + @ExcelProperty("业务线id") + private Long businessId; + + @ExcelProperty("用户id") + private Long userId; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExportReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExportReqVO.java new file mode 100644 index 0000000..f0a1f88 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExportReqVO.java @@ -0,0 +1,26 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.yunxi.scm.framework.common.pojo.PageParam; +import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 业务线和用户关联 Excel 导出 Request VO，参数和 BusinessUserRelationalPageReqVO 是一致的") +@Data +public class BusinessUserRelationalExportReqVO { + + @Schema(description = "业务线id", example = "6353") + private Long businessId; + + @Schema(description = "用户id", example = "5981") + private Long userId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalPageReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalPageReqVO.java new file mode 100644 index 0000000..8704b5e --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalPageReqVO.java @@ -0,0 +1,28 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.yunxi.scm.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 业务线和用户关联分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BusinessUserRelationalPageReqVO extends PageParam { + + @Schema(description = "业务线id", example = "6353") + private Long businessId; + + @Schema(description = "用户id", example = "5981") + private Long userId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalRespVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalRespVO.java new file mode 100644 index 0000000..eb72134 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalRespVO.java @@ -0,0 +1,19 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 业务线和用户关联 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BusinessUserRelationalRespVO extends BusinessUserRelationalBaseVO { + + @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31510") + private Long id; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalUpdateReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalUpdateReqVO.java new file mode 100644 index 0000000..e251dd9 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 业务线和用户关联更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BusinessUserRelationalUpdateReqVO extends BusinessUserRelationalBaseVO { + + @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31510") + @NotNull(message = "主键id不能为空") + private Long id; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java index aa9be7d..27abd55 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java @@ -41,6 +41,12 @@ public class BusinessWarehouseBaseVO { @Schema(description = "状态") private String status; + @Schema(description = "关联机构") + private Integer institutionNum; + + @Schema(description = "成员数量") + private Integer employeeNum; + @Schema(description = "所属行业") private String industry; diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java index ebbb7ab..0c4e4a5 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java @@ -1,6 +1,7 @@ package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.models.security.SecurityScheme; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -44,6 +45,12 @@ public class BusinessWarehouseExcelVO { @ExcelProperty("状态") private String status; + @ExcelProperty("关联机构") + private Integer institutionNum; + + @ExcelProperty("成员数量") + private Integer employeeNum; + @ExcelProperty(value = "所属行业", converter = DictConvert.class) @DictFormat("duty_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String industry; diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java index 87aeec3..0146c37 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java @@ -34,6 +34,12 @@ public class BusinessWarehouseExportReqVO { @Schema(description = "状态", example = "1") private String status; + @Schema(description = "关联机构") + private Integer institutionNum; + + @Schema(description = "成员数量") + private Integer employeeNum; + @Schema(description = "所属行业") private String industry; diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java index 3184129..a1e7201 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java @@ -36,6 +36,12 @@ public class BusinessWarehousePageReqVO extends PageParam { @Schema(description = "状态", example = "1") private String status; + @Schema(description = "关联机构") + private Integer institutionNum; + + @Schema(description = "成员数量") + private Integer employeeNum; + @Schema(description = "所属行业") private String industry; diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessenterpriserelational/BusinessEnterpriseRelationalConvert.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessenterpriserelational/BusinessEnterpriseRelationalConvert.java new file mode 100644 index 0000000..50845ee --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessenterpriserelational/BusinessEnterpriseRelationalConvert.java @@ -0,0 +1,34 @@ +package com.yunxi.scm.module.xxjj.convert.businessenterpriserelational; + +import java.util.*; + +import com.yunxi.scm.framework.common.pojo.PageResult; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO; + +/** + * 业务线和机构关联 Convert + * + * @author 长江云息 + */ +@Mapper +public interface BusinessEnterpriseRelationalConvert { + + BusinessEnterpriseRelationalConvert INSTANCE = Mappers.getMapper(BusinessEnterpriseRelationalConvert.class); + + BusinessEnterpriseRelationalDO convert(BusinessEnterpriseRelationalCreateReqVO bean); + + BusinessEnterpriseRelationalDO convert(BusinessEnterpriseRelationalUpdateReqVO bean); + + BusinessEnterpriseRelationalRespVO convert(BusinessEnterpriseRelationalDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessuserrelational/BusinessUserRelationalConvert.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessuserrelational/BusinessUserRelationalConvert.java new file mode 100644 index 0000000..8adc884 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessuserrelational/BusinessUserRelationalConvert.java @@ -0,0 +1,34 @@ +package com.yunxi.scm.module.xxjj.convert.businessuserrelational; + +import java.util.*; + +import com.yunxi.scm.framework.common.pojo.PageResult; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; + +/** + * 业务线和用户关联 Convert + * + * @author 长江云息 + */ +@Mapper +public interface BusinessUserRelationalConvert { + + BusinessUserRelationalConvert INSTANCE = Mappers.getMapper(BusinessUserRelationalConvert.class); + + BusinessUserRelationalDO convert(BusinessUserRelationalCreateReqVO bean); + + BusinessUserRelationalDO convert(BusinessUserRelationalUpdateReqVO bean); + + BusinessUserRelationalRespVO convert(BusinessUserRelationalDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessenterpriserelational/BusinessEnterpriseRelationalDO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessenterpriserelational/BusinessEnterpriseRelationalDO.java new file mode 100644 index 0000000..0ace606 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessenterpriserelational/BusinessEnterpriseRelationalDO.java @@ -0,0 +1,39 @@ +package com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO; + +/** + * 业务线和机构关联 DO + * + * @author 长江云息 + */ +@TableName("xxjj_business_enterprise_relational") +@KeySequence("xxjj_business_enterprise_relational_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BusinessEnterpriseRelationalDO extends BaseDO { + + /** + * 主键id + */ + @TableId + private Long id; + /** + * 业务线id + */ + private Long businessId; + /** + * 企业id + */ + private Long enterpriseId; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessuserrelational/BusinessUserRelationalDO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessuserrelational/BusinessUserRelationalDO.java new file mode 100644 index 0000000..8aea799 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessuserrelational/BusinessUserRelationalDO.java @@ -0,0 +1,39 @@ +package com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO; + +/** + * 业务线和用户关联 DO + * + * @author 长江云息 + */ +@TableName("xxjj_business_user_relational") +@KeySequence("xxjj_business_user_relational_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BusinessUserRelationalDO extends BaseDO { + + /** + * 主键id + */ + @TableId + private Long id; + /** + * 业务线id + */ + private Long businessId; + /** + * 用户id + */ + private Long userId; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java index 1569420..cfe43e9 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java @@ -57,6 +57,14 @@ public class BusinessWarehouseDO extends TenantBaseDO { * 状态 */ private String status; + /** + * 关联机构 + */ + private Integer institutionNum; + /** + * 成员数量 + */ + private Integer employeeNum; /** * 所属行业 * diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessenterpriserelational/BusinessEnterpriseRelationalMapper.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessenterpriserelational/BusinessEnterpriseRelationalMapper.java new file mode 100644 index 0000000..c7e98be --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessenterpriserelational/BusinessEnterpriseRelationalMapper.java @@ -0,0 +1,36 @@ +package com.yunxi.scm.module.xxjj.dal.mysql.businessenterpriserelational; + +import java.util.*; + +import com.yunxi.scm.framework.common.pojo.PageResult; +import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO; +import org.apache.ibatis.annotations.Mapper; +import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*; + +/** + * 业务线和机构关联 Mapper + * + * @author 长江云息 + */ +@Mapper +public interface BusinessEnterpriseRelationalMapper extends BaseMapperX { + + default PageResult selectPage(BusinessEnterpriseRelationalPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessEnterpriseRelationalDO::getBusinessId, reqVO.getBusinessId()) + .eqIfPresent(BusinessEnterpriseRelationalDO::getEnterpriseId, reqVO.getEnterpriseId()) + .betweenIfPresent(BusinessEnterpriseRelationalDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(BusinessEnterpriseRelationalDO::getId)); + } + + default List selectList(BusinessEnterpriseRelationalExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(BusinessEnterpriseRelationalDO::getBusinessId, reqVO.getBusinessId()) + .eqIfPresent(BusinessEnterpriseRelationalDO::getEnterpriseId, reqVO.getEnterpriseId()) + .betweenIfPresent(BusinessEnterpriseRelationalDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(BusinessEnterpriseRelationalDO::getId)); + } + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessuserrelational/BusinessUserRelationalMapper.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessuserrelational/BusinessUserRelationalMapper.java new file mode 100644 index 0000000..a7873ef --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessuserrelational/BusinessUserRelationalMapper.java @@ -0,0 +1,36 @@ +package com.yunxi.scm.module.xxjj.dal.mysql.businessuserrelational; + +import java.util.*; + +import com.yunxi.scm.framework.common.pojo.PageResult; +import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; +import org.apache.ibatis.annotations.Mapper; +import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*; + +/** + * 业务线和用户关联 Mapper + * + * @author 长江云息 + */ +@Mapper +public interface BusinessUserRelationalMapper extends BaseMapperX { + + default PageResult selectPage(BusinessUserRelationalPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessUserRelationalDO::getBusinessId, reqVO.getBusinessId()) + .eqIfPresent(BusinessUserRelationalDO::getUserId, reqVO.getUserId()) + .betweenIfPresent(BusinessUserRelationalDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(BusinessUserRelationalDO::getId)); + } + + default List selectList(BusinessUserRelationalExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(BusinessUserRelationalDO::getBusinessId, reqVO.getBusinessId()) + .eqIfPresent(BusinessUserRelationalDO::getUserId, reqVO.getUserId()) + .betweenIfPresent(BusinessUserRelationalDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(BusinessUserRelationalDO::getId)); + } + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java index fe7e653..5a91256 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java @@ -26,6 +26,8 @@ public interface BusinessWarehouseMapper extends BaseMapperX getBusinessEnterpriseRelationalList(Collection ids); + + /** + * 获得业务线和机构关联分页 + * + * @param pageReqVO 分页查询 + * @return 业务线和机构关联分页 + */ + PageResult getBusinessEnterpriseRelationalPage(BusinessEnterpriseRelationalPageReqVO pageReqVO); + + /** + * 获得业务线和机构关联列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 业务线和机构关联列表 + */ + List getBusinessEnterpriseRelationalList(BusinessEnterpriseRelationalExportReqVO exportReqVO); + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImpl.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImpl.java new file mode 100644 index 0000000..8621f18 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImpl.java @@ -0,0 +1,82 @@ +package com.yunxi.scm.module.xxjj.service.businessenterpriserelational; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO; +import com.yunxi.scm.framework.common.pojo.PageResult; + +import com.yunxi.scm.module.xxjj.convert.businessenterpriserelational.BusinessEnterpriseRelationalConvert; +import com.yunxi.scm.module.xxjj.dal.mysql.businessenterpriserelational.BusinessEnterpriseRelationalMapper; + +import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; + +/** + * 业务线和机构关联 Service 实现类 + * + * @author 长江云息 + */ +@Service +@Validated +public class BusinessEnterpriseRelationalServiceImpl implements BusinessEnterpriseRelationalService { + + @Resource + private BusinessEnterpriseRelationalMapper businessEnterpriseRelationalMapper; + + @Override + public Long createBusinessEnterpriseRelational(BusinessEnterpriseRelationalCreateReqVO createReqVO) { + // 插入 + BusinessEnterpriseRelationalDO businessEnterpriseRelational = BusinessEnterpriseRelationalConvert.INSTANCE.convert(createReqVO); + businessEnterpriseRelationalMapper.insert(businessEnterpriseRelational); + // 返回 + return businessEnterpriseRelational.getId(); + } + + @Override + public void updateBusinessEnterpriseRelational(BusinessEnterpriseRelationalUpdateReqVO updateReqVO) { + // 校验存在 + validateBusinessEnterpriseRelationalExists(updateReqVO.getId()); + // 更新 + BusinessEnterpriseRelationalDO updateObj = BusinessEnterpriseRelationalConvert.INSTANCE.convert(updateReqVO); + businessEnterpriseRelationalMapper.updateById(updateObj); + } + + @Override + public void deleteBusinessEnterpriseRelational(Long id) { + // 校验存在 + validateBusinessEnterpriseRelationalExists(id); + // 删除 + businessEnterpriseRelationalMapper.deleteById(id); + } + + private void validateBusinessEnterpriseRelationalExists(Long id) { + if (businessEnterpriseRelationalMapper.selectById(id) == null) { + throw exception(BUSINESS_ENTERPRISE_RELATIONAL_NOT_EXISTS); + } + } + + @Override + public BusinessEnterpriseRelationalDO getBusinessEnterpriseRelational(Long id) { + return businessEnterpriseRelationalMapper.selectById(id); + } + + @Override + public List getBusinessEnterpriseRelationalList(Collection ids) { + return businessEnterpriseRelationalMapper.selectBatchIds(ids); + } + + @Override + public PageResult getBusinessEnterpriseRelationalPage(BusinessEnterpriseRelationalPageReqVO pageReqVO) { + return businessEnterpriseRelationalMapper.selectPage(pageReqVO); + } + + @Override + public List getBusinessEnterpriseRelationalList(BusinessEnterpriseRelationalExportReqVO exportReqVO) { + return businessEnterpriseRelationalMapper.selectList(exportReqVO); + } + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalService.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalService.java new file mode 100644 index 0000000..98aa8d1 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalService.java @@ -0,0 +1,70 @@ +package com.yunxi.scm.module.xxjj.service.businessuserrelational; + +import java.util.*; +import javax.validation.*; +import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; +import com.yunxi.scm.framework.common.pojo.PageResult; + +/** + * 业务线和用户关联 Service 接口 + * + * @author 长江云息 + */ +public interface BusinessUserRelationalService { + + /** + * 创建业务线和用户关联 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createBusinessUserRelational(@Valid BusinessUserRelationalCreateReqVO createReqVO); + + /** + * 更新业务线和用户关联 + * + * @param updateReqVO 更新信息 + */ + void updateBusinessUserRelational(@Valid BusinessUserRelationalUpdateReqVO updateReqVO); + + /** + * 删除业务线和用户关联 + * + * @param id 编号 + */ + void deleteBusinessUserRelational(Long id); + + /** + * 获得业务线和用户关联 + * + * @param id 编号 + * @return 业务线和用户关联 + */ + BusinessUserRelationalDO getBusinessUserRelational(Long id); + + /** + * 获得业务线和用户关联列表 + * + * @param ids 编号 + * @return 业务线和用户关联列表 + */ + List getBusinessUserRelationalList(Collection ids); + + /** + * 获得业务线和用户关联分页 + * + * @param pageReqVO 分页查询 + * @return 业务线和用户关联分页 + */ + PageResult getBusinessUserRelationalPage(BusinessUserRelationalPageReqVO pageReqVO); + + /** + * 获得业务线和用户关联列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 业务线和用户关联列表 + */ + List getBusinessUserRelationalList(BusinessUserRelationalExportReqVO exportReqVO); + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImpl.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImpl.java new file mode 100644 index 0000000..732f734 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImpl.java @@ -0,0 +1,82 @@ +package com.yunxi.scm.module.xxjj.service.businessuserrelational; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; +import com.yunxi.scm.framework.common.pojo.PageResult; + +import com.yunxi.scm.module.xxjj.convert.businessuserrelational.BusinessUserRelationalConvert; +import com.yunxi.scm.module.xxjj.dal.mysql.businessuserrelational.BusinessUserRelationalMapper; + +import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; + +/** + * 业务线和用户关联 Service 实现类 + * + * @author 长江云息 + */ +@Service +@Validated +public class BusinessUserRelationalServiceImpl implements BusinessUserRelationalService { + + @Resource + private BusinessUserRelationalMapper businessUserRelationalMapper; + + @Override + public Long createBusinessUserRelational(BusinessUserRelationalCreateReqVO createReqVO) { + // 插入 + BusinessUserRelationalDO businessUserRelational = BusinessUserRelationalConvert.INSTANCE.convert(createReqVO); + businessUserRelationalMapper.insert(businessUserRelational); + // 返回 + return businessUserRelational.getId(); + } + + @Override + public void updateBusinessUserRelational(BusinessUserRelationalUpdateReqVO updateReqVO) { + // 校验存在 + validateBusinessUserRelationalExists(updateReqVO.getId()); + // 更新 + BusinessUserRelationalDO updateObj = BusinessUserRelationalConvert.INSTANCE.convert(updateReqVO); + businessUserRelationalMapper.updateById(updateObj); + } + + @Override + public void deleteBusinessUserRelational(Long id) { + // 校验存在 + validateBusinessUserRelationalExists(id); + // 删除 + businessUserRelationalMapper.deleteById(id); + } + + private void validateBusinessUserRelationalExists(Long id) { + if (businessUserRelationalMapper.selectById(id) == null) { + throw exception(BUSINESS_USER_RELATIONAL_NOT_EXISTS); + } + } + + @Override + public BusinessUserRelationalDO getBusinessUserRelational(Long id) { + return businessUserRelationalMapper.selectById(id); + } + + @Override + public List getBusinessUserRelationalList(Collection ids) { + return businessUserRelationalMapper.selectBatchIds(ids); + } + + @Override + public PageResult getBusinessUserRelationalPage(BusinessUserRelationalPageReqVO pageReqVO) { + return businessUserRelationalMapper.selectPage(pageReqVO); + } + + @Override + public List getBusinessUserRelationalList(BusinessUserRelationalExportReqVO exportReqVO) { + return businessUserRelationalMapper.selectList(exportReqVO); + } + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessenterpriserelational/BusinessEnterpriseRelationalMapper.xml b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessenterpriserelational/BusinessEnterpriseRelationalMapper.xml new file mode 100644 index 0000000..d02c4b0 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessenterpriserelational/BusinessEnterpriseRelationalMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml new file mode 100644 index 0000000..d44875e --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java new file mode 100644 index 0000000..b75f307 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java @@ -0,0 +1,167 @@ +package com.yunxi.scm.module.xxjj.service.businessenterpriserelational; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; + +import javax.annotation.Resource; + +import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest; + +import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO; +import com.yunxi.scm.module.xxjj.dal.mysql.businessenterpriserelational.BusinessEnterpriseRelationalMapper; +import com.yunxi.scm.framework.common.pojo.PageResult; + +import javax.annotation.Resource; +import org.springframework.context.annotation.Import; +import java.util.*; +import java.time.LocalDateTime; + +import static cn.hutool.core.util.RandomUtil.*; +import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; +import static com.yunxi.scm.framework.test.core.util.AssertUtils.*; +import static com.yunxi.scm.framework.test.core.util.RandomUtils.*; +import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*; +import static com.yunxi.scm.framework.common.util.object.ObjectUtils.*; +import static com.yunxi.scm.framework.common.util.date.DateUtils.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +/** + * {@link BusinessEnterpriseRelationalServiceImpl} 的单元测试类 + * + * @author 长江云息 + */ +@Import(BusinessEnterpriseRelationalServiceImpl.class) +public class BusinessEnterpriseRelationalServiceImplTest extends BaseDbUnitTest { + + @Resource + private BusinessEnterpriseRelationalServiceImpl businessEnterpriseRelationalService; + + @Resource + private BusinessEnterpriseRelationalMapper businessEnterpriseRelationalMapper; + + @Test + public void testCreateBusinessEnterpriseRelational_success() { + // 准备参数 + BusinessEnterpriseRelationalCreateReqVO reqVO = randomPojo(BusinessEnterpriseRelationalCreateReqVO.class); + + // 调用 + Long businessEnterpriseRelationalId = businessEnterpriseRelationalService.createBusinessEnterpriseRelational(reqVO); + // 断言 + assertNotNull(businessEnterpriseRelationalId); + // 校验记录的属性是否正确 + BusinessEnterpriseRelationalDO businessEnterpriseRelational = businessEnterpriseRelationalMapper.selectById(businessEnterpriseRelationalId); + assertPojoEquals(reqVO, businessEnterpriseRelational); + } + + @Test + public void testUpdateBusinessEnterpriseRelational_success() { + // mock 数据 + BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class); + businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational);// @Sql: 先插入出一条存在的数据 + // 准备参数 + BusinessEnterpriseRelationalUpdateReqVO reqVO = randomPojo(BusinessEnterpriseRelationalUpdateReqVO.class, o -> { + o.setId(dbBusinessEnterpriseRelational.getId()); // 设置更新的 ID + }); + + // 调用 + businessEnterpriseRelationalService.updateBusinessEnterpriseRelational(reqVO); + // 校验是否更新正确 + BusinessEnterpriseRelationalDO businessEnterpriseRelational = businessEnterpriseRelationalMapper.selectById(reqVO.getId()); // 获取最新的 + assertPojoEquals(reqVO, businessEnterpriseRelational); + } + + @Test + public void testUpdateBusinessEnterpriseRelational_notExists() { + // 准备参数 + BusinessEnterpriseRelationalUpdateReqVO reqVO = randomPojo(BusinessEnterpriseRelationalUpdateReqVO.class); + + // 调用, 并断言异常 + assertServiceException(() -> businessEnterpriseRelationalService.updateBusinessEnterpriseRelational(reqVO), BUSINESS_ENTERPRISE_RELATIONAL_NOT_EXISTS); + } + + @Test + public void testDeleteBusinessEnterpriseRelational_success() { + // mock 数据 + BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class); + businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational);// @Sql: 先插入出一条存在的数据 + // 准备参数 + Long id = dbBusinessEnterpriseRelational.getId(); + + // 调用 + businessEnterpriseRelationalService.deleteBusinessEnterpriseRelational(id); + // 校验数据不存在了 + assertNull(businessEnterpriseRelationalMapper.selectById(id)); + } + + @Test + public void testDeleteBusinessEnterpriseRelational_notExists() { + // 准备参数 + Long id = randomLongId(); + + // 调用, 并断言异常 + assertServiceException(() -> businessEnterpriseRelationalService.deleteBusinessEnterpriseRelational(id), BUSINESS_ENTERPRISE_RELATIONAL_NOT_EXISTS); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetBusinessEnterpriseRelationalPage() { + // mock 数据 + BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class, o -> { // 等会查询到 + o.setBusinessId(null); + o.setEnterpriseId(null); + o.setCreateTime(null); + }); + businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational); + // 测试 businessId 不匹配 + businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setBusinessId(null))); + // 测试 enterpriseId 不匹配 + businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setEnterpriseId(null))); + // 测试 createTime 不匹配 + businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setCreateTime(null))); + // 准备参数 + BusinessEnterpriseRelationalPageReqVO reqVO = new BusinessEnterpriseRelationalPageReqVO(); + reqVO.setBusinessId(null); + reqVO.setEnterpriseId(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + PageResult pageResult = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalPage(reqVO); + // 断言 + assertEquals(1, pageResult.getTotal()); + assertEquals(1, pageResult.getList().size()); + assertPojoEquals(dbBusinessEnterpriseRelational, pageResult.getList().get(0)); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetBusinessEnterpriseRelationalList() { + // mock 数据 + BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class, o -> { // 等会查询到 + o.setBusinessId(null); + o.setEnterpriseId(null); + o.setCreateTime(null); + }); + businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational); + // 测试 businessId 不匹配 + businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setBusinessId(null))); + // 测试 enterpriseId 不匹配 + businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setEnterpriseId(null))); + // 测试 createTime 不匹配 + businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setCreateTime(null))); + // 准备参数 + BusinessEnterpriseRelationalExportReqVO reqVO = new BusinessEnterpriseRelationalExportReqVO(); + reqVO.setBusinessId(null); + reqVO.setEnterpriseId(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + List list = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalList(reqVO); + // 断言 + assertEquals(1, list.size()); + assertPojoEquals(dbBusinessEnterpriseRelational, list.get(0)); + } + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java new file mode 100644 index 0000000..16e4e50 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java @@ -0,0 +1,167 @@ +package com.yunxi.scm.module.xxjj.service.businessuserrelational; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; + +import javax.annotation.Resource; + +import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest; + +import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; +import com.yunxi.scm.module.xxjj.dal.mysql.businessuserrelational.BusinessUserRelationalMapper; +import com.yunxi.scm.framework.common.pojo.PageResult; + +import javax.annotation.Resource; +import org.springframework.context.annotation.Import; +import java.util.*; +import java.time.LocalDateTime; + +import static cn.hutool.core.util.RandomUtil.*; +import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; +import static com.yunxi.scm.framework.test.core.util.AssertUtils.*; +import static com.yunxi.scm.framework.test.core.util.RandomUtils.*; +import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*; +import static com.yunxi.scm.framework.common.util.object.ObjectUtils.*; +import static com.yunxi.scm.framework.common.util.date.DateUtils.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +/** + * {@link BusinessUserRelationalServiceImpl} 的单元测试类 + * + * @author 长江云息 + */ +@Import(BusinessUserRelationalServiceImpl.class) +public class BusinessUserRelationalServiceImplTest extends BaseDbUnitTest { + + @Resource + private BusinessUserRelationalServiceImpl businessUserRelationalService; + + @Resource + private BusinessUserRelationalMapper businessUserRelationalMapper; + + @Test + public void testCreateBusinessUserRelational_success() { + // 准备参数 + BusinessUserRelationalCreateReqVO reqVO = randomPojo(BusinessUserRelationalCreateReqVO.class); + + // 调用 + Long businessUserRelationalId = businessUserRelationalService.createBusinessUserRelational(reqVO); + // 断言 + assertNotNull(businessUserRelationalId); + // 校验记录的属性是否正确 + BusinessUserRelationalDO businessUserRelational = businessUserRelationalMapper.selectById(businessUserRelationalId); + assertPojoEquals(reqVO, businessUserRelational); + } + + @Test + public void testUpdateBusinessUserRelational_success() { + // mock 数据 + BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class); + businessUserRelationalMapper.insert(dbBusinessUserRelational);// @Sql: 先插入出一条存在的数据 + // 准备参数 + BusinessUserRelationalUpdateReqVO reqVO = randomPojo(BusinessUserRelationalUpdateReqVO.class, o -> { + o.setId(dbBusinessUserRelational.getId()); // 设置更新的 ID + }); + + // 调用 + businessUserRelationalService.updateBusinessUserRelational(reqVO); + // 校验是否更新正确 + BusinessUserRelationalDO businessUserRelational = businessUserRelationalMapper.selectById(reqVO.getId()); // 获取最新的 + assertPojoEquals(reqVO, businessUserRelational); + } + + @Test + public void testUpdateBusinessUserRelational_notExists() { + // 准备参数 + BusinessUserRelationalUpdateReqVO reqVO = randomPojo(BusinessUserRelationalUpdateReqVO.class); + + // 调用, 并断言异常 + assertServiceException(() -> businessUserRelationalService.updateBusinessUserRelational(reqVO), BUSINESS_USER_RELATIONAL_NOT_EXISTS); + } + + @Test + public void testDeleteBusinessUserRelational_success() { + // mock 数据 + BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class); + businessUserRelationalMapper.insert(dbBusinessUserRelational);// @Sql: 先插入出一条存在的数据 + // 准备参数 + Long id = dbBusinessUserRelational.getId(); + + // 调用 + businessUserRelationalService.deleteBusinessUserRelational(id); + // 校验数据不存在了 + assertNull(businessUserRelationalMapper.selectById(id)); + } + + @Test + public void testDeleteBusinessUserRelational_notExists() { + // 准备参数 + Long id = randomLongId(); + + // 调用, 并断言异常 + assertServiceException(() -> businessUserRelationalService.deleteBusinessUserRelational(id), BUSINESS_USER_RELATIONAL_NOT_EXISTS); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetBusinessUserRelationalPage() { + // mock 数据 + BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class, o -> { // 等会查询到 + o.setBusinessId(null); + o.setUserId(null); + o.setCreateTime(null); + }); + businessUserRelationalMapper.insert(dbBusinessUserRelational); + // 测试 businessId 不匹配 + businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setBusinessId(null))); + // 测试 userId 不匹配 + businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setUserId(null))); + // 测试 createTime 不匹配 + businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setCreateTime(null))); + // 准备参数 + BusinessUserRelationalPageReqVO reqVO = new BusinessUserRelationalPageReqVO(); + reqVO.setBusinessId(null); + reqVO.setUserId(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + PageResult pageResult = businessUserRelationalService.getBusinessUserRelationalPage(reqVO); + // 断言 + assertEquals(1, pageResult.getTotal()); + assertEquals(1, pageResult.getList().size()); + assertPojoEquals(dbBusinessUserRelational, pageResult.getList().get(0)); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetBusinessUserRelationalList() { + // mock 数据 + BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class, o -> { // 等会查询到 + o.setBusinessId(null); + o.setUserId(null); + o.setCreateTime(null); + }); + businessUserRelationalMapper.insert(dbBusinessUserRelational); + // 测试 businessId 不匹配 + businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setBusinessId(null))); + // 测试 userId 不匹配 + businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setUserId(null))); + // 测试 createTime 不匹配 + businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setCreateTime(null))); + // 准备参数 + BusinessUserRelationalExportReqVO reqVO = new BusinessUserRelationalExportReqVO(); + reqVO.setBusinessId(null); + reqVO.setUserId(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + List list = businessUserRelationalService.getBusinessUserRelationalList(reqVO); + // 断言 + assertEquals(1, list.size()); + assertPojoEquals(dbBusinessUserRelational, list.get(0)); + } + +} From 505afe30a8112f5322dbdcb712f24dad816200e9 Mon Sep 17 00:00:00 2001 From: tengxi <971623072@qq.com> Date: Tue, 26 Sep 2023 17:18:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/system/enterprise/index.ts | 31 + yudao-ui-admin-vben-master/src/utils/dict.ts | 3 + .../enterprisebranching/EnterpriseModal.vue | 57 ++ .../enterprisebranching/enterprise.data.ts | 814 ++++++++++++++++++ .../views/xxjj/enterprisebranching/index.vue | 92 ++ .../system/enums/ErrorCodeConstants.java | 2 + .../enterprise/EnterpriseController.java | 26 +- .../admin/enterprise/vo/EnterpriseBaseVO.java | 25 +- .../enterprise/vo/EnterpriseCreateReqVO.java | 2 +- .../enterprise/vo/EnterpriseExcelVO.java | 23 +- .../enterprise/vo/EnterpriseExportReqVO.java | 20 +- .../enterprise/vo/EnterprisePageReqVO.java | 20 +- .../admin/enterprise/vo/EnterpriseRespVO.java | 2 +- .../enterprise/vo/EnterpriseUpdateReqVO.java | 2 +- .../convert/enterprise/EnterpriseConvert.java | 6 +- .../dataobject/enterprise/EnterpriseDO.java | 14 +- .../mysql/enterprise/EnterpriseMapper.java | 10 +- .../service/enterprise/EnterpriseService.java | 6 +- .../enterprise/EnterpriseServiceImpl.java | 12 +- .../Mapper/enterprise/EnterpriseMapper.xml | 12 + .../enterprise/EnterpriseServiceImplTest.java | 26 +- 21 files changed, 1136 insertions(+), 69 deletions(-) create mode 100644 yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts create mode 100644 yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue create mode 100644 yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts create mode 100644 yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/EnterpriseController.java (81%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseBaseVO.java (73%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java (98%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseExcelVO.java (75%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseExportReqVO.java (76%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterprisePageReqVO.java (76%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseRespVO.java (88%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java (98%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/convert/enterprise/EnterpriseConvert.java (77%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/dal/dataobject/enterprise/EnterpriseDO.java (94%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/dal/mysql/enterprise/EnterpriseMapper.java (87%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/service/enterprise/EnterpriseService.java (87%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/service/enterprise/EnterpriseServiceImpl.java (83%) create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system}/service/enterprise/EnterpriseServiceImplTest.java (93%) diff --git a/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts b/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts new file mode 100644 index 0000000..af8ddbe --- /dev/null +++ b/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts @@ -0,0 +1,31 @@ +import { defHttp } from '@/utils/http/axios' + +// 查询企业信息列表 +export function getEnterprisePage(params) { + return defHttp.get({ url: '/system/enterprise/page', params }) +} + +// 查询企业信息详情 +export function getEnterprise(id: number) { + return defHttp.get({ url: '/system/enterprise/get?id=' + id }) +} + +// 新增企业信息 +export function createEnterprise(data) { + return defHttp.post({ url: '/system/enterprise/create', data }) +} + +// 修改企业信息 +export function updateEnterprise(data) { + return defHttp.put({ url: '/system/enterprise/update', data }) +} + +// 删除企业信息 +export function deleteEnterprise(id: number) { + return defHttp.delete({ url: '/system/enterprise/delete?id=' + id }) +} + +// 导出企业信息 Excel +export function exportEnterprise(params) { + return defHttp.download({ url: '/system/enterprise/export-excel', params }, '企业信息.xls') +} diff --git a/yudao-ui-admin-vben-master/src/utils/dict.ts b/yudao-ui-admin-vben-master/src/utils/dict.ts index 7ebce2f..29c44cd 100644 --- a/yudao-ui-admin-vben-master/src/utils/dict.ts +++ b/yudao-ui-admin-vben-master/src/utils/dict.ts @@ -156,4 +156,7 @@ export enum DICT_TYPE { // ============= BUSINESSLINE 模块================= BUSINESS_TYPE = 'business_type', //业务线类型 DIFF_FLAG = 'diff_flag', + // ============= ENTERPRISEBRANCHING 模块================= + ENTERPRISE_TYPE = 'enterprise_type', //业务线类型 + } diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue new file mode 100644 index 0000000..6d02582 --- /dev/null +++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue @@ -0,0 +1,57 @@ + + diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts new file mode 100644 index 0000000..bcbb697 --- /dev/null +++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts @@ -0,0 +1,814 @@ +import { BasicColumn, FormSchema, useRender } from '@/components/Table' +import { DICT_TYPE, getDictOptions } from '@/utils/dict' + +export const columns: BasicColumn[] = [ + // { + // title: '编号', + // dataIndex: 'id', + // width: 160 + // }, + { + title: '企业名称', + dataIndex: 'name', + width: 160 + }, + { + title: '机构类型', + dataIndex: 'enterpriseType', + width: 180, + customRender: ({ text }) => { + return useRender.renderDict(text, DICT_TYPE.ENTERPRISE_TYPE) + } + }, + { + title: '关联子公司(没弄)', + dataIndex: '', + width: 160 + }, + { + title: '包含业务线(没弄)', + dataIndex: '', + width: 160 + }, + { + title: '关联员工(没弄)', + dataIndex: '', + width: 160 + }, + { + title: '首联系人', + dataIndex: 'firstConcat', + width: 160 + }, + { + title: '联系电话', + dataIndex: 'phone', + width: 160 + }, + { + title: '更新时间', + dataIndex: 'updateTime', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + // { + // title: '企业简称', + // dataIndex: 'shortName', + // width: 160 + // }, + // { + // title: '主体类型', + // dataIndex: 'mainType', + // width: 180, + // customRender: ({ text }) => { + // return useRender.renderDict(text, DICT_TYPE.MAIN_TYPE) + // } + // }, + // { + // title: '企业代码', + // dataIndex: 'code', + // width: 160 + // }, + // { + // title: '社会统一信息代码', + // dataIndex: 'societyCode', + // width: 160 + // }, + // { + // title: '办理人(0：法人 1：代办人)', + // dataIndex: 'transactors', + // width: 160 + // }, + // { + // title: '实际操作人(0：法人 1：代办人)', + // dataIndex: 'operator', + // width: 160 + // }, + // { + // title: '法人证件有效期类型(0：长期 1：非长期)', + // dataIndex: 'legalOperator', + // width: 160 + // }, + // { + // title: '代办人证件类型(0：身份证 1：护照)', + // dataIndex: 'commissionCertificateType', + // width: 160 + // }, + // { + // title: '代办人证件有效期类型(0：长期 1：非长期)', + // dataIndex: 'commissionOperator', + // width: 160 + // }, + // { + // title: '创建时间', + // dataIndex: 'createTime', + // width: 180, + // customRender: ({ text }) => { + // return useRender.renderDate(text) + // } + // }, + // { + // title: '企业id', + // dataIndex: 'parentId', + // width: 160 + // }, + +] + +export const searchFormSchema: FormSchema[] = [ + { + label: '企业名称', + field: 'name', + component: 'Input', + colProps: { span: 8 } + }, + // { + // label: '主体类型', + // field: 'mainType', + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.MAIN_TYPE) + // }, + // colProps: { span: 8 } + // }, + // { + // label: '企业代码', + // field: 'code', + // component: 'Input', + // colProps: { span: 8 } + // }, + // { + // label: '社会统一信息代码', + // field: 'societyCode', + // component: 'Input', + // colProps: { span: 8 } + // }, + // { + // label: '办理人(0：法人 1：代办人)', + // field: 'transactors', + // component: 'Input', + // colProps: { span: 8 } + // }, + // { + // label: '实际操作人(0：法人 1：代办人)', + // field: 'operator', + // component: 'Input', + // colProps: { span: 8 } + // }, + // { + // label: '法人证件有效期类型(0：长期 1：非长期)', + // field: 'legalOperator', + // component: 'Input', + // colProps: { span: 8 } + // }, + // { + // label: '代办人证件类型(0：身份证 1：护照)', + // field: 'commissionCertificateType', + // component: 'Select', + // componentProps: { + // options: [] + // }, + // colProps: { span: 8 } + // }, + // { + // label: '代办人证件有效期类型(0：长期 1：非长期)', + // field: 'commissionOperator', + // component: 'Input', + // colProps: { span: 8 } + // }, + // { + // label: '创建时间', + // field: 'createTime', + // component: 'RangePicker', + // colProps: { span: 8 } + // }, + // { + // label: '企业id', + // field: 'parentId', + // component: 'Input', + // colProps: { span: 8 } + // }, + // { + // label: '总公司，子公司机构类型', + // field: 'enterpriseType', + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.ENTERPRISE_TYPE) + // }, + // colProps: { span: 8 } + // }, +] + +export const createFormSchema: FormSchema[] = [ + { + label: '编号', + field: 'id', + show: false, + component: 'Input' + }, + { + label: '企业名称', + field: 'name', + required: true, + component: 'Input' + }, + // { + // label: '企业简称', + // field: 'shortName', + // component: 'Input' + // }, + // { + // label: '主体类型', + // field: 'mainType', + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.MAIN_TYPE, 'number') + // } + // }, + // { + // label: '所在城市', + // field: 'city', + // component: 'Input' + // }, + // { + // label: '行业类型', + // field: 'dutyType', + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number') + // } + // }, + { + label: '首联系人', + field: 'firstConcat', + component: 'Input' + }, + // { + // label: '职位', + // field: 'position', + // component: 'Input' + // }, + { + label: '手机号码', + field: 'phone', + component: 'Input' + }, + // { + // label: 'logo图片', + // field: 'logo', + // component: 'FileUpload', + // componentProps: { + // fileType: 'file', + // maxCount: 1 + // } + // }, + // { + // label: '地址', + // field: 'address', + // component: 'Input' + // }, + // { + // label: '企业电话', + // field: 'enterprisePhone', + // component: 'Input' + // }, + // { + // label: '企业传真', + // field: 'enterpriseFax', + // component: 'Input' + // }, + // { + // label: '企业网址', + // field: 'enterpriseWebsite', + // component: 'Input' + // }, + // { + // label: '企业简介', + // field: 'enterpriseRemark', + // component: 'InputTextArea' + // }, + // { + // label: '税号', + // field: 'dutyParagraph', + // component: 'Input' + // }, + // { + // label: '发票抬头', + // field: 'invoiceHeader', + // component: 'Input' + // }, + // { + // label: '开户银行', + // field: 'openBank', + // component: 'Input' + // }, + // { + // label: '银行卡号', + // field: 'bankAccount', + // component: 'Input' + // }, + // { + // label: '银行电话', + // field: 'bankPhone', + // component: 'Input' + // }, + // { + // label: '注册地址', + // field: 'registerAddress', + // component: 'Input' + // }, + // { + // label: '经营开始时间', + // field: 'startDate', + // component: 'DatePicker' + // }, + // { + // label: '经营结束时间', + // field: 'endDate', + // component: 'DatePicker' + // }, + // { + // label: '证件照', + // field: 'photo', + // component: 'FileUpload', + // componentProps: { + // fileType: 'file', + // maxCount: 1 + // } + // }, + // { + // label: '经营范围', + // field: 'businessScope', + // component: 'InputTextArea' + // }, + // { + // label: '邮箱', + // field: 'email', + // component: 'Input' + // }, + // { + // label: '法人证件照1', + // field: 'legalPersonPhoto1', + // component: 'FileUpload', + // componentProps: { + // fileType: 'file', + // maxCount: 1 + // } + // }, + // { + // label: '法人证件照2', + // field: 'legalPersonPhoto2', + // component: 'FileUpload', + // componentProps: { + // fileType: 'file', + // maxCount: 1 + // } + // }, + // { + // label: '法人证件照3', + // field: 'legalPersonPhoto3', + // component: 'FileUpload', + // componentProps: { + // fileType: 'file', + // maxCount: 1 + // } + // }, + // { + // label: '法人证件类型(0：身份证 1：护照)', + // field: 'legalCertificateType', + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.CERTIFICATE_TYPE, 'number') + // } + // }, + // { + // label: '法人姓名', + // field: 'legalPersonName', + // component: 'Input' + // }, + // { + // label: '法人证件号', + // field: 'legalCardNo', + // component: 'Input' + // }, + // { + // label: '法人生日', + // field: 'legalBirthday', + // component: 'Input' + // }, + // { + // label: '法人证件有效开始时间', + // field: 'legalCardStart', + // component: 'DatePicker' + // }, + // { + // label: '法人证件有效结束时间', + // field: 'legalCardEnd', + // component: 'DatePicker' + // }, + // { + // label: '代办人证件照1', + // field: 'commissionPersonPhoto1', + // component: 'FileUpload', + // componentProps: { + // fileType: 'file', + // maxCount: 1 + // } + // }, + // { + // label: '代办人证件照2', + // field: 'commissionPersonPhoto2', + // component: 'FileUpload', + // componentProps: { + // fileType: 'file', + // maxCount: 1 + // } + // }, + // { + // label: '代办人证件照3', + // field: 'commissionPersonPhoto3', + // component: 'FileUpload', + // componentProps: { + // fileType: 'file', + // maxCount: 1 + // } + // }, + // { + // label: '代办人证件照4', + // field: 'commissionPersonPhoto4', + // component: 'FileUpload', + // componentProps: { + // fileType: 'file', + // maxCount: 1 + // } + // }, + // { + // label: '代办人姓名', + // field: 'commissionPersonName', + // component: 'Input' + // }, + // { + // label: '代办人证件号', + // field: 'commissionCardNo', + // component: 'Input' + // }, + // { + // label: '代办人生日', + // field: 'commissionBirthday', + // component: 'Input' + // }, + // { + // label: '代办人证件有效开始时间', + // field: 'commissionCardStart', + // component: 'DatePicker' + // }, + // { + // label: '代办人证件有效结束时间', + // field: 'commissionCardEnd', + // component: 'DatePicker' + // }, + { + label: '描述', + field: 'description', + component: 'InputTextArea' + }, + // { + // label: '企业代码', + // field: 'code', + // component: 'Input' + // }, + // { + // label: '社会统一信息代码', + // field: 'societyCode', + // component: 'Input' + // }, + // { + // label: '办理人(0：法人 1：代办人)', + // field: 'transactors', + // component: 'Input' + // }, + // { + // label: '实际操作人(0：法人 1：代办人)', + // field: 'operator', + // component: 'Input' + // }, + // { + // label: '法人证件有效期类型(0：长期 1：非长期)', + // field: 'legalOperator', + // component: 'Input' + // }, + // { + // label: '代办人证件类型(0：身份证 1：护照)', + // field: 'commissionCertificateType', + // component: 'Select', + // componentProps: { + // options:[] + // } + // }, + // { + // label: '代办人证件有效期类型(0：长期 1：非长期)', + // field: 'commissionOperator', + // component: 'Input' + // }, + { + label: '企业id', + field: 'parentId', + component: 'Input' + }, + { + label: '上级机构', + field: 'enterpriseType', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.ENTERPRISE_TYPE, 'number') + } + }, +] + +export const updateFormSchema: FormSchema[] = [ + // { + // label: '编号', + // field: 'id', + // show: false, + // component: 'Input' + // }, + { + label: '企业名称', + field: 'name', + required: true, + component: 'Input' + }, + { + label: '企业id', + field: 'parentId', + component: 'Input' + }, + { + label: '首联系人', + field: 'firstConcat', + component: 'Input' + }, + { + label: '手机号码', + field: 'phone', + component: 'Input' + }, + { + label: '机构描述', + field: 'description', + component: 'InputTextArea' + }, + // { + // label: '企业简称', + // field: 'shortName', + // component: 'Input' + // }, + // { + // label: '主体类型', + // field: 'mainType', + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.MAIN_TYPE, 'number') + // } + // }, + // { + // label: '所在城市', + // field: 'city', + // component: 'Input' + // }, + // { + // label: '行业类型', + // field: 'dutyType', + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number') + // } + // }, + + // { + // label: 'logo图片', + // field: 'logo', + // component: 'Upload' + // }, + // { + // label: '地址', + // field: 'address', + // component: 'Input' + // }, + // { + // label: '企业电话', + // field: 'enterprisePhone', + // component: 'Input' + // }, + // { + // label: '企业传真', + // field: 'enterpriseFax', + // component: 'Input' + // }, + // { + // label: '企业网址', + // field: 'enterpriseWebsite', + // component: 'Input' + // }, + // { + // label: '企业简介', + // field: 'enterpriseRemark', + // component: 'InputTextArea' + // }, + // { + // label: '税号', + // field: 'dutyParagraph', + // component: 'Input' + // }, + // { + // label: '发票抬头', + // field: 'invoiceHeader', + // component: 'Input' + // }, + // { + // label: '开户银行', + // field: 'openBank', + // component: 'Input' + // }, + // { + // label: '银行卡号', + // field: 'bankAccount', + // component: 'Input' + // }, + // { + // label: '银行电话', + // field: 'bankPhone', + // component: 'Input' + // }, + // { + // label: '注册地址', + // field: 'registerAddress', + // component: 'Input' + // }, + // { + // label: '经营开始时间', + // field: 'startDate', + // component: 'DatePicker' + // }, + // { + // label: '经营结束时间', + // field: 'endDate', + // component: 'DatePicker' + // }, + // { + // label: '证件照', + // field: 'photo', + // component: 'Upload' + // }, + // { + // label: '经营范围', + // field: 'businessScope', + // component: 'InputTextArea' + // }, + // { + // label: '邮箱', + // field: 'email', + // component: 'Input' + // }, + // { + // label: '法人证件照1', + // field: 'legalPersonPhoto1', + // component: 'Upload' + // }, + // { + // label: '法人证件照2', + // field: 'legalPersonPhoto2', + // component: 'Upload' + // }, + // { + // label: '法人证件照3', + // field: 'legalPersonPhoto3', + // component: 'Upload' + // }, + // { + // label: '法人证件类型(0：身份证 1：护照)', + // field: 'legalCertificateType', + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.CERTIFICATE_TYPE, 'number') + // } + // }, + // { + // label: '法人姓名', + // field: 'legalPersonName', + // component: 'Input' + // }, + // { + // label: '法人证件号', + // field: 'legalCardNo', + // component: 'Input' + // }, + // { + // label: '法人生日', + // field: 'legalBirthday', + // component: 'Input' + // }, + // { + // label: '法人证件有效开始时间', + // field: 'legalCardStart', + // component: 'DatePicker' + // }, + // { + // label: '法人证件有效结束时间', + // field: 'legalCardEnd', + // component: 'DatePicker' + // }, + // { + // label: '代办人证件照1', + // field: 'commissionPersonPhoto1', + // component: 'Upload' + // }, + // { + // label: '代办人证件照2', + // field: 'commissionPersonPhoto2', + // component: 'Upload' + // }, + // { + // label: '代办人证件照3', + // field: 'commissionPersonPhoto3', + // component: 'Upload' + // }, + // { + // label: '代办人证件照4', + // field: 'commissionPersonPhoto4', + // component: 'Upload' + // }, + // { + // label: '代办人姓名', + // field: 'commissionPersonName', + // component: 'Input' + // }, + // { + // label: '代办人证件号', + // field: 'commissionCardNo', + // component: 'Input' + // }, + // { + // label: '代办人生日', + // field: 'commissionBirthday', + // component: 'Input' + // }, + // { + // label: '代办人证件有效开始时间', + // field: 'commissionCardStart', + // component: 'DatePicker' + // }, + // { + // label: '代办人证件有效结束时间', + // field: 'commissionCardEnd', + // component: 'DatePicker' + // }, + // { + // label: '企业代码', + // field: 'code', + // component: 'Input' + // }, + // { + // label: '社会统一信息代码', + // field: 'societyCode', + // component: 'Input' + // }, + // { + // label: '办理人(0：法人 1：代办人)', + // field: 'transactors', + // component: 'Input' + // }, + // { + // label: '实际操作人(0：法人 1：代办人)', + // field: 'operator', + // component: 'Input' + // }, + // { + // label: '法人证件有效期类型(0：长期 1：非长期)', + // field: 'legalOperator', + // component: 'Input' + // }, + // { + // label: '代办人证件类型(0：身份证 1：护照)', + // field: 'commissionCertificateType', + // component: 'Select', + // componentProps: { + // options:[] + // } + // }, + // { + // label: '代办人证件有效期类型(0：长期 1：非长期)', + // field: 'commissionOperator', + // component: 'Input' + // }, + // { + // label: '总公司，子公司机构类型', + // field: 'enterpriseType', + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.ENTERPRISE_TYPE, 'number') + // } + // }, +] diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue new file mode 100644 index 0000000..b4ad6ba --- /dev/null +++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue @@ -0,0 +1,92 @@ + + diff --git a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java index 7af04b7..77b849f 100644 --- a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java +++ b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java @@ -163,4 +163,6 @@ public interface ErrorCodeConstants { // ========== 站内信发送 1002028000 ========== ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002028000, "模板参数({})缺失"); + // ========== 企业信息 TODO 补充编号 ========== + ErrorCode ENTERPRISE_NOT_EXISTS = new ErrorCode(1002004015, "企业信息不存在"); } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/EnterpriseController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java similarity index 81% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/EnterpriseController.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java index 2cee7bf..cc1b3a9 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/EnterpriseController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.enterprise; +package com.yunxi.scm.module.system.controller.admin.enterprise; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -23,14 +23,14 @@ import com.yunxi.scm.framework.excel.core.util.ExcelUtils; import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*; -import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO; -import com.yunxi.scm.module.xxjj.convert.enterprise.EnterpriseConvert; -import com.yunxi.scm.module.xxjj.service.enterprise.EnterpriseService; +import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; +import com.yunxi.scm.module.system.convert.enterprise.EnterpriseConvert; +import com.yunxi.scm.module.system.service.enterprise.EnterpriseService; @Tag(name = "管理后台 - 企业信息") @RestController -@RequestMapping("/xxjj/enterprise") +@RequestMapping("/system/enterprise") @Validated public class EnterpriseController { @@ -39,14 +39,14 @@ public class EnterpriseController { @PostMapping("/create") @Operation(summary = "创建企业信息") - @PreAuthorize("@ss.hasPermission('xxjj:enterprise:create')") + @PreAuthorize("@ss.hasPermission('system:enterprise:create')") public CommonResult createEnterprise(@Valid @RequestBody EnterpriseCreateReqVO createReqVO) { return success(enterpriseService.createEnterprise(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新企业信息") - @PreAuthorize("@ss.hasPermission('xxjj:enterprise:update')") + @PreAuthorize("@ss.hasPermission('system:enterprise:update')") public CommonResult updateEnterprise(@Valid @RequestBody EnterpriseUpdateReqVO updateReqVO) { enterpriseService.updateEnterprise(updateReqVO); return success(true); @@ -55,7 +55,7 @@ public class EnterpriseController { @DeleteMapping("/delete") @Operation(summary = "删除企业信息") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('xxjj:enterprise:delete')") + @PreAuthorize("@ss.hasPermission('system:enterprise:delete')") public CommonResult deleteEnterprise(@RequestParam("id") Long id) { enterpriseService.deleteEnterprise(id); return success(true); @@ -64,7 +64,7 @@ public class EnterpriseController { @GetMapping("/get") @Operation(summary = "获得企业信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('xxjj:enterprise:query')") + @PreAuthorize("@ss.hasPermission('system:enterprise:query')") public CommonResult getEnterprise(@RequestParam("id") Long id) { EnterpriseDO enterprise = enterpriseService.getEnterprise(id); return success(EnterpriseConvert.INSTANCE.convert(enterprise)); @@ -73,7 +73,7 @@ public class EnterpriseController { @GetMapping("/list") @Operation(summary = "获得企业信息列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('xxjj:enterprise:query')") + @PreAuthorize("@ss.hasPermission('system:enterprise:query')") public CommonResult> getEnterpriseList(@RequestParam("ids") Collection ids) { List list = enterpriseService.getEnterpriseList(ids); return success(EnterpriseConvert.INSTANCE.convertList(list)); @@ -81,7 +81,7 @@ public class EnterpriseController { @GetMapping("/page") @Operation(summary = "获得企业信息分页") - @PreAuthorize("@ss.hasPermission('xxjj:enterprise:query')") + @PreAuthorize("@ss.hasPermission('system:enterprise:query')") public CommonResult> getEnterprisePage(@Valid EnterprisePageReqVO pageVO) { PageResult pageResult = enterpriseService.getEnterprisePage(pageVO); return success(EnterpriseConvert.INSTANCE.convertPage(pageResult)); @@ -89,7 +89,7 @@ public class EnterpriseController { @GetMapping("/export-excel") @Operation(summary = "导出企业信息 Excel") - @PreAuthorize("@ss.hasPermission('xxjj:enterprise:export')") + @PreAuthorize("@ss.hasPermission('system:enterprise:export')") @OperateLog(type = EXPORT) public void exportEnterpriseExcel(@Valid EnterpriseExportReqVO exportReqVO, HttpServletResponse response) throws IOException { diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java similarity index 73% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseBaseVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java index b4df461..e814adb 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseBaseVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java @@ -1,7 +1,9 @@ -package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo; +package com.yunxi.scm.module.system.controller.admin.enterprise.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; + import java.util.*; import java.time.LocalDateTime; import java.time.LocalDateTime; @@ -15,6 +17,8 @@ import java.time.LocalDateTime; import java.time.LocalDateTime; import javax.validation.constraints.*; +import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + /** * 企业信息 Base VO，提供给添加、修改、详细的子 VO 使用 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 @@ -53,10 +57,23 @@ public class EnterpriseBaseVO { @Schema(description = "代办人证件有效期类型(0：长期 1：非长期)") private String commissionOperator; - @Schema(description = "企业id", example = "9306") - private Long enterpriseId; - @Schema(description = "总公司，子公司机构类型", example = "1") private String enterpriseType; + @Schema(description = "企业父id", example = "26924") + private Long parentId; + + @Schema(description = "更新时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime updateTime; + + @Schema(description = "首联系人") + private String firstConcat; + + @Schema(description = "联系电话") + private String phone; + + @Schema(description = "描述") + private String description; + } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java similarity index 98% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java index 5fa1861..0c0bbd9 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo; +package com.yunxi.scm.module.system.controller.admin.enterprise.vo; import lombok.*; import java.util.*; diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExcelVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExcelVO.java similarity index 75% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExcelVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExcelVO.java index dfd1e98..e86fc37 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExcelVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExcelVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo; +package com.yunxi.scm.module.system.controller.admin.enterprise.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -17,6 +17,9 @@ import java.time.LocalDateTime; import com.alibaba.excel.annotation.ExcelProperty; import com.yunxi.scm.framework.excel.core.annotations.DictFormat; import com.yunxi.scm.framework.excel.core.convert.DictConvert; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** @@ -64,11 +67,23 @@ public class EnterpriseExcelVO { @ExcelProperty("创建时间") private LocalDateTime createTime; - @ExcelProperty("企业id") - private Long enterpriseId; - @ExcelProperty(value = "总公司，子公司机构类型", converter = DictConvert.class) @DictFormat("enterprise_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String enterpriseType; + @ExcelProperty("企业父id") + private Long parentId; + + @Schema(description = "更新时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime updateTime; + + @Schema(description = "首联系人") + private String firstConcat; + + @Schema(description = "联系电话") + private String phone; + + @Schema(description = "描述") + private String description; } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java similarity index 76% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExportReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java index 4a86650..9938961 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExportReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo; +package com.yunxi.scm.module.system.controller.admin.enterprise.vo; import lombok.*; import java.util.*; @@ -44,10 +44,22 @@ public class EnterpriseExportReqVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "企业id", example = "9306") - private Long enterpriseId; - @Schema(description = "总公司，子公司机构类型", example = "1") private String enterpriseType; + @Schema(description = "企业父id", example = "26924") + private Long parentId; + + @Schema(description = "更新时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime updateTime; + + @Schema(description = "首联系人") + private String firstConcat; + + @Schema(description = "联系电话") + private String phone; + + @Schema(description = "描述") + private String description; } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterprisePageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java similarity index 76% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterprisePageReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java index 4b35989..bf19109 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterprisePageReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo; +package com.yunxi.scm.module.system.controller.admin.enterprise.vo; import lombok.*; import java.util.*; @@ -46,10 +46,22 @@ public class EnterprisePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "企业id", example = "9306") - private Long enterpriseId; - @Schema(description = "总公司，子公司机构类型", example = "1") private String enterpriseType; + @Schema(description = "企业父id", example = "26924") + private Long parentId; + + @Schema(description = "更新时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime updateTime; + + @Schema(description = "首联系人") + private String firstConcat; + + @Schema(description = "联系电话") + private String phone; + + @Schema(description = "描述") + private String description; } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java similarity index 88% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseRespVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java index bd6f589..5dcd1d6 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseRespVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo; +package com.yunxi.scm.module.system.controller.admin.enterprise.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java similarity index 98% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java index 97e1a99..32ac970 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo; +package com.yunxi.scm.module.system.controller.admin.enterprise.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/enterprise/EnterpriseConvert.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/enterprise/EnterpriseConvert.java similarity index 77% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/enterprise/EnterpriseConvert.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/enterprise/EnterpriseConvert.java index 9e7d469..73fa3a8 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/enterprise/EnterpriseConvert.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/enterprise/EnterpriseConvert.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.convert.enterprise; +package com.yunxi.scm.module.system.convert.enterprise; import java.util.*; @@ -6,8 +6,8 @@ import com.yunxi.scm.framework.common.pojo.PageResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO; +import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; /** * 企业信息 Convert diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/enterprise/EnterpriseDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java similarity index 94% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/enterprise/EnterpriseDO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java index 7758ebe..f58a1fb 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/enterprise/EnterpriseDO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.dal.dataobject.enterprise; +package com.yunxi.scm.module.system.dal.dataobject.enterprise; import lombok.*; import java.util.*; @@ -20,8 +20,8 @@ import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO; * * @author 长江云息 */ -@TableName("xxjj_enterprise") -@KeySequence("xxjj_enterprise_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("system_enterprise") +@KeySequence("system_enterprise_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -245,15 +245,15 @@ public class EnterpriseDO extends BaseDO { * 代办人证件有效期类型(0：长期 1：非长期) */ private String commissionOperator; - /** - * 企业id - */ - private Long enterpriseId; /** * 总公司，子公司机构类型 * * 枚举 {@link TODO enterprise_type 对应的类} */ private String enterpriseType; + /** + * 企业父id + */ + private Long parentId; } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/enterprise/EnterpriseMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/enterprise/EnterpriseMapper.java similarity index 87% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/enterprise/EnterpriseMapper.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/enterprise/EnterpriseMapper.java index d80106d..4778927 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/enterprise/EnterpriseMapper.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/enterprise/EnterpriseMapper.java @@ -1,13 +1,13 @@ -package com.yunxi.scm.module.xxjj.dal.mysql.enterprise; +package com.yunxi.scm.module.system.dal.mysql.enterprise; import java.util.*; import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX; import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; -import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO; +import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; import org.apache.ibatis.annotations.Mapper; -import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*; +import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*; /** * 企业信息 Mapper @@ -29,8 +29,8 @@ public interface EnterpriseMapper extends BaseMapperX { .eqIfPresent(EnterpriseDO::getCommissionCertificateType, reqVO.getCommissionCertificateType()) .eqIfPresent(EnterpriseDO::getCommissionOperator, reqVO.getCommissionOperator()) .betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(EnterpriseDO::getEnterpriseId, reqVO.getEnterpriseId()) .eqIfPresent(EnterpriseDO::getEnterpriseType, reqVO.getEnterpriseType()) + .eqIfPresent(EnterpriseDO::getParentId, reqVO.getParentId()) .orderByDesc(EnterpriseDO::getId)); } @@ -46,8 +46,8 @@ public interface EnterpriseMapper extends BaseMapperX { .eqIfPresent(EnterpriseDO::getCommissionCertificateType, reqVO.getCommissionCertificateType()) .eqIfPresent(EnterpriseDO::getCommissionOperator, reqVO.getCommissionOperator()) .betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(EnterpriseDO::getEnterpriseId, reqVO.getEnterpriseId()) .eqIfPresent(EnterpriseDO::getEnterpriseType, reqVO.getEnterpriseType()) + .eqIfPresent(EnterpriseDO::getParentId, reqVO.getParentId()) .orderByDesc(EnterpriseDO::getId)); } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java similarity index 87% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseService.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java index 131a98c..300512f 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseService.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java @@ -1,9 +1,9 @@ -package com.yunxi.scm.module.xxjj.service.enterprise; +package com.yunxi.scm.module.system.service.enterprise; import java.util.*; import javax.validation.*; -import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO; +import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; import com.yunxi.scm.framework.common.pojo.PageResult; /** diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java similarity index 83% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImpl.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java index 2883b2a..65b5b31 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java @@ -1,19 +1,19 @@ -package com.yunxi.scm.module.xxjj.service.enterprise; +package com.yunxi.scm.module.system.service.enterprise; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import java.util.*; -import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO; +import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; import com.yunxi.scm.framework.common.pojo.PageResult; -import com.yunxi.scm.module.xxjj.convert.enterprise.EnterpriseConvert; -import com.yunxi.scm.module.xxjj.dal.mysql.enterprise.EnterpriseMapper; +import com.yunxi.scm.module.system.convert.enterprise.EnterpriseConvert; +import com.yunxi.scm.module.system.dal.mysql.enterprise.EnterpriseMapper; import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; +import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*; /** * 企业信息 Service 实现类 diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml new file mode 100644 index 0000000..e170329 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImplTest.java b/yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImplTest.java similarity index 93% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImplTest.java rename to yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImplTest.java index 7305bfc..3f40fc8 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImplTest.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImplTest.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.service.enterprise; +package com.yunxi.scm.module.system.service.enterprise; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -8,9 +8,9 @@ import javax.annotation.Resource; import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest; -import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO; -import com.yunxi.scm.module.xxjj.dal.mysql.enterprise.EnterpriseMapper; +import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; +import com.yunxi.scm.module.system.dal.mysql.enterprise.EnterpriseMapper; import com.yunxi.scm.framework.common.pojo.PageResult; import javax.annotation.Resource; @@ -19,7 +19,7 @@ import java.util.*; import java.time.LocalDateTime; import static cn.hutool.core.util.RandomUtil.*; -import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; +import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*; import static com.yunxi.scm.framework.test.core.util.AssertUtils.*; import static com.yunxi.scm.framework.test.core.util.RandomUtils.*; import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*; @@ -120,8 +120,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest { o.setCommissionCertificateType(null); o.setCommissionOperator(null); o.setCreateTime(null); - o.setEnterpriseId(null); o.setEnterpriseType(null); + o.setParentId(null); }); enterpriseMapper.insert(dbEnterprise); // 测试 name 不匹配 @@ -144,10 +144,10 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest { enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCommissionOperator(null))); // 测试 createTime 不匹配 enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCreateTime(null))); - // 测试 enterpriseId 不匹配 - enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseId(null))); // 测试 enterpriseType 不匹配 enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseType(null))); + // 测试 parentId 不匹配 + enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setParentId(null))); // 准备参数 EnterprisePageReqVO reqVO = new EnterprisePageReqVO(); reqVO.setName(null); @@ -160,8 +160,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest { reqVO.setCommissionCertificateType(null); reqVO.setCommissionOperator(null); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - reqVO.setEnterpriseId(null); reqVO.setEnterpriseType(null); + reqVO.setParentId(null); // 调用 PageResult pageResult = enterpriseService.getEnterprisePage(reqVO); @@ -186,8 +186,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest { o.setCommissionCertificateType(null); o.setCommissionOperator(null); o.setCreateTime(null); - o.setEnterpriseId(null); o.setEnterpriseType(null); + o.setParentId(null); }); enterpriseMapper.insert(dbEnterprise); // 测试 name 不匹配 @@ -210,10 +210,10 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest { enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCommissionOperator(null))); // 测试 createTime 不匹配 enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCreateTime(null))); - // 测试 enterpriseId 不匹配 - enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseId(null))); // 测试 enterpriseType 不匹配 enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseType(null))); + // 测试 parentId 不匹配 + enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setParentId(null))); // 准备参数 EnterpriseExportReqVO reqVO = new EnterpriseExportReqVO(); reqVO.setName(null); @@ -226,8 +226,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest { reqVO.setCommissionCertificateType(null); reqVO.setCommissionOperator(null); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - reqVO.setEnterpriseId(null); reqVO.setEnterpriseType(null); + reqVO.setParentId(null); // 调用 List list = enterpriseService.getEnterpriseList(reqVO); From 7c77ddcfa6eae8237148514b5b0246148e14413f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Tue, 26 Sep 2023 17:19:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=E6=94=BE?= =?UTF-8?q?=E5=88=B0=E7=B3=BB=E7=BB=9F=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/xxjj/businessWarehouse/index.ts | 10 +- .../businessWarehouse.data.ts | 181 ++++-------------- .../system/enums/ErrorCodeConstants.java | 3 + .../BusinessWarehouseController.java | 44 ++--- .../vo/BusinessWarehouseBaseVO.java | 27 +-- .../vo/BusinessWarehouseCreateReqVO.java | 4 +- .../vo/BusinessWarehouseExcelVO.java | 20 +- .../vo/BusinessWarehouseExportReqVO.java | 22 +-- .../vo/BusinessWarehousePageReqVO.java | 22 +-- .../vo/BusinessWarehouseRespVO.java | 6 +- .../vo/BusinessWarehouseUpdateReqVO.java | 6 +- .../BusinessWarehouseConvert.java | 8 +- .../BusinessWarehouseDO.java | 27 +-- .../BusinessWarehouseMapper.java | 10 +- .../BusinessWarehouseService.java | 30 +-- .../BusinessWarehouseServiceImpl.java | 14 +- .../BusinessWarehouseMapper.xml | 2 +- .../BusinessWarehouseServiceImplTest.java | 55 ++++-- ...usinessEnterpriseRelationalController.java | 102 ---------- .../BusinessEnterpriseRelationalBaseVO.java | 25 --- ...sinessEnterpriseRelationalCreateReqVO.java | 14 -- .../BusinessEnterpriseRelationalExcelVO.java | 31 --- ...sinessEnterpriseRelationalExportReqVO.java | 26 --- ...BusinessEnterpriseRelationalPageReqVO.java | 28 --- .../BusinessEnterpriseRelationalRespVO.java | 19 -- ...sinessEnterpriseRelationalUpdateReqVO.java | 18 -- .../BusinessUserRelationalController.java | 102 ---------- .../vo/BusinessUserRelationalBaseVO.java | 25 --- .../vo/BusinessUserRelationalCreateReqVO.java | 14 -- .../vo/BusinessUserRelationalExcelVO.java | 31 --- .../vo/BusinessUserRelationalExportReqVO.java | 26 --- .../vo/BusinessUserRelationalPageReqVO.java | 28 --- .../vo/BusinessUserRelationalRespVO.java | 19 -- .../vo/BusinessUserRelationalUpdateReqVO.java | 18 -- .../BusinessEnterpriseRelationalConvert.java | 34 ---- .../BusinessUserRelationalConvert.java | 34 ---- .../BusinessEnterpriseRelationalDO.java | 39 ---- .../BusinessUserRelationalDO.java | 39 ---- .../BusinessEnterpriseRelationalMapper.java | 36 ---- .../BusinessUserRelationalMapper.java | 36 ---- .../BusinessEnterpriseRelationalService.java | 70 ------- ...sinessEnterpriseRelationalServiceImpl.java | 82 -------- .../BusinessUserRelationalService.java | 70 ------- .../BusinessUserRelationalServiceImpl.java | 82 -------- .../BusinessEnterpriseRelationalMapper.xml | 12 -- .../BusinessUserRelationalMapper.xml | 12 -- ...ssEnterpriseRelationalServiceImplTest.java | 167 ---------------- ...BusinessUserRelationalServiceImplTest.java | 167 ---------------- 48 files changed, 209 insertions(+), 1688 deletions(-) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/businesswarehouse/BusinessWarehouseController.java (70%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java (69%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java (65%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java (70%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java (76%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java (78%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java (71%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java (69%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/convert/businesswarehouse/BusinessWarehouseConvert.java (75%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java (74%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java (90%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/service/businesswarehouse/BusinessWarehouseService.java (63%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/service/businesswarehouse/BusinessWarehouseServiceImpl.java (82%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper => yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup}/businesswarehouse/BusinessWarehouseMapper.xml (84%) rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system}/service/businesswarehouse/BusinessWarehouseServiceImplTest.java (87%) delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/BusinessEnterpriseRelationalController.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalBaseVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalCreateReqVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExcelVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExportReqVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalPageReqVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalRespVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalUpdateReqVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/BusinessUserRelationalController.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalBaseVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalCreateReqVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExcelVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExportReqVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalPageReqVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalRespVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalUpdateReqVO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessenterpriserelational/BusinessEnterpriseRelationalConvert.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessuserrelational/BusinessUserRelationalConvert.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessenterpriserelational/BusinessEnterpriseRelationalDO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessuserrelational/BusinessUserRelationalDO.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessenterpriserelational/BusinessEnterpriseRelationalMapper.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessuserrelational/BusinessUserRelationalMapper.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalService.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImpl.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalService.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImpl.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessenterpriserelational/BusinessEnterpriseRelationalMapper.xml delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java delete mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java diff --git a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts index b0f89e5..f77ab45 100644 --- a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts +++ b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts @@ -2,27 +2,27 @@ import { defHttp } from '@/utils/http/axios' // 查询业务线/仓库列表 export function getBusinessWarehousePage(params) { - return defHttp.get({ url: '/xxjj/business-warehouse/page', params }) + return defHttp.get({ url: '/system/business-warehouse/page', params }) } // 查询业务线/仓库详情 export function getBusinessWarehouse(id: number) { - return defHttp.get({ url: '/xxjj/business-warehouse/get?id=' + id }) + return defHttp.get({ url: '/system/business-warehouse/get?id=' + id }) } // 新增业务线/仓库 export function createBusinessWarehouse(data) { - return defHttp.post({ url: '/xxjj/business-warehouse/create', data }) + return defHttp.post({ url: '/system/business-warehouse/create', data }) } // 修改业务线/仓库 export function updateBusinessWarehouse(data) { - return defHttp.put({ url: '/xxjj/business-warehouse/update', data }) + return defHttp.put({ url: '/system/business-warehouse/update', data }) } // 删除业务线/仓库 export function deleteBusinessWarehouse(id: number) { - return defHttp.delete({ url: '/xxjj/business-warehouse/delete?id=' + id }) + return defHttp.delete({ url: '/system/business-warehouse/delete?id=' + id }) } // 导出业务线/仓库 Excel diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts index 75844d3..1e2ea6d 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts @@ -2,59 +2,11 @@ import { BasicColumn, FormSchema, useRender } from '@/components/Table' import { DICT_TYPE, getDictOptions } from '@/utils/dict' export const columns: BasicColumn[] = [ - { - title: '业务id', - dataIndex: 'id', - width: 160 - }, - { - title: '业务线编号', - dataIndex: 'businessCode', - width: 160 - }, - { - title: '业务线简称', - dataIndex: 'businessSimple', - width: 160 - }, - { - title: '传真', - dataIndex: 'fax', - width: 160 - }, - { - title: '网址', - dataIndex: 'url', - width: 160 - }, - { - title: '介绍', - dataIndex: 'description', - width: 160 - }, - { - title: '创建时间', - dataIndex: 'createTime', - width: 180, - customRender: ({ text }) => { - return useRender.renderDate(text) - } - }, { title: '业务线名称', dataIndex: 'name', width: 160 }, - { - title: '业务线LOGO', - dataIndex: 'businessLogo', - width: 160 - }, - { - title: '父id', - dataIndex: 'parentId', - width: 160 - }, { title: '类型', dataIndex: 'type', @@ -64,87 +16,44 @@ export const columns: BasicColumn[] = [ } }, { - title: '所属行业', - dataIndex: 'industry', + title: '状态', + dataIndex: 'type', width: 180, customRender: ({ text }) => { - return useRender.renderDict(text, DICT_TYPE.DUTY_TYPE) + return useRender.renderDict(text, DICT_TYPE.CLASS_STATUS) } }, { - title: '所在城市', - dataIndex: 'city', + title: '关联机构', + dataIndex: 'institutionNum', width: 160 }, { - title: '成立时间', - dataIndex: 'establishDate', - width: 180, - customRender: ({ text }) => { - return useRender.renderDate(text) - } - }, - { - title: '归属人员', - dataIndex: 'belongUserId', + title: '成员数量', + dataIndex: 'employeeNum', width: 160 }, { - title: '品牌/业务线/事业群名称', - dataIndex: 'brandName', + title: '主管人员', + dataIndex: 'belongUserId', width: 160 }, { - title: '电话', - dataIndex: 'phone', + title: '介绍', + dataIndex: 'description', width: 160 }, { - title: '业务线仓库区分(0：业务线,1：仓库)', - dataIndex: 'diffFlag', + title: '更新时间', + dataIndex: 'updateTime', width: 180, customRender: ({ text }) => { - return useRender.renderDict(text, DICT_TYPE.DIFF_FLAG) + return useRender.renderDate(text) } }, ] export const searchFormSchema: FormSchema[] = [ - // { - // label: '业务线编号', - // field: 'businessCode', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { - // label: '业务线简称', - // field: 'businessSimple', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { - // label: '传真', - // field: 'fax', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { - // label: '网址', - // field: 'url', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { - // label: '介绍', - // field: 'description', - // colProps: { span: 8 } - // }, - // { - // label: '创建时间', - // field: 'createTime', - // component: 'RangePicker', - // colProps: { span: 8 } - // }, { label: '业务线名称', field: 'name', @@ -152,18 +61,6 @@ export const searchFormSchema: FormSchema[] = [ colProps: { span: 8 } }, // { - // label: '业务线LOGO', - // field: 'businessLogo', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { - // label: '父id', - // field: 'parentId', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { // label: '类型', // field: 'type', // component: 'Select', @@ -182,12 +79,6 @@ export const searchFormSchema: FormSchema[] = [ // colProps: { span: 8 } // }, // { - // label: '所在城市', - // field: 'city', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { // label: '成立时间', // field: 'establishDate', // component: 'RangePicker', @@ -206,12 +97,6 @@ export const searchFormSchema: FormSchema[] = [ // colProps: { span: 8 } // }, // { - // label: '电话', - // field: 'phone', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { // label: '业务线仓库区分(0：业务线,1：仓库)', // field: 'diffFlag', // component: 'Select', @@ -264,7 +149,11 @@ export const createFormSchema: FormSchema[] = [ { label: '业务线LOGO', field: 'businessLogo', - component: 'Input' + component: 'FileUpload', + componentProps: { + fileType: 'file', + maxCount: 1 + } }, { label: '父id', @@ -341,21 +230,6 @@ export const updateFormSchema: FormSchema[] = [ field: 'businessSimple', component: 'Input' }, - { - label: '传真', - field: 'fax', - component: 'Input' - }, - { - label: '网址', - field: 'url', - component: 'Input' - }, - { - label: '介绍', - field: 'description', - component: 'InputTextArea' - }, { label: '业务线名称', field: 'name', @@ -365,7 +239,7 @@ export const updateFormSchema: FormSchema[] = [ { label: '业务线LOGO', field: 'businessLogo', - component: 'Input' + component: 'Upload' }, { label: '父id', @@ -413,6 +287,21 @@ export const updateFormSchema: FormSchema[] = [ field: 'phone', component: 'Input' }, + { + label: '传真', + field: 'fax', + component: 'Input' + }, + { + label: '网址', + field: 'url', + component: 'Input' + }, + { + label: '介绍', + field: 'description', + component: 'InputTextArea' + }, { label: '业务线仓库区分(0：业务线,1：仓库)', field: 'diffFlag', diff --git a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java index 7af04b7..fe43433 100644 --- a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java +++ b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java @@ -163,4 +163,7 @@ public interface ErrorCodeConstants { // ========== 站内信发送 1002028000 ========== ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002028000, "模板参数({})缺失"); + // ========== 业务线表 TODO 补充编号 ========== + ErrorCode BUSINESS_WAREHOUSE_NOT_EXISTS = new ErrorCode(1002025019, "业务线表不存在"); + } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/BusinessWarehouseController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java similarity index 70% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/BusinessWarehouseController.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java index abf091e..6770a6b 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/BusinessWarehouseController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse; +package com.yunxi.scm.module.system.controller.admin.businesswarehouse; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -23,14 +23,14 @@ import com.yunxi.scm.framework.excel.core.util.ExcelUtils; import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*; -import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; -import com.yunxi.scm.module.xxjj.convert.businesswarehouse.BusinessWarehouseConvert; -import com.yunxi.scm.module.xxjj.service.businesswarehouse.BusinessWarehouseService; +import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.convert.businesswarehouse.BusinessWarehouseConvert; +import com.yunxi.scm.module.system.service.businesswarehouse.BusinessWarehouseService; -@Tag(name = "管理后台 - 业务线/仓库") +@Tag(name = "管理后台 - 业务线表") @RestController -@RequestMapping("/xxjj/business-warehouse") +@RequestMapping("/system/business-warehouse") @Validated public class BusinessWarehouseController { @@ -38,65 +38,65 @@ public class BusinessWarehouseController { private BusinessWarehouseService businessWarehouseService; @PostMapping("/create") - @Operation(summary = "创建业务线/仓库") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:create')") + @Operation(summary = "创建业务线表") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:create')") public CommonResult createBusinessWarehouse(@Valid @RequestBody BusinessWarehouseCreateReqVO createReqVO) { return success(businessWarehouseService.createBusinessWarehouse(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新业务线/仓库") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:update')") + @Operation(summary = "更新业务线表") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:update')") public CommonResult updateBusinessWarehouse(@Valid @RequestBody BusinessWarehouseUpdateReqVO updateReqVO) { businessWarehouseService.updateBusinessWarehouse(updateReqVO); return success(true); } @DeleteMapping("/delete") - @Operation(summary = "删除业务线/仓库") + @Operation(summary = "删除业务线表") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:delete')") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:delete')") public CommonResult deleteBusinessWarehouse(@RequestParam("id") Long id) { businessWarehouseService.deleteBusinessWarehouse(id); return success(true); } @GetMapping("/get") - @Operation(summary = "获得业务线/仓库") + @Operation(summary = "获得业务线表") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')") public CommonResult getBusinessWarehouse(@RequestParam("id") Long id) { BusinessWarehouseDO businessWarehouse = businessWarehouseService.getBusinessWarehouse(id); return success(BusinessWarehouseConvert.INSTANCE.convert(businessWarehouse)); } @GetMapping("/list") - @Operation(summary = "获得业务线/仓库列表") + @Operation(summary = "获得业务线表列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')") public CommonResult> getBusinessWarehouseList(@RequestParam("ids") Collection ids) { List list = businessWarehouseService.getBusinessWarehouseList(ids); return success(BusinessWarehouseConvert.INSTANCE.convertList(list)); } @GetMapping("/page") - @Operation(summary = "获得业务线/仓库分页") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')") + @Operation(summary = "获得业务线表分页") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')") public CommonResult> getBusinessWarehousePage(@Valid BusinessWarehousePageReqVO pageVO) { PageResult pageResult = businessWarehouseService.getBusinessWarehousePage(pageVO); return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult)); } @GetMapping("/export-excel") - @Operation(summary = "导出业务线/仓库 Excel") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:export')") + @Operation(summary = "导出业务线表 Excel") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:export')") @OperateLog(type = EXPORT) public void exportBusinessWarehouseExcel(@Valid BusinessWarehouseExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = businessWarehouseService.getBusinessWarehouseList(exportReqVO); // 导出 Excel List datas = BusinessWarehouseConvert.INSTANCE.convertList02(list); - ExcelUtils.write(response, "业务线/仓库.xls", "数据", BusinessWarehouseExcelVO.class, datas); + ExcelUtils.write(response, "业务线表.xls", "数据", BusinessWarehouseExcelVO.class, datas); } } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java similarity index 69% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java index 27abd55..07be2cc 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; +package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -12,7 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat; import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** - * 业务线/仓库 Base VO，提供给添加、修改、详细的子 VO 使用 + * 业务线表 Base VO，提供给添加、修改、详细的子 VO 使用 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data @@ -22,7 +22,7 @@ public class BusinessWarehouseBaseVO { @NotNull(message = "业务线编号不能为空") private String businessCode; - @Schema(description = "业务线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @Schema(description = "业务线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") @NotNull(message = "业务线名称不能为空") private String name; @@ -32,13 +32,13 @@ public class BusinessWarehouseBaseVO { @Schema(description = "业务线LOGO") private String businessLogo; - @Schema(description = "父id") + @Schema(description = "父id", example = "3408") private Long parentId; - @Schema(description = "类型") + @Schema(description = "类型", example = "1") private String type; - @Schema(description = "状态") + @Schema(description = "状态", example = "1") private String status; @Schema(description = "关联机构") @@ -47,7 +47,7 @@ public class BusinessWarehouseBaseVO { @Schema(description = "成员数量") private Integer employeeNum; - @Schema(description = "所属行业") + @Schema(description = "所属分类") private String industry; @Schema(description = "所在城市") @@ -57,25 +57,26 @@ public class BusinessWarehouseBaseVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime establishDate; - @Schema(description = "归属人员") + @Schema(description = "归属人员", example = "26257") private Long belongUserId; - @Schema(description = "品牌/业务线/事业群名称") + @Schema(description = "品牌/业务线/事业群名称", example = "芋艿") private String brandName; @Schema(description = "电话") private Integer phone; + @Schema(description = "业务线仓库区分(0：业务线,1：仓库)", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "业务线仓库区分(0：业务线,1：仓库)不能为空") + private String diffFlag; + @Schema(description = "传真") private String fax; @Schema(description = "网址", example = "https://www.iocoder.cn") private String url; - @Schema(description = "介绍", example = "你猜") + @Schema(description = "介绍", example = "随便") private String description; - @Schema(description = "区分标志", example = "你猜") - private String diffFlag; - } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java similarity index 65% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java index 18dd2d9..75b2144 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java @@ -1,11 +1,11 @@ -package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; +package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo; import lombok.*; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import javax.validation.constraints.*; -@Schema(description = "管理后台 - 业务线/仓库创建 Request VO") +@Schema(description = "管理后台 - 业务线表创建 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java similarity index 70% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java index 0c4e4a5..2669483 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java @@ -1,7 +1,6 @@ -package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; +package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.models.security.SecurityScheme; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -14,7 +13,7 @@ import com.yunxi.scm.framework.excel.core.convert.DictConvert; /** - * 业务线/仓库 Excel VO + * 业务线表 Excel VO * * @author 长江云息 */ @@ -39,10 +38,12 @@ public class BusinessWarehouseExcelVO { @ExcelProperty("父id") private Long parentId; - @ExcelProperty("类型") + @ExcelProperty(value = "类型", converter = DictConvert.class) + @DictFormat("business_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String type; - @ExcelProperty("状态") + @ExcelProperty(value = "状态", converter = DictConvert.class) + @DictFormat("class_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String status; @ExcelProperty("关联机构") @@ -51,7 +52,7 @@ public class BusinessWarehouseExcelVO { @ExcelProperty("成员数量") private Integer employeeNum; - @ExcelProperty(value = "所属行业", converter = DictConvert.class) + @ExcelProperty(value = "所属分类", converter = DictConvert.class) @DictFormat("duty_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String industry; @@ -70,6 +71,10 @@ public class BusinessWarehouseExcelVO { @ExcelProperty("电话") private Integer phone; + @ExcelProperty(value = "业务线仓库区分(0：业务线,1：仓库)", converter = DictConvert.class) + @DictFormat("diff_flag") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + private String diffFlag; + @ExcelProperty("传真") private String fax; @@ -82,7 +87,4 @@ public class BusinessWarehouseExcelVO { @ExcelProperty("创建时间") private LocalDateTime createTime; - @ExcelProperty("区分标志") - private String diffFlag; - } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java similarity index 76% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java index 0146c37..e0f6a9c 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; +package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo; import lombok.*; import java.util.*; @@ -9,14 +9,14 @@ import org.springframework.format.annotation.DateTimeFormat; import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 业务线/仓库 Excel 导出 Request VO，参数和 BusinessWarehousePageReqVO 是一致的") +@Schema(description = "管理后台 - 业务线表 Excel 导出 Request VO，参数和 BusinessWarehousePageReqVO 是一致的") @Data public class BusinessWarehouseExportReqVO { @Schema(description = "业务线编号") private String businessCode; - @Schema(description = "业务线名称", example = "张三") + @Schema(description = "业务线名称", example = "赵六") private String name; @Schema(description = "业务线简称") @@ -25,7 +25,7 @@ public class BusinessWarehouseExportReqVO { @Schema(description = "业务线LOGO") private String businessLogo; - @Schema(description = "父id", example = "6675") + @Schema(description = "父id", example = "3408") private Long parentId; @Schema(description = "类型", example = "1") @@ -40,7 +40,7 @@ public class BusinessWarehouseExportReqVO { @Schema(description = "成员数量") private Integer employeeNum; - @Schema(description = "所属行业") + @Schema(description = "所属分类") private String industry; @Schema(description = "所在城市") @@ -50,29 +50,29 @@ public class BusinessWarehouseExportReqVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] establishDate; - @Schema(description = "归属人员", example = "19777") + @Schema(description = "归属人员", example = "26257") private Long belongUserId; - @Schema(description = "品牌/业务线/事业群名称", example = "王五") + @Schema(description = "品牌/业务线/事业群名称", example = "芋艿") private String brandName; @Schema(description = "电话") private Integer phone; + @Schema(description = "业务线仓库区分(0：业务线,1：仓库)") + private String diffFlag; + @Schema(description = "传真") private String fax; @Schema(description = "网址", example = "https://www.iocoder.cn") private String url; - @Schema(description = "介绍", example = "你猜") + @Schema(description = "介绍", example = "随便") private String description; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "区分标志", example = "你猜") - private String diffFlag; - } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java similarity index 78% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java index a1e7201..782f966 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; +package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo; import lombok.*; import java.util.*; @@ -9,7 +9,7 @@ import java.time.LocalDateTime; import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 业务线/仓库分页 Request VO") +@Schema(description = "管理后台 - 业务线表分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -18,7 +18,7 @@ public class BusinessWarehousePageReqVO extends PageParam { @Schema(description = "业务线编号") private String businessCode; - @Schema(description = "业务线名称", example = "张三") + @Schema(description = "业务线名称", example = "赵六") private String name; @Schema(description = "业务线简称") @@ -27,7 +27,7 @@ public class BusinessWarehousePageReqVO extends PageParam { @Schema(description = "业务线LOGO") private String businessLogo; - @Schema(description = "父id", example = "6675") + @Schema(description = "父id", example = "3408") private Long parentId; @Schema(description = "类型", example = "1") @@ -42,7 +42,7 @@ public class BusinessWarehousePageReqVO extends PageParam { @Schema(description = "成员数量") private Integer employeeNum; - @Schema(description = "所属行业") + @Schema(description = "所属分类") private String industry; @Schema(description = "所在城市") @@ -52,29 +52,29 @@ public class BusinessWarehousePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] establishDate; - @Schema(description = "归属人员", example = "19777") + @Schema(description = "归属人员", example = "26257") private Long belongUserId; - @Schema(description = "品牌/业务线/事业群名称", example = "王五") + @Schema(description = "品牌/业务线/事业群名称", example = "芋艿") private String brandName; @Schema(description = "电话") private Integer phone; + @Schema(description = "业务线仓库区分(0：业务线,1：仓库)") + private String diffFlag; + @Schema(description = "传真") private String fax; @Schema(description = "网址", example = "https://www.iocoder.cn") private String url; - @Schema(description = "介绍", example = "你猜") + @Schema(description = "介绍", example = "随便") private String description; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "区分标志", example = "你猜") - private String diffFlag; - } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java similarity index 71% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java index 279a688..273b3ff 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java @@ -1,16 +1,16 @@ -package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; +package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.time.LocalDateTime; -@Schema(description = "管理后台 - 业务线/仓库 Response VO") +@Schema(description = "管理后台 - 业务线表 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class BusinessWarehouseRespVO extends BusinessWarehouseBaseVO { - @Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27714") + @Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20782") private Long id; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java similarity index 69% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java index 1051779..67b3dab 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java @@ -1,17 +1,17 @@ -package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; +package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import javax.validation.constraints.*; -@Schema(description = "管理后台 - 业务线/仓库更新 Request VO") +@Schema(description = "管理后台 - 业务线表更新 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class BusinessWarehouseUpdateReqVO extends BusinessWarehouseBaseVO { - @Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27714") + @Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20782") @NotNull(message = "业务id不能为空") private Long id; diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businesswarehouse/BusinessWarehouseConvert.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java similarity index 75% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businesswarehouse/BusinessWarehouseConvert.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java index 93423df..b3a23e3 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businesswarehouse/BusinessWarehouseConvert.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.convert.businesswarehouse; +package com.yunxi.scm.module.system.convert.businesswarehouse; import java.util.*; @@ -6,11 +6,11 @@ import com.yunxi.scm.framework.common.pojo.PageResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; /** - * 业务线/仓库 Convert + * 业务线表 Convert * * @author 长江云息 */ diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java similarity index 74% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java index cfe43e9..3db54e8 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java @@ -1,6 +1,5 @@ -package com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse; +package com.yunxi.scm.module.system.dal.dataobject.businesswarehouse; -import com.yunxi.scm.framework.tenant.core.db.TenantBaseDO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -10,19 +9,19 @@ import com.baomidou.mybatisplus.annotation.*; import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO; /** - * 业务线/仓库 DO + * 业务线表 DO * * @author 长江云息 */ -@TableName("xxjj_business_warehouse") -@KeySequence("xxjj_business_warehouse_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("system_business_warehouse") +@KeySequence("system_business_warehouse_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class BusinessWarehouseDO extends TenantBaseDO { +public class BusinessWarehouseDO extends BaseDO { /** * 业务id @@ -51,10 +50,14 @@ public class BusinessWarehouseDO extends TenantBaseDO { private Long parentId; /** * 类型 + * + * 枚举 {@link TODO business_type 对应的类} */ private String type; /** * 状态 + * + * 枚举 {@link TODO class_status 对应的类} */ private String status; /** @@ -66,7 +69,7 @@ public class BusinessWarehouseDO extends TenantBaseDO { */ private Integer employeeNum; /** - * 所属行业 + * 所属分类 * * 枚举 {@link TODO duty_type 对应的类} */ @@ -91,6 +94,12 @@ public class BusinessWarehouseDO extends TenantBaseDO { * 电话 */ private Integer phone; + /** + * 业务线仓库区分(0：业务线,1：仓库) + * + * 枚举 {@link TODO diff_flag 对应的类} + */ + private String diffFlag; /** * 传真 */ @@ -103,9 +112,5 @@ public class BusinessWarehouseDO extends TenantBaseDO { * 介绍 */ private String description; - /** - * 区分标志 - */ - private String diffFlag; } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java similarity index 90% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java index 5a91256..7aa3548 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java @@ -1,16 +1,16 @@ -package com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse; +package com.yunxi.scm.module.system.dal.mysql.businesswarehouse; import java.util.*; import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX; import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; -import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import org.apache.ibatis.annotations.Mapper; -import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; +import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*; /** - * 业务线/仓库 Mapper + * 业务线表 Mapper * * @author 长江云息 */ @@ -34,6 +34,7 @@ public interface BusinessWarehouseMapper extends BaseMapperX getBusinessWarehouseList(Collection ids); /** - * 获得业务线/仓库分页 + * 获得业务线表分页 * * @param pageReqVO 分页查询 - * @return 业务线/仓库分页 + * @return 业务线表分页 */ PageResult getBusinessWarehousePage(BusinessWarehousePageReqVO pageReqVO); /** - * 获得业务线/仓库列表, 用于 Excel 导出 + * 获得业务线表列表, 用于 Excel 导出 * * @param exportReqVO 查询条件 - * @return 业务线/仓库列表 + * @return 业务线表列表 */ List getBusinessWarehouseList(BusinessWarehouseExportReqVO exportReqVO); diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java similarity index 82% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImpl.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java index c5b56c4..cbf1c49 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java @@ -1,22 +1,22 @@ -package com.yunxi.scm.module.xxjj.service.businesswarehouse; +package com.yunxi.scm.module.system.service.businesswarehouse; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import java.util.*; -import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import com.yunxi.scm.framework.common.pojo.PageResult; -import com.yunxi.scm.module.xxjj.convert.businesswarehouse.BusinessWarehouseConvert; -import com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse.BusinessWarehouseMapper; +import com.yunxi.scm.module.system.convert.businesswarehouse.BusinessWarehouseConvert; +import com.yunxi.scm.module.system.dal.mysql.businesswarehouse.BusinessWarehouseMapper; import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; +import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*; /** - * 业务线/仓库 Service 实现类 + * 业务线表 Service 实现类 * * @author 长江云息 */ diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businesswarehouse/BusinessWarehouseMapper.xml b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml similarity index 84% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businesswarehouse/BusinessWarehouseMapper.xml rename to yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml index ab94ac8..22cbd0b 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businesswarehouse/BusinessWarehouseMapper.xml +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml @@ -1,6 +1,6 @@ - + - - diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml deleted file mode 100644 index d44875e..0000000 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java deleted file mode 100644 index b75f307..0000000 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.yunxi.scm.module.xxjj.service.businessenterpriserelational; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest; - -import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO; -import com.yunxi.scm.module.xxjj.dal.mysql.businessenterpriserelational.BusinessEnterpriseRelationalMapper; -import com.yunxi.scm.framework.common.pojo.PageResult; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; -import static com.yunxi.scm.framework.test.core.util.AssertUtils.*; -import static com.yunxi.scm.framework.test.core.util.RandomUtils.*; -import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*; -import static com.yunxi.scm.framework.common.util.object.ObjectUtils.*; -import static com.yunxi.scm.framework.common.util.date.DateUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** - * {@link BusinessEnterpriseRelationalServiceImpl} 的单元测试类 - * - * @author 长江云息 - */ -@Import(BusinessEnterpriseRelationalServiceImpl.class) -public class BusinessEnterpriseRelationalServiceImplTest extends BaseDbUnitTest { - - @Resource - private BusinessEnterpriseRelationalServiceImpl businessEnterpriseRelationalService; - - @Resource - private BusinessEnterpriseRelationalMapper businessEnterpriseRelationalMapper; - - @Test - public void testCreateBusinessEnterpriseRelational_success() { - // 准备参数 - BusinessEnterpriseRelationalCreateReqVO reqVO = randomPojo(BusinessEnterpriseRelationalCreateReqVO.class); - - // 调用 - Long businessEnterpriseRelationalId = businessEnterpriseRelationalService.createBusinessEnterpriseRelational(reqVO); - // 断言 - assertNotNull(businessEnterpriseRelationalId); - // 校验记录的属性是否正确 - BusinessEnterpriseRelationalDO businessEnterpriseRelational = businessEnterpriseRelationalMapper.selectById(businessEnterpriseRelationalId); - assertPojoEquals(reqVO, businessEnterpriseRelational); - } - - @Test - public void testUpdateBusinessEnterpriseRelational_success() { - // mock 数据 - BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class); - businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational);// @Sql: 先插入出一条存在的数据 - // 准备参数 - BusinessEnterpriseRelationalUpdateReqVO reqVO = randomPojo(BusinessEnterpriseRelationalUpdateReqVO.class, o -> { - o.setId(dbBusinessEnterpriseRelational.getId()); // 设置更新的 ID - }); - - // 调用 - businessEnterpriseRelationalService.updateBusinessEnterpriseRelational(reqVO); - // 校验是否更新正确 - BusinessEnterpriseRelationalDO businessEnterpriseRelational = businessEnterpriseRelationalMapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, businessEnterpriseRelational); - } - - @Test - public void testUpdateBusinessEnterpriseRelational_notExists() { - // 准备参数 - BusinessEnterpriseRelationalUpdateReqVO reqVO = randomPojo(BusinessEnterpriseRelationalUpdateReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> businessEnterpriseRelationalService.updateBusinessEnterpriseRelational(reqVO), BUSINESS_ENTERPRISE_RELATIONAL_NOT_EXISTS); - } - - @Test - public void testDeleteBusinessEnterpriseRelational_success() { - // mock 数据 - BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class); - businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbBusinessEnterpriseRelational.getId(); - - // 调用 - businessEnterpriseRelationalService.deleteBusinessEnterpriseRelational(id); - // 校验数据不存在了 - assertNull(businessEnterpriseRelationalMapper.selectById(id)); - } - - @Test - public void testDeleteBusinessEnterpriseRelational_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> businessEnterpriseRelationalService.deleteBusinessEnterpriseRelational(id), BUSINESS_ENTERPRISE_RELATIONAL_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetBusinessEnterpriseRelationalPage() { - // mock 数据 - BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class, o -> { // 等会查询到 - o.setBusinessId(null); - o.setEnterpriseId(null); - o.setCreateTime(null); - }); - businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational); - // 测试 businessId 不匹配 - businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setBusinessId(null))); - // 测试 enterpriseId 不匹配 - businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setEnterpriseId(null))); - // 测试 createTime 不匹配 - businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setCreateTime(null))); - // 准备参数 - BusinessEnterpriseRelationalPageReqVO reqVO = new BusinessEnterpriseRelationalPageReqVO(); - reqVO.setBusinessId(null); - reqVO.setEnterpriseId(null); - reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - PageResult pageResult = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbBusinessEnterpriseRelational, pageResult.getList().get(0)); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetBusinessEnterpriseRelationalList() { - // mock 数据 - BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class, o -> { // 等会查询到 - o.setBusinessId(null); - o.setEnterpriseId(null); - o.setCreateTime(null); - }); - businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational); - // 测试 businessId 不匹配 - businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setBusinessId(null))); - // 测试 enterpriseId 不匹配 - businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setEnterpriseId(null))); - // 测试 createTime 不匹配 - businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setCreateTime(null))); - // 准备参数 - BusinessEnterpriseRelationalExportReqVO reqVO = new BusinessEnterpriseRelationalExportReqVO(); - reqVO.setBusinessId(null); - reqVO.setEnterpriseId(null); - reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - List list = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalList(reqVO); - // 断言 - assertEquals(1, list.size()); - assertPojoEquals(dbBusinessEnterpriseRelational, list.get(0)); - } - -} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java deleted file mode 100644 index 16e4e50..0000000 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.yunxi.scm.module.xxjj.service.businessuserrelational; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest; - -import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; -import com.yunxi.scm.module.xxjj.dal.mysql.businessuserrelational.BusinessUserRelationalMapper; -import com.yunxi.scm.framework.common.pojo.PageResult; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; -import static com.yunxi.scm.framework.test.core.util.AssertUtils.*; -import static com.yunxi.scm.framework.test.core.util.RandomUtils.*; -import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*; -import static com.yunxi.scm.framework.common.util.object.ObjectUtils.*; -import static com.yunxi.scm.framework.common.util.date.DateUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** - * {@link BusinessUserRelationalServiceImpl} 的单元测试类 - * - * @author 长江云息 - */ -@Import(BusinessUserRelationalServiceImpl.class) -public class BusinessUserRelationalServiceImplTest extends BaseDbUnitTest { - - @Resource - private BusinessUserRelationalServiceImpl businessUserRelationalService; - - @Resource - private BusinessUserRelationalMapper businessUserRelationalMapper; - - @Test - public void testCreateBusinessUserRelational_success() { - // 准备参数 - BusinessUserRelationalCreateReqVO reqVO = randomPojo(BusinessUserRelationalCreateReqVO.class); - - // 调用 - Long businessUserRelationalId = businessUserRelationalService.createBusinessUserRelational(reqVO); - // 断言 - assertNotNull(businessUserRelationalId); - // 校验记录的属性是否正确 - BusinessUserRelationalDO businessUserRelational = businessUserRelationalMapper.selectById(businessUserRelationalId); - assertPojoEquals(reqVO, businessUserRelational); - } - - @Test - public void testUpdateBusinessUserRelational_success() { - // mock 数据 - BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class); - businessUserRelationalMapper.insert(dbBusinessUserRelational);// @Sql: 先插入出一条存在的数据 - // 准备参数 - BusinessUserRelationalUpdateReqVO reqVO = randomPojo(BusinessUserRelationalUpdateReqVO.class, o -> { - o.setId(dbBusinessUserRelational.getId()); // 设置更新的 ID - }); - - // 调用 - businessUserRelationalService.updateBusinessUserRelational(reqVO); - // 校验是否更新正确 - BusinessUserRelationalDO businessUserRelational = businessUserRelationalMapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, businessUserRelational); - } - - @Test - public void testUpdateBusinessUserRelational_notExists() { - // 准备参数 - BusinessUserRelationalUpdateReqVO reqVO = randomPojo(BusinessUserRelationalUpdateReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> businessUserRelationalService.updateBusinessUserRelational(reqVO), BUSINESS_USER_RELATIONAL_NOT_EXISTS); - } - - @Test - public void testDeleteBusinessUserRelational_success() { - // mock 数据 - BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class); - businessUserRelationalMapper.insert(dbBusinessUserRelational);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbBusinessUserRelational.getId(); - - // 调用 - businessUserRelationalService.deleteBusinessUserRelational(id); - // 校验数据不存在了 - assertNull(businessUserRelationalMapper.selectById(id)); - } - - @Test - public void testDeleteBusinessUserRelational_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> businessUserRelationalService.deleteBusinessUserRelational(id), BUSINESS_USER_RELATIONAL_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetBusinessUserRelationalPage() { - // mock 数据 - BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class, o -> { // 等会查询到 - o.setBusinessId(null); - o.setUserId(null); - o.setCreateTime(null); - }); - businessUserRelationalMapper.insert(dbBusinessUserRelational); - // 测试 businessId 不匹配 - businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setBusinessId(null))); - // 测试 userId 不匹配 - businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setUserId(null))); - // 测试 createTime 不匹配 - businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setCreateTime(null))); - // 准备参数 - BusinessUserRelationalPageReqVO reqVO = new BusinessUserRelationalPageReqVO(); - reqVO.setBusinessId(null); - reqVO.setUserId(null); - reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - PageResult pageResult = businessUserRelationalService.getBusinessUserRelationalPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbBusinessUserRelational, pageResult.getList().get(0)); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetBusinessUserRelationalList() { - // mock 数据 - BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class, o -> { // 等会查询到 - o.setBusinessId(null); - o.setUserId(null); - o.setCreateTime(null); - }); - businessUserRelationalMapper.insert(dbBusinessUserRelational); - // 测试 businessId 不匹配 - businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setBusinessId(null))); - // 测试 userId 不匹配 - businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setUserId(null))); - // 测试 createTime 不匹配 - businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setCreateTime(null))); - // 准备参数 - BusinessUserRelationalExportReqVO reqVO = new BusinessUserRelationalExportReqVO(); - reqVO.setBusinessId(null); - reqVO.setUserId(null); - reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - List list = businessUserRelationalService.getBusinessUserRelationalList(reqVO); - // 断言 - assertEquals(1, list.size()); - assertPojoEquals(dbBusinessUserRelational, list.get(0)); - } - -}