diff --git a/yunxi-framework/yunxi-spring-boot-starter-mybatis/src/main/java/com/yunxi/scm/framework/mybatis/core/mapper/BaseMapperX.java b/yunxi-framework/yunxi-spring-boot-starter-mybatis/src/main/java/com/yunxi/scm/framework/mybatis/core/mapper/BaseMapperX.java index c749db5..fcd34fa 100644 --- a/yunxi-framework/yunxi-spring-boot-starter-mybatis/src/main/java/com/yunxi/scm/framework/mybatis/core/mapper/BaseMapperX.java +++ b/yunxi-framework/yunxi-spring-boot-starter-mybatis/src/main/java/com/yunxi/scm/framework/mybatis/core/mapper/BaseMapperX.java @@ -1,5 +1,6 @@ package com.yunxi.scm.framework.mybatis.core.mapper; +import com.github.yulichang.base.MPJBaseMapper; import com.yunxi.scm.framework.common.pojo.PageParam; import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.mybatis.core.util.MyBatisUtils; @@ -18,7 +19,7 @@ import java.util.List; /** * 在 MyBatis Plus 的 BaseMapper 的基础上拓展，提供更多的能力 */ -public interface BaseMapperX extends BaseMapper { +public interface BaseMapperX extends MPJBaseMapper { default PageResult selectPage(PageParam pageParam, @Param("ew") Wrapper queryWrapper) { // MyBatis Plus 查询 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 89923e7..a988e0c 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 @@ -169,6 +169,9 @@ public interface ErrorCodeConstants { // ========== 业务线表 TODO 补充编号 ========== ErrorCode BUSINESS_WAREHOUSE_NOT_EXISTS = new ErrorCode(1002025019, "业务线表不存在"); - + // ========== 业务线和用户关联 TODO 补充编号 ========== + ErrorCode BUSINESS_USER_RELATIONAL_NOT_EXISTS = new ErrorCode(1002025020, "业务线和用户关联不存在"); + // ========== 业务线和机构关联 TODO 补充编号 ========== + ErrorCode BUSINESS_ENTERPRISE_RELATIONAL_NOT_EXISTS = new ErrorCode(1002025021, "业务线和机构关联不存在"); } diff --git a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/permission/MenuTypeEnum.java b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/permission/MenuTypeEnum.java index d4e5af4..3151704 100644 --- a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/permission/MenuTypeEnum.java +++ b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/permission/MenuTypeEnum.java @@ -22,4 +22,10 @@ public enum MenuTypeEnum { */ private final Integer type; + + // 判断是否不为目录类型 + public static boolean isNoDIR(Integer type) { + return !DIR.getType().equals(type); + } + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/auth/vo/AuthLoginRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/auth/vo/AuthLoginRespVO.java index 66a1fc4..14835f5 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/auth/vo/AuthLoginRespVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/auth/vo/AuthLoginRespVO.java @@ -27,4 +27,7 @@ public class AuthLoginRespVO { @Schema(description = "过期时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime expiresTime; + @Schema(description = "租户id", requiredMode = Schema.RequiredMode.REQUIRED) + private Long tenantId; + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java index ef4cacf..4472097 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java @@ -1,5 +1,9 @@ package com.yunxi.scm.module.system.controller.admin.auth.vo; +import com.baomidou.mybatisplus.annotation.TableField; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; +import com.yunxi.scm.module.system.dal.dataobject.tenant.TenantDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; @@ -44,6 +48,15 @@ public class AuthPermissionInfoRespVO { @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.jpg") private String avatar; + private List enterpriseList; + + private List businessWarehouseList; + + private EnterpriseDO enterprise; + + private List tenantDOList; + + private TenantDO tenantDO; } @Schema(description = "管理后台 - 登录用户的菜单信息 Response VO") diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/BusinessEnterpriseRelationalController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/BusinessEnterpriseRelationalController.java new file mode 100644 index 0000000..22460a1 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/BusinessEnterpriseRelationalController.java @@ -0,0 +1,102 @@ +package com.yunxi.scm.module.system.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.system.controller.admin.businessenterpriserelational.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO; +import com.yunxi.scm.module.system.convert.businessenterpriserelational.BusinessEnterpriseRelationalConvert; +import com.yunxi.scm.module.system.service.businessenterpriserelational.BusinessEnterpriseRelationalService; + +@Tag(name = "管理后台 - 业务线和机构关联") +@RestController +@RequestMapping("/system/business-enterprise-relational") +@Validated +public class BusinessEnterpriseRelationalController { + + @Resource + private BusinessEnterpriseRelationalService businessEnterpriseRelationalService; + + @PostMapping("/create") + @Operation(summary = "创建业务线和机构关联") + @PreAuthorize("@ss.hasPermission('system:business-enterprise-relational:create')") + public CommonResult createBusinessEnterpriseRelational(@Valid @RequestBody BusinessEnterpriseRelationalCreateReqVO createReqVO) { + return success(businessEnterpriseRelationalService.createBusinessEnterpriseRelational(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新业务线和机构关联") + @PreAuthorize("@ss.hasPermission('system: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('system: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('system: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('system: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('system: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('system: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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalBaseVO.java new file mode 100644 index 0000000..22136ba --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalBaseVO.java @@ -0,0 +1,25 @@ +package com.yunxi.scm.module.system.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 = "3256") + @NotNull(message = "业务线id不能为空") + private Long businessId; + + @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "15640") + @NotNull(message = "企业id不能为空") + private Long enterpriseId; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalCreateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalCreateReqVO.java new file mode 100644 index 0000000..76f1aee --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalCreateReqVO.java @@ -0,0 +1,14 @@ +package com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExcelVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExcelVO.java new file mode 100644 index 0000000..f299788 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExcelVO.java @@ -0,0 +1,31 @@ +package com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExportReqVO.java new file mode 100644 index 0000000..f6880a9 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExportReqVO.java @@ -0,0 +1,26 @@ +package com.yunxi.scm.module.system.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 = "3256") + private Long businessId; + + @Schema(description = "企业id", example = "15640") + private Long enterpriseId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalPageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalPageReqVO.java new file mode 100644 index 0000000..c0ccd76 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalPageReqVO.java @@ -0,0 +1,28 @@ +package com.yunxi.scm.module.system.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 = "3256") + private Long businessId; + + @Schema(description = "企业id", example = "15640") + private Long enterpriseId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalRespVO.java new file mode 100644 index 0000000..26188dc --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalRespVO.java @@ -0,0 +1,19 @@ +package com.yunxi.scm.module.system.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 = "21519") + private Long id; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalUpdateReqVO.java new file mode 100644 index 0000000..d1397e2 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.yunxi.scm.module.system.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 = "21519") + @NotNull(message = "主键id不能为空") + private Long id; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/BusinessUserRelationalController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/BusinessUserRelationalController.java new file mode 100644 index 0000000..68c3c16 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/BusinessUserRelationalController.java @@ -0,0 +1,102 @@ +package com.yunxi.scm.module.system.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.system.controller.admin.businessuserrelational.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; +import com.yunxi.scm.module.system.convert.businessuserrelational.BusinessUserRelationalConvert; +import com.yunxi.scm.module.system.service.businessuserrelational.BusinessUserRelationalService; + +@Tag(name = "管理后台 - 业务线和用户关联") +@RestController +@RequestMapping("/system/business-user-relational") +@Validated +public class BusinessUserRelationalController { + + @Resource + private BusinessUserRelationalService businessUserRelationalService; + + @PostMapping("/create") + @Operation(summary = "创建业务线和用户关联") + @PreAuthorize("@ss.hasPermission('system:business-user-relational:create')") + public CommonResult createBusinessUserRelational(@Valid @RequestBody BusinessUserRelationalCreateReqVO createReqVO) { + return success(businessUserRelationalService.createBusinessUserRelational(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新业务线和用户关联") + @PreAuthorize("@ss.hasPermission('system: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('system: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('system: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('system: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('system: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('system: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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalBaseVO.java new file mode 100644 index 0000000..5fb8716 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalBaseVO.java @@ -0,0 +1,25 @@ +package com.yunxi.scm.module.system.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 = "29863") + @NotNull(message = "业务线/仓库id不能为空") + private Long businessId; + + @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2593") + @NotNull(message = "用户id不能为空") + private Long userId; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalCreateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalCreateReqVO.java new file mode 100644 index 0000000..7f7d659 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalCreateReqVO.java @@ -0,0 +1,14 @@ +package com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalExcelVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalExcelVO.java new file mode 100644 index 0000000..e9638c9 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalExcelVO.java @@ -0,0 +1,31 @@ +package com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalExportReqVO.java new file mode 100644 index 0000000..82392cb --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalExportReqVO.java @@ -0,0 +1,26 @@ +package com.yunxi.scm.module.system.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 = "29863") + private Long businessId; + + @Schema(description = "用户id", example = "2593") + private Long userId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalPageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalPageReqVO.java new file mode 100644 index 0000000..1677ed1 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalPageReqVO.java @@ -0,0 +1,28 @@ +package com.yunxi.scm.module.system.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 = "29863") + private Long businessId; + + @Schema(description = "用户id", example = "2593") + private Long userId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalRespVO.java new file mode 100644 index 0000000..daf622b --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalRespVO.java @@ -0,0 +1,19 @@ +package com.yunxi.scm.module.system.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 = "17732") + private Long id; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalUpdateReqVO.java new file mode 100644 index 0000000..0a24b57 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.yunxi.scm.module.system.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 = "17732") + @NotNull(message = "主键id不能为空") + private Long id; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/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 index d4a98e8..616aa9f 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/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 @@ -93,6 +93,14 @@ public class BusinessWarehouseController { return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult)); } + @GetMapping("/business") + @Operation(summary = "获得业务线分页") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:business')") + public CommonResult> getBusinessPage(@Valid BusinessWarehousePageReqVO pageVO) { + PageResult pageResult = businessWarehouseService.getBusinessPage(pageVO); + return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult)); + } + @GetMapping("/export-excel") @Operation(summary = "导出业务线表 Excel") @PreAuthorize("@ss.hasPermission('system:business-warehouse:export')") @@ -118,4 +126,12 @@ public class BusinessWarehouseController { return success(BusinessWarehouseConvert.INSTANCE.convertList03(list)); } + @GetMapping("/business-user") + @Operation(summary = "获得业务线分页") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:business-user')") + public CommonResult> getBusinessUserPage(BusinessUserVO reqVO) { + PageResult pageResult = businessWarehouseService.getBusinessUserList(reqVO); + return success(pageResult); + } + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessUserVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessUserVO.java new file mode 100644 index 0000000..8d77fde --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessUserVO.java @@ -0,0 +1,44 @@ +package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo; + + +import com.yunxi.scm.framework.common.pojo.PageParam; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +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 = "管理后台 - 业务线员工信息 Response VO") +@Data +@NoArgsConstructor +@AllArgsConstructor +public class BusinessUserVO extends AdminUserDO { + + + @Schema(description = "帐号状态") + private Integer accountStatus; + @Schema(description = "业务编号") + private Integer businessId; + @Schema(description = "业务名称") + private String businessName; + @Schema(description = "员工编号") + private Integer userId; + @Schema(description = "分页") + private Integer pageNo; + @Schema(description = "分页") + private Integer pageSize; + @Schema(description = "部门名称") + private String deptName; + @Schema(description = "职务名称") + private String postName; + @Schema(description = "创建时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] loginTime; + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java index 360ef8f..34d984a 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java @@ -3,6 +3,7 @@ package com.yunxi.scm.module.system.controller.admin.dept; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yunxi.scm.framework.common.enums.CommonStatusEnum; import com.yunxi.scm.framework.common.pojo.CommonResult; +import com.yunxi.scm.framework.security.core.util.SecurityFrameworkUtils; import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.*; import com.yunxi.scm.module.system.convert.dept.DeptConvert; import com.yunxi.scm.module.system.dal.dataobject.dept.DeptDO; @@ -13,6 +14,7 @@ import com.yunxi.scm.module.system.service.user.AdminUserService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -33,12 +35,14 @@ public class DeptController { @Resource private DeptService deptService; @Resource - private AdminUserMapper adminUserMapper; + private AdminUserService userService; @PostMapping("create") @Operation(summary = "创建部门") @PreAuthorize("@ss.hasPermission('system:dept:create')") public CommonResult createDept(@Valid @RequestBody DeptCreateReqVO reqVO) { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); Long deptId = deptService.createDept(reqVO); return success(deptId); } @@ -47,6 +51,8 @@ public class DeptController { @Operation(summary = "更新部门") @PreAuthorize("@ss.hasPermission('system:dept:update')") public CommonResult updateDept(@Valid @RequestBody DeptUpdateReqVO reqVO) { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); deptService.updateDept(reqVO); return success(true); } @@ -64,6 +70,11 @@ public class DeptController { @Operation(summary = "获取部门列表") @PreAuthorize("@ss.hasPermission('system:dept:query')") public CommonResult> getDeptList(DeptListReqVO reqVO) { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + //是子机构，根据机构过滤 + if(adminUserDO.getEnterprise() != null && StringUtils.equals(adminUserDO.getEnterprise().getEnterpriseType(), "1")){ + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); + } List list = deptService.getDeptList(reqVO); list.sort(Comparator.comparing(DeptDO::getSort)); return success(DeptConvert.INSTANCE.convertList(list)); @@ -75,6 +86,11 @@ public class DeptController { // 获得部门列表，只要开启状态的 DeptListReqVO reqVO = new DeptListReqVO(); reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + //是子机构，根据机构过滤 + if(adminUserDO.getEnterprise() != null && StringUtils.equals(adminUserDO.getEnterprise().getEnterpriseType(), "1")){ + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); + } List list = deptService.getDeptList(reqVO); // 排序后，返回给前端 list.sort(Comparator.comparing(DeptDO::getSort)); @@ -90,4 +106,16 @@ public class DeptController { return success(DeptConvert.INSTANCE.convert(deptService.getDept(id))); } + @GetMapping("/list-user-simple") + @Operation(summary = "获取部门用户精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项") + public CommonResult> getSimpleDeptUserList() { + // 获得部门列表，只要开启状态的 + DeptListReqVO reqVO = new DeptListReqVO(); + reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); + List list = deptService.getDeptList(reqVO); + // 排序后，返回给前端 + list.sort(Comparator.comparing(DeptDO::getSort)); + return success(DeptConvert.INSTANCE.convertList02(list)); + } + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/PostController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/PostController.java index f2f4b51..88aa96a 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/PostController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/PostController.java @@ -5,13 +5,18 @@ import com.yunxi.scm.framework.common.pojo.CommonResult; import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.excel.core.util.ExcelUtils; import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; +import com.yunxi.scm.framework.security.core.util.SecurityFrameworkUtils; +import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptListReqVO; import com.yunxi.scm.module.system.controller.admin.dept.vo.post.*; import com.yunxi.scm.module.system.convert.dept.PostConvert; import com.yunxi.scm.module.system.dal.dataobject.dept.PostDO; +import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO; import com.yunxi.scm.module.system.service.dept.PostService; +import com.yunxi.scm.module.system.service.user.AdminUserService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -35,11 +40,15 @@ public class PostController { @Resource private PostService postService; + @Resource + private AdminUserService userService; @PostMapping("/create") @Operation(summary = "创建岗位") @PreAuthorize("@ss.hasPermission('system:post:create')") public CommonResult createPost(@Valid @RequestBody PostCreateReqVO reqVO) { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); Long postId = postService.createPost(reqVO); return success(postId); } @@ -48,6 +57,8 @@ public class PostController { @Operation(summary = "修改岗位") @PreAuthorize("@ss.hasPermission('system:post:update')") public CommonResult updatePost(@Valid @RequestBody PostUpdateReqVO reqVO) { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); postService.updatePost(reqVO); return success(true); } @@ -71,8 +82,15 @@ public class PostController { @GetMapping("/list-all-simple") @Operation(summary = "获取岗位精简信息列表", description = "只包含被开启的岗位，主要用于前端的下拉选项") public CommonResult> getSimplePostList() { + PostExportReqVO reqVO = new PostExportReqVO(); + reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + //是子机构，根据机构过滤 + if(adminUserDO.getEnterprise() != null && StringUtils.equals(adminUserDO.getEnterprise().getEnterpriseType(), "1")){ + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); + } // 获得岗位列表，只要开启状态的 - List list = postService.getPostList(null, Collections.singleton(CommonStatusEnum.ENABLE.getStatus())); + List list = postService.getPostList(reqVO); // 排序后，返回给前端 list.sort(Comparator.comparing(PostDO::getSort)); return success(PostConvert.INSTANCE.convertList02(list)); @@ -82,6 +100,11 @@ public class PostController { @Operation(summary = "获得岗位分页列表") @PreAuthorize("@ss.hasPermission('system:post:query')") public CommonResult> getPostPage(@Validated PostPageReqVO reqVO) { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + //是子机构，根据机构过滤 + if(adminUserDO.getEnterprise() != null && StringUtils.equals(adminUserDO.getEnterprise().getEnterpriseType(), "1")){ + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); + } return success(PostConvert.INSTANCE.convertPage(postService.getPostPage(reqVO))); } @@ -90,6 +113,11 @@ public class PostController { @PreAuthorize("@ss.hasPermission('system:post:export')") @OperateLog(type = EXPORT) public void export(HttpServletResponse response, @Validated PostExportReqVO reqVO) throws IOException { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + //是子机构，根据机构过滤 + if(adminUserDO.getEnterprise() != null && StringUtils.equals(adminUserDO.getEnterprise().getEnterpriseType(), "1")){ + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); + } List posts = postService.getPostList(reqVO); List data = PostConvert.INSTANCE.convertList03(posts); // 输出 diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java index fc9a0af..c644bbf 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java @@ -44,4 +44,6 @@ public class DeptBaseVO { // @InEnum(value = CommonStatusEnum.class, message = "修改状态必须是 {value}") private Integer status; + @Schema(description = "企业ID", example = "1024") + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java index 7fe4cb1..4c13199 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java @@ -13,4 +13,6 @@ public class DeptListReqVO { @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") private Integer status; + @Schema(description = "企业id", example = "1") + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java index c1b8987..a9b1ba5 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java @@ -23,4 +23,6 @@ public class DeptSimpleRespVO { @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long parentId; + + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostBaseVO.java index 8cec1a6..6b8b1e9 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostBaseVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostBaseVO.java @@ -33,4 +33,6 @@ public class PostBaseVO { @Schema(description = "备注", example = "快乐的备注") private String remark; + @Schema(description = "企业ID", example = "1024") + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostExcelVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostExcelVO.java index 4a6acbf..e4fe36d 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostExcelVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostExcelVO.java @@ -4,6 +4,7 @@ import com.yunxi.scm.framework.excel.core.annotations.DictFormat; import com.yunxi.scm.framework.excel.core.convert.DictConvert; import com.yunxi.scm.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -28,4 +29,6 @@ public class PostExcelVO { @DictFormat(DictTypeConstants.COMMON_STATUS) private String status; + @Schema(description = "企业id", example = "1") + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostExportReqVO.java index 410e48e..3d65ac2 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostExportReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostExportReqVO.java @@ -16,4 +16,6 @@ public class PostExportReqVO { @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") private Integer status; + @Schema(description = "企业id", example = "1") + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostListReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostListReqVO.java index 79b36aa..7329129 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostListReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostListReqVO.java @@ -15,4 +15,6 @@ public class PostListReqVO extends PostBaseVO { @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") private Integer status; + @Schema(description = "企业id", example = "1") + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostPageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostPageReqVO.java index 6ef4a23..38fb238 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostPageReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/post/PostPageReqVO.java @@ -19,4 +19,6 @@ public class PostPageReqVO extends PageParam { @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") private Integer status; + @Schema(description = "企业id", example = "1") + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/RoleController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/RoleController.java index 78c0a13..ce200ea 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/RoleController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/RoleController.java @@ -5,13 +5,18 @@ import com.yunxi.scm.framework.common.pojo.CommonResult; import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.excel.core.util.ExcelUtils; import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; +import com.yunxi.scm.framework.security.core.util.SecurityFrameworkUtils; +import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptListReqVO; import com.yunxi.scm.module.system.controller.admin.permission.vo.role.*; import com.yunxi.scm.module.system.convert.permission.RoleConvert; import com.yunxi.scm.module.system.dal.dataobject.permission.RoleDO; +import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO; import com.yunxi.scm.module.system.service.permission.RoleService; +import com.yunxi.scm.module.system.service.user.AdminUserService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -35,11 +40,15 @@ public class RoleController { @Resource private RoleService roleService; + @Resource + private AdminUserService userService; @PostMapping("/create") @Operation(summary = "创建角色") @PreAuthorize("@ss.hasPermission('system:role:create')") public CommonResult createRole(@Valid @RequestBody RoleCreateReqVO reqVO) { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); return success(roleService.createRole(reqVO, null)); } @@ -47,6 +56,8 @@ public class RoleController { @Operation(summary = "修改角色") @PreAuthorize("@ss.hasPermission('system:role:update')") public CommonResult updateRole(@Valid @RequestBody RoleUpdateReqVO reqVO) { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); roleService.updateRole(reqVO); return success(true); } @@ -80,14 +91,26 @@ public class RoleController { @Operation(summary = "获得角色分页") @PreAuthorize("@ss.hasPermission('system:role:query')") public CommonResult> getRolePage(RolePageReqVO reqVO) { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + //是子机构，根据机构过滤 + if(adminUserDO.getEnterprise() != null && StringUtils.equals(adminUserDO.getEnterprise().getEnterpriseType(), "1")){ + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); + } return success(roleService.getRolePage(reqVO)); } @GetMapping("/list-all-simple") @Operation(summary = "获取角色精简信息列表", description = "只包含被开启的角色，主要用于前端的下拉选项") public CommonResult> getSimpleRoleList() { + RoleExportReqVO reqVO = new RoleExportReqVO(); + reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + //是子机构，根据机构过滤 + if(adminUserDO.getEnterprise() != null && StringUtils.equals(adminUserDO.getEnterprise().getEnterpriseType(), "1")){ + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); + } // 获得角色列表，只要开启状态的 - List list = roleService.getRoleListByStatus(singleton(CommonStatusEnum.ENABLE.getStatus())); + List list = roleService.getRoleList(reqVO); // 排序后，返回给前端 list.sort(Comparator.comparing(RoleDO::getSort)); return success(RoleConvert.INSTANCE.convertList02(list)); @@ -97,6 +120,11 @@ public class RoleController { @OperateLog(type = EXPORT) @PreAuthorize("@ss.hasPermission('system:role:export')") public void export(HttpServletResponse response, @Validated RoleExportReqVO reqVO) throws IOException { + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); + //是子机构，根据机构过滤 + if(adminUserDO.getEnterprise() != null && StringUtils.equals(adminUserDO.getEnterprise().getEnterpriseType(), "1")){ + reqVO.setEnterpriseId(adminUserDO.getEnterpriseId()); + } List list = roleService.getRoleList(reqVO); List data = RoleConvert.INSTANCE.convertList03(list); // 输出 diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleBaseVO.java index 94576b8..4fb3fba 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleBaseVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleBaseVO.java @@ -31,4 +31,7 @@ public class RoleBaseVO { @Schema(description = "备注", example = "我是一个角色") private String remark; + @Schema(description = "企业ID", example = "1024") + private Long enterpriseId; + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleExcelVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleExcelVO.java index f742b3e..f051e69 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleExcelVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleExcelVO.java @@ -4,6 +4,7 @@ import com.yunxi.scm.framework.excel.core.annotations.DictFormat; import com.yunxi.scm.framework.excel.core.convert.DictConvert; import com.yunxi.scm.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -31,4 +32,5 @@ public class RoleExcelVO { @DictFormat(DictTypeConstants.COMMON_STATUS) private String status; + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java index c20bed3..80fbce8 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java @@ -25,4 +25,5 @@ public class RoleExportReqVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RolePageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RolePageReqVO.java index 7e9f794..08d01c9 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RolePageReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RolePageReqVO.java @@ -28,4 +28,5 @@ public class RolePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleRespVO.java index 9d203c5..0276074 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleRespVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/permission/vo/role/RoleRespVO.java @@ -34,4 +34,6 @@ public class RoleRespVO extends RoleBaseVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式") private LocalDateTime createTime; + @Schema(description = "企业ID", example = "1024") + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/tenant/TenantController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/tenant/TenantController.java index ca05824..67f652b 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/tenant/TenantController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/tenant/TenantController.java @@ -7,7 +7,9 @@ import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; import com.yunxi.scm.module.system.controller.admin.tenant.vo.tenant.*; import com.yunxi.scm.module.system.convert.tenant.TenantConvert; import com.yunxi.scm.module.system.dal.dataobject.tenant.TenantDO; +import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO; import com.yunxi.scm.module.system.service.tenant.TenantService; +import com.yunxi.scm.module.system.service.user.AdminUserService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -23,6 +25,7 @@ import java.util.List; import static com.yunxi.scm.framework.common.pojo.CommonResult.success; import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static com.yunxi.scm.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - 租户") @RestController @@ -31,6 +34,8 @@ public class TenantController { @Resource private TenantService tenantService; + @Resource + private AdminUserService userService; @GetMapping("/get-id-by-name") @PermitAll @@ -41,6 +46,16 @@ public class TenantController { return success(tenantDO != null ? tenantDO.getId() : null); } + @GetMapping("/get-tenantId-by-userName") + @PermitAll + @Operation(summary = "使用租户名，获得租户编号", description = "登录界面，根据用户的租户名，获得租户编号") + @Parameter(name = "name", description = "租户名", required = true, example = "1024") + public CommonResult getTenantIdByUserName(@RequestParam("name") String name) { + AdminUserDO user = userService.getUserByUsername(name); + TenantDO tenantDO = tenantService.getTenant(user.getTenantId()); + return success(tenantDO != null ? tenantDO.getId() : null); + } + @PostMapping("/create") @Operation(summary = "创建租户") @PreAuthorize("@ss.hasPermission('system:tenant:create')") diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java index c3687ca..fc91ade 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java @@ -1,6 +1,7 @@ package com.yunxi.scm.module.system.controller.admin.user; import cn.hutool.core.collection.CollUtil; +import com.yunxi.scm.framework.security.core.util.SecurityFrameworkUtils; import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptListReqVO; import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO; import com.yunxi.scm.module.system.controller.admin.user.vo.user.*; @@ -94,6 +95,7 @@ public class UserController { @PreAuthorize("@ss.hasPermission('system:user:list')") public CommonResult> getUserPage(@Valid UserPageReqVO reqVO) { // 获得用户分页列表 + AdminUserDO adminUserDO = userService.getUser(SecurityFrameworkUtils.getLoginUserId()); PageResult pageResult = userService.getUserPage(reqVO); if (CollUtil.isEmpty(pageResult.getList())) { return success(new PageResult<>(pageResult.getTotal())); // 返回空 diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/user/UserBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/user/UserBaseVO.java index 0a28360..a2ff09c 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/user/UserBaseVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/user/UserBaseVO.java @@ -8,6 +8,7 @@ import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; +import java.time.LocalDateTime; import java.util.Set; /** @@ -51,4 +52,31 @@ public class UserBaseVO { @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png") private String avatar; + @Schema(description = "员工工号", example = "123") + private String jobNumber; + + @Schema(description = "微信账号", example = "123") + private String wechatAccount; + + @Schema(description = "出生日期", example = "123") + private LocalDateTime birthDatetime; + + @Schema(description = "籍贯", example = "123") + private String nativePlace; + + @Schema(description = "学历", example = "123") + private String education; + + @Schema(description = "专业", example = "123") + private String speciality; + + @Schema(description = "毕业院校", example = "123") + private String graduationInstitution; + + @Schema(description = "毕业时间", example = "123") + private LocalDateTime institutionDatatime; + + @Schema(description = "个人简介", example = "123") + private String personalProfile; + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/auth/AuthConvert.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/auth/AuthConvert.java index 6d5bec3..79966dd 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/auth/AuthConvert.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/auth/AuthConvert.java @@ -28,7 +28,7 @@ public interface AuthConvert { default AuthPermissionInfoRespVO convert(AdminUserDO user, List roleList, List menuList) { return AuthPermissionInfoRespVO.builder() - .user(AuthPermissionInfoRespVO.UserVO.builder().id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).build()) + .user(AuthPermissionInfoRespVO.UserVO.builder().id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).enterprise(user.getEnterprise()).businessWarehouseList(user.getBusinessWarehouseList()).tenantDO(user.getTenantDO()).tenantDOList(user.getTenantDOList()).enterpriseList(user.getEnterpriseList()).build()) .roles(convertSet(roleList, RoleDO::getCode)) // 权限标识信息 .permissions(convertSet(menuList, MenuDO::getPermission)) diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businessenterpriserelational/BusinessEnterpriseRelationalConvert.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businessenterpriserelational/BusinessEnterpriseRelationalConvert.java new file mode 100644 index 0000000..a2f19ec --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businessenterpriserelational/BusinessEnterpriseRelationalConvert.java @@ -0,0 +1,34 @@ +package com.yunxi.scm.module.system.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.system.controller.admin.businessenterpriserelational.vo.*; +import com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businessuserrelational/BusinessUserRelationalConvert.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businessuserrelational/BusinessUserRelationalConvert.java new file mode 100644 index 0000000..7c20981 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businessuserrelational/BusinessUserRelationalConvert.java @@ -0,0 +1,34 @@ +package com.yunxi.scm.module.system.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.system.controller.admin.businessuserrelational.vo.*; +import com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businessenterpriserelational/BusinessEnterpriseRelationalDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businessenterpriserelational/BusinessEnterpriseRelationalDO.java new file mode 100644 index 0000000..ef4fd9c --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businessenterpriserelational/BusinessEnterpriseRelationalDO.java @@ -0,0 +1,39 @@ +package com.yunxi.scm.module.system.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("system_business_enterprise_relational") +@KeySequence("system_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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businessuserrelational/BusinessUserRelationalDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businessuserrelational/BusinessUserRelationalDO.java new file mode 100644 index 0000000..cf2e542 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businessuserrelational/BusinessUserRelationalDO.java @@ -0,0 +1,39 @@ +package com.yunxi.scm.module.system.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("system_business_user_relational") +@KeySequence("system_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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java index 1968228..2471156 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java @@ -7,6 +7,7 @@ import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -64,4 +65,9 @@ public class DeptDO extends TenantBaseDO { */ private Integer status; + /** + * 企业id + */ + private Long enterpriseId; + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/PostDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/PostDO.java index c71281f..5f5eeb2 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/PostDO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/PostDO.java @@ -5,6 +5,7 @@ import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -47,4 +48,9 @@ public class PostDO extends BaseDO { */ private String remark; + /** + * 企业id + */ + private Long enterpriseId; + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/permission/RoleDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/permission/RoleDO.java index 09163bc..c1233a3 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/permission/RoleDO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/permission/RoleDO.java @@ -75,4 +75,8 @@ public class RoleDO extends TenantBaseDO { @TableField(typeHandler = JsonLongSetTypeHandler.class) private Set dataScopeDeptIds; + /** + * 企业id + */ + private Long enterpriseId; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/tenant/TenantDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/tenant/TenantDO.java index ed20ccd..03736bf 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/tenant/TenantDO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/tenant/TenantDO.java @@ -1,13 +1,17 @@ package com.yunxi.scm.module.system.dal.dataobject.tenant; +import com.baomidou.mybatisplus.annotation.TableField; import com.yunxi.scm.framework.common.enums.CommonStatusEnum; import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; import java.time.LocalDateTime; +import java.util.List; /** * 租户 DO @@ -79,4 +83,8 @@ public class TenantDO extends BaseDO { */ private Integer accountCount; + @TableField(exist = false) + private List enterpriseList; + + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/user/AdminUserDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/user/AdminUserDO.java index f991239..109e9b5 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/user/AdminUserDO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/user/AdminUserDO.java @@ -3,6 +3,9 @@ package com.yunxi.scm.module.system.dal.dataobject.user; import com.yunxi.scm.framework.common.enums.CommonStatusEnum; import com.yunxi.scm.framework.mybatis.core.type.JsonLongSetTypeHandler; import com.yunxi.scm.framework.tenant.core.db.TenantBaseDO; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; +import com.yunxi.scm.module.system.dal.dataobject.tenant.TenantDO; import com.yunxi.scm.module.system.enums.common.SexEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; @@ -12,6 +15,7 @@ import lombok.*; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import java.time.LocalDateTime; +import java.util.List; import java.util.Set; /** @@ -92,5 +96,59 @@ public class AdminUserDO extends TenantBaseDO { * 最后登录时间 */ private LocalDateTime loginDate; + /** + * 员工工号 + */ + private String jobNumber; + /** + * 微信账号 + */ + private String wechatAccount; + /** + * 出生日期 + */ + private LocalDateTime birthDatetime; + /** + * 籍贯 + */ + private String nativePlace; + /** + * 学历 + */ + private String education; + /** + * 专业 + */ + private String speciality; + /** + * 毕业院校 + */ + private String graduationInstitution; + /** + * 毕业时间 + */ + private LocalDateTime institutionDatatime; + /** + * 个人简介 + */ + private String personalProfile; + + private Long defaultEnterpriseId; + + private Long enterpriseId; + + @TableField(exist = false) + private List tenantDOList; + + @TableField(exist = false) + private List enterpriseList; + + @TableField(exist = false) + private List businessWarehouseList; + + @TableField(exist = false) + private EnterpriseDO enterprise; + @TableField(exist = false) + private TenantDO tenantDO; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businessenterpriserelational/BusinessEnterpriseRelationalMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businessenterpriserelational/BusinessEnterpriseRelationalMapper.java new file mode 100644 index 0000000..07e0ad3 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businessenterpriserelational/BusinessEnterpriseRelationalMapper.java @@ -0,0 +1,36 @@ +package com.yunxi.scm.module.system.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.system.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO; +import org.apache.ibatis.annotations.Mapper; +import com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businessuserrelational/BusinessUserRelationalMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businessuserrelational/BusinessUserRelationalMapper.java new file mode 100644 index 0000000..05d3c41 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businessuserrelational/BusinessUserRelationalMapper.java @@ -0,0 +1,36 @@ +package com.yunxi.scm.module.system.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.system.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; +import org.apache.ibatis.annotations.Mapper; +import com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/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 index 78d671f..12b7d9d 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/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 @@ -2,12 +2,19 @@ package com.yunxi.scm.module.system.dal.mysql.businesswarehouse; import java.util.*; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; 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.system.controller.admin.dept.vo.dept.DeptListReqVO; +import com.yunxi.scm.module.system.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import com.yunxi.scm.module.system.dal.dataobject.dept.DeptDO; +import com.yunxi.scm.module.system.dal.dataobject.dept.PostDO; +import com.yunxi.scm.module.system.dal.dataobject.dept.UserPostDO; +import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO; import org.apache.ibatis.annotations.Mapper; import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*; @@ -75,4 +82,50 @@ public interface BusinessWarehouseMapper extends BaseMapperX getBusinessWarehouseListByUserId(Long id); + + default PageResult selectBusinessPage(BusinessWarehousePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessWarehouseDO::getBusinessCode, reqVO.getBusinessCode()) + .likeIfPresent(BusinessWarehouseDO::getName, reqVO.getName()) + .eqIfPresent(BusinessWarehouseDO::getBusinessSimple, reqVO.getBusinessSimple()) + .eqIfPresent(BusinessWarehouseDO::getBusinessLogo, reqVO.getBusinessLogo()) + .eqIfPresent(BusinessWarehouseDO::getParentId, reqVO.getParentId()) + .eqIfPresent(BusinessWarehouseDO::getType, reqVO.getType()) + .eqIfPresent(BusinessWarehouseDO::getStatus, reqVO.getStatus()) + .eqIfPresent(BusinessWarehouseDO::getInstitutionNum, reqVO.getInstitutionNum()) + .eqIfPresent(BusinessWarehouseDO::getEmployeeNum, reqVO.getEmployeeNum()) + .eqIfPresent(BusinessWarehouseDO::getIndustry, reqVO.getIndustry()) + .eqIfPresent(BusinessWarehouseDO::getCity, reqVO.getCity()) + .betweenIfPresent(BusinessWarehouseDO::getEstablishDate, reqVO.getEstablishDate()) + .eqIfPresent(BusinessWarehouseDO::getBelongUserId, reqVO.getBelongUserId()) + .likeIfPresent(BusinessWarehouseDO::getBrandName, reqVO.getBrandName()) + .eqIfPresent(BusinessWarehouseDO::getPhone, reqVO.getPhone()) + .eqIfPresent(BusinessWarehouseDO::getDiffFlag, "0") + .eqIfPresent(BusinessWarehouseDO::getFax, reqVO.getFax()) + .eqIfPresent(BusinessWarehouseDO::getUrl, reqVO.getUrl()) + .eqIfPresent(BusinessWarehouseDO::getDescription, reqVO.getDescription()) + .betweenIfPresent(BusinessWarehouseDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(BusinessWarehouseDO::getId)); + } + + default IPage selectBusinessUserPage(Page page,BusinessUserVO reqVO) { + return selectJoinPage(page,BusinessUserVO.class, new MPJLambdaWrapper() + .selectAll(AdminUserDO.class) + .selectAs(AdminUserDO::getStatus, BusinessUserVO::getAccountStatus) + .selectAs(DeptDO::getName, BusinessUserVO::getDeptName) + .selectAs(PostDO::getName, BusinessUserVO::getPostName) + .selectAs(BusinessWarehouseDO::getName, BusinessUserVO::getBusinessName) + .leftJoin(BusinessUserRelationalDO.class, BusinessUserRelationalDO::getBusinessId, BusinessWarehouseDO::getId) + .eq(reqVO.getBusinessId() != null,BusinessWarehouseDO::getId,reqVO.getBusinessId()) + .leftJoin(AdminUserDO.class, AdminUserDO::getId, BusinessUserRelationalDO::getUserId) + .like(reqVO.getNickname() != null,AdminUserDO::getNickname,reqVO.getNickname()) + .leftJoin(DeptDO.class,DeptDO::getId,AdminUserDO::getDeptId) + .leftJoin(UserPostDO.class,UserPostDO::getUserId,AdminUserDO::getId) + .leftJoin(PostDO.class,PostDO::getId,UserPostDO::getPostId) + ); + } + + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/dept/DeptMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/dept/DeptMapper.java index ded5820..f75e1a6 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/dept/DeptMapper.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/dept/DeptMapper.java @@ -15,7 +15,8 @@ public interface DeptMapper extends BaseMapperX { default List selectList(DeptListReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .likeIfPresent(DeptDO::getName, reqVO.getName()) - .eqIfPresent(DeptDO::getStatus, reqVO.getStatus())); + .eqIfPresent(DeptDO::getStatus, reqVO.getStatus()) + .eqIfPresent(DeptDO::getEnterpriseId, reqVO.getEnterpriseId())); } default DeptDO selectByParentIdAndName(Long parentId, String name) { diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/dept/PostMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/dept/PostMapper.java index 0301696..8801c2c 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/dept/PostMapper.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/dept/PostMapper.java @@ -25,6 +25,7 @@ public interface PostMapper extends BaseMapperX { .likeIfPresent(PostDO::getCode, reqVO.getCode()) .likeIfPresent(PostDO::getName, reqVO.getName()) .eqIfPresent(PostDO::getStatus, reqVO.getStatus()) + .eqIfPresent(PostDO::getEnterpriseId, reqVO.getEnterpriseId()) .orderByDesc(PostDO::getId)); } @@ -32,6 +33,7 @@ public interface PostMapper extends BaseMapperX { return selectList(new LambdaQueryWrapperX() .likeIfPresent(PostDO::getCode, reqVO.getCode()) .likeIfPresent(PostDO::getName, reqVO.getName()) + .eqIfPresent(PostDO::getEnterpriseId, reqVO.getEnterpriseId()) .eqIfPresent(PostDO::getStatus, reqVO.getStatus())); } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/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 index 4778927..8ba3509 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/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 @@ -8,6 +8,7 @@ import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; import org.apache.ibatis.annotations.Mapper; import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*; +import org.apache.ibatis.annotations.Param; /** * 企业信息 Mapper @@ -51,4 +52,5 @@ public interface EnterpriseMapper extends BaseMapperX { .orderByDesc(EnterpriseDO::getId)); } + List getEnterpriseListByTenantId(@Param("tenantId") Long tenantId, @Param("userId") Long userId); } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/permission/RoleMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/permission/RoleMapper.java index cd59645..6802de3 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/permission/RoleMapper.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/permission/RoleMapper.java @@ -21,6 +21,7 @@ public interface RoleMapper extends BaseMapperX { .likeIfPresent(RoleDO::getName, reqVO.getName()) .likeIfPresent(RoleDO::getCode, reqVO.getCode()) .eqIfPresent(RoleDO::getStatus, reqVO.getStatus()) + .eqIfPresent(RoleDO::getEnterpriseId, reqVO.getEnterpriseId()) .betweenIfPresent(BaseDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(RoleDO::getId)); } @@ -30,6 +31,7 @@ public interface RoleMapper extends BaseMapperX { .likeIfPresent(RoleDO::getName, reqVO.getName()) .likeIfPresent(RoleDO::getCode, reqVO.getCode()) .eqIfPresent(RoleDO::getStatus, reqVO.getStatus()) + .eqIfPresent(RoleDO::getEnterpriseId, reqVO.getEnterpriseId()) .betweenIfPresent(BaseDO::getCreateTime, reqVO.getCreateTime())); } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/tenant/TenantMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/tenant/TenantMapper.java index 79bc109..a4c71ef 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/tenant/TenantMapper.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/tenant/TenantMapper.java @@ -50,4 +50,5 @@ public interface TenantMapper extends BaseMapperX { return selectList(TenantDO::getPackageId, packageId); } + List getTenantListByUserId(Long id); } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/auth/AdminAuthServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/auth/AdminAuthServiceImpl.java index bda0b33..489500a 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/auth/AdminAuthServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/auth/AdminAuthServiceImpl.java @@ -105,7 +105,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState())); } // 创建 Token 令牌，记录登录日志 - return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); + return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(),user.getTenantId(), LoginLogTypeEnum.LOGIN_USERNAME); } @Override @@ -130,7 +130,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { } // 创建 Token 令牌，记录登录日志 - return createTokenAfterLoginSuccess(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_MOBILE); + return createTokenAfterLoginSuccess(user.getId(), reqVO.getMobile(),user.getTenantId(), LoginLogTypeEnum.LOGIN_MOBILE); } private void createLoginLog(Long userId, String username, @@ -168,7 +168,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { } // 创建 Token 令牌，记录登录日志 - return createTokenAfterLoginSuccess(user.getId(), user.getUsername(), LoginLogTypeEnum.LOGIN_SOCIAL); + return createTokenAfterLoginSuccess(user.getId(), user.getUsername(),user.getTenantId(), LoginLogTypeEnum.LOGIN_SOCIAL); } @VisibleForTesting @@ -190,14 +190,16 @@ public class AdminAuthServiceImpl implements AdminAuthService { } } - private AuthLoginRespVO createTokenAfterLoginSuccess(Long userId, String username, LoginLogTypeEnum logType) { + private AuthLoginRespVO createTokenAfterLoginSuccess(Long userId, String username,Long tenantId, LoginLogTypeEnum logType) { // 插入登陆日志 createLoginLog(userId, username, logType, LoginResultEnum.SUCCESS); // 创建访问令牌 OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.createAccessToken(userId, getUserType().getValue(), OAuth2ClientConstants.CLIENT_ID_DEFAULT, null); + AuthLoginRespVO authLoginRespVO = AuthConvert.INSTANCE.convert(accessTokenDO); // 构建返回结果 - return AuthConvert.INSTANCE.convert(accessTokenDO); + authLoginRespVO.setTenantId(tenantId); + return authLoginRespVO; } @Override diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessenterpriserelational/BusinessEnterpriseRelationalService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessenterpriserelational/BusinessEnterpriseRelationalService.java new file mode 100644 index 0000000..6f2f964 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessenterpriserelational/BusinessEnterpriseRelationalService.java @@ -0,0 +1,70 @@ +package com.yunxi.scm.module.system.service.businessenterpriserelational; + +import java.util.*; +import javax.validation.*; +import com.yunxi.scm.module.system.controller.admin.businessenterpriserelational.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO; +import com.yunxi.scm.framework.common.pojo.PageResult; + +/** + * 业务线和机构关联 Service 接口 + * + * @author 长江云息 + */ +public interface BusinessEnterpriseRelationalService { + + /** + * 创建业务线和机构关联 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createBusinessEnterpriseRelational(@Valid BusinessEnterpriseRelationalCreateReqVO createReqVO); + + /** + * 更新业务线和机构关联 + * + * @param updateReqVO 更新信息 + */ + void updateBusinessEnterpriseRelational(@Valid BusinessEnterpriseRelationalUpdateReqVO updateReqVO); + + /** + * 删除业务线和机构关联 + * + * @param id 编号 + */ + void deleteBusinessEnterpriseRelational(Long id); + + /** + * 获得业务线和机构关联 + * + * @param id 编号 + * @return 业务线和机构关联 + */ + BusinessEnterpriseRelationalDO getBusinessEnterpriseRelational(Long id); + + /** + * 获得业务线和机构关联列表 + * + * @param ids 编号 + * @return 业务线和机构关联列表 + */ + List getBusinessEnterpriseRelationalList(Collection ids); + + /** + * 获得业务线和机构关联分页 + * + * @param pageReqVO 分页查询 + * @return 业务线和机构关联分页 + */ + PageResult getBusinessEnterpriseRelationalPage(BusinessEnterpriseRelationalPageReqVO pageReqVO); + + /** + * 获得业务线和机构关联列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 业务线和机构关联列表 + */ + List getBusinessEnterpriseRelationalList(BusinessEnterpriseRelationalExportReqVO exportReqVO); + +} diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImpl.java new file mode 100644 index 0000000..bad62dd --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImpl.java @@ -0,0 +1,82 @@ +package com.yunxi.scm.module.system.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.system.controller.admin.businessenterpriserelational.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO; +import com.yunxi.scm.framework.common.pojo.PageResult; + +import com.yunxi.scm.module.system.convert.businessenterpriserelational.BusinessEnterpriseRelationalConvert; +import com.yunxi.scm.module.system.dal.mysql.businessenterpriserelational.BusinessEnterpriseRelationalMapper; + +import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessuserrelational/BusinessUserRelationalService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessuserrelational/BusinessUserRelationalService.java new file mode 100644 index 0000000..cf10e5c --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessuserrelational/BusinessUserRelationalService.java @@ -0,0 +1,70 @@ +package com.yunxi.scm.module.system.service.businessuserrelational; + +import java.util.*; +import javax.validation.*; +import com.yunxi.scm.module.system.controller.admin.businessuserrelational.vo.*; +import com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessuserrelational/BusinessUserRelationalServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessuserrelational/BusinessUserRelationalServiceImpl.java new file mode 100644 index 0000000..15db19a --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessuserrelational/BusinessUserRelationalServiceImpl.java @@ -0,0 +1,82 @@ +package com.yunxi.scm.module.system.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.system.controller.admin.businessuserrelational.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businessuserrelational.BusinessUserRelationalDO; +import com.yunxi.scm.framework.common.pojo.PageResult; + +import com.yunxi.scm.module.system.convert.businessuserrelational.BusinessUserRelationalConvert; +import com.yunxi.scm.module.system.dal.mysql.businessuserrelational.BusinessUserRelationalMapper; + +import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.yunxi.scm.module.system.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-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java index cc5e2c9..80272b3 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java @@ -59,6 +59,14 @@ public interface BusinessWarehouseService { */ PageResult getBusinessWarehousePage(BusinessWarehousePageReqVO pageReqVO); + /** + * 获得业务线分页 + * + * @param pageReqVO 分页查询 + * @return 业务线表分页 + */ + PageResult getBusinessPage(BusinessWarehousePageReqVO pageReqVO); + /** * 获得业务线表列表, 用于 Excel 导出 * @@ -72,4 +80,16 @@ public interface BusinessWarehouseService { * */ List getBusinessSimpleList(BusinessWarehousePageReqVO pageReqVO); + + /** + * 根据用户id获得业务线表列表 + * + * @param id 用户id + * @return 业务线表列表 + */ + List getBusinessWarehouseListByUserId(Long id); + + PageResult getBusinessUserList(BusinessUserVO reqVO); + + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java index eda6b62..22684ce 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/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,5 +1,7 @@ package com.yunxi.scm.module.system.service.businesswarehouse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -74,6 +76,11 @@ public class BusinessWarehouseServiceImpl implements BusinessWarehouseService { return businessWarehouseMapper.selectPage(pageReqVO); } + @Override + public PageResult getBusinessPage(BusinessWarehousePageReqVO pageReqVO) { + return businessWarehouseMapper.selectBusinessPage(pageReqVO); + } + @Override public List getBusinessWarehouseList(BusinessWarehouseExportReqVO exportReqVO) { return businessWarehouseMapper.selectList(exportReqVO); @@ -84,4 +91,15 @@ public class BusinessWarehouseServiceImpl implements BusinessWarehouseService { return businessWarehouseMapper.simpleBusiness(pageReqVO); } + @Override + public List getBusinessWarehouseListByUserId(Long id) { + return businessWarehouseMapper.getBusinessWarehouseListByUserId(id); + } + @Override + public PageResult getBusinessUserList(BusinessUserVO reqVO) { + Page page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize()); + IPage result = businessWarehouseMapper.selectBusinessUserPage(page,reqVO); + return new PageResult<>(result.getRecords(), result.getTotal()); + } + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java index 300512f..d8e9c1a 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java @@ -67,4 +67,12 @@ public interface EnterpriseService { */ List getEnterpriseList(EnterpriseExportReqVO exportReqVO); + /** + * 获得租户id机构 + * + * @param tenantId 租户id + * @param userId 用户id + * @return 企业信息列表 + */ + List getEnterpriseListByTenantId(Long tenantId, Long userId); } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java index 65b5b31..3f04cd7 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java @@ -79,4 +79,9 @@ public class EnterpriseServiceImpl implements EnterpriseService { return enterpriseMapper.selectList(exportReqVO); } + @Override + public List getEnterpriseListByTenantId(Long tenantId, Long userId) { + return enterpriseMapper.getEnterpriseListByTenantId(tenantId, userId); + } + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/permission/MenuServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/permission/MenuServiceImpl.java index d3306ee..0b217b9 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/permission/MenuServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/permission/MenuServiceImpl.java @@ -27,6 +27,7 @@ import static com.yunxi.scm.framework.common.util.collection.CollectionUtils.con import static com.yunxi.scm.module.system.dal.dataobject.permission.MenuDO.ID_ROOT; import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*; + /** * 菜单 Service 实现 * @@ -45,7 +46,9 @@ public class MenuServiceImpl implements MenuService { private TenantService tenantService; @Override - @CacheEvict(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, key = "#reqVO.permission") + @CacheEvict(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, key = "#reqVO.permission", condition="#reqVO.permission != null") +// @CacheEvict(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, key = "#reqVO.permission", +// condition="T(com.yunxi.scm.module.system.enums.permission.MenuTypeEnum).isNoDIR(#reqVO.type)") public Long createMenu(MenuCreateReqVO reqVO) { // 校验父菜单存在 validateParentMenu(reqVO.getParentId(), null); diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/tenant/TenantService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/tenant/TenantService.java index 7632e45..8dc4103 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/tenant/TenantService.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/tenant/TenantService.java @@ -128,4 +128,11 @@ public interface TenantService { * @param id 租户编号 */ void validTenant(Long id); + + /** + * 根据用户id对应租户 + * + * @param id 用户编号 + */ + List getTenantListByUserId(Long id); } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/tenant/TenantServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/tenant/TenantServiceImpl.java index 621f1ed..0662a9d 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/tenant/TenantServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/tenant/TenantServiceImpl.java @@ -95,6 +95,11 @@ public class TenantServiceImpl implements TenantService { } } + @Override + public List getTenantListByUserId(Long id) { + return tenantMapper.getTenantListByUserId(id); + } + @Override @DSTransactional // 多数据源，使用 @DSTransactional 保证本地事务，以及数据源的切换 public Long createTenant(TenantCreateReqVO createReqVO) { diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/user/AdminUserServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/user/AdminUserServiceImpl.java index 3e42b4c..ad05fec 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/user/AdminUserServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/user/AdminUserServiceImpl.java @@ -14,13 +14,18 @@ import com.yunxi.scm.module.system.controller.admin.user.vo.profile.UserProfileU import com.yunxi.scm.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; import com.yunxi.scm.module.system.controller.admin.user.vo.user.*; import com.yunxi.scm.module.system.convert.user.UserConvert; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import com.yunxi.scm.module.system.dal.dataobject.dept.DeptDO; import com.yunxi.scm.module.system.dal.dataobject.dept.UserPostDO; +import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO; +import com.yunxi.scm.module.system.dal.dataobject.tenant.TenantDO; import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO; import com.yunxi.scm.module.system.dal.mysql.dept.UserPostMapper; import com.yunxi.scm.module.system.dal.mysql.user.AdminUserMapper; +import com.yunxi.scm.module.system.service.businesswarehouse.BusinessWarehouseService; import com.yunxi.scm.module.system.service.dept.DeptService; import com.yunxi.scm.module.system.service.dept.PostService; +import com.yunxi.scm.module.system.service.enterprise.EnterpriseService; import com.yunxi.scm.module.system.service.permission.PermissionService; import com.yunxi.scm.module.system.service.tenant.TenantService; import com.google.common.annotations.VisibleForTesting; @@ -71,6 +76,12 @@ public class AdminUserServiceImpl implements AdminUserService { @Resource private UserPostMapper userPostMapper; + @Resource + private EnterpriseService enterpriseService; + + @Resource + private BusinessWarehouseService businessWarehouseService; + @Resource private FileApi fileApi; @@ -220,7 +231,28 @@ public class AdminUserServiceImpl implements AdminUserService { @Override public AdminUserDO getUser(Long id) { - return userMapper.selectById(id); + AdminUserDO adminUserDO = userMapper.selectById(id); + //查询对应的租户 + List tenantDOList = tenantService.getTenantListByUserId(adminUserDO.getId()); + for (TenantDO tenantDO: tenantDOList) { + //查询租户下的机构 + List enterpriseList = enterpriseService.getEnterpriseListByTenantId(tenantDO.getId(), adminUserDO.getId()); + tenantDO.setEnterpriseList(enterpriseList); + if(adminUserDO.getTenantId().equals(tenantDO.getId())){ + adminUserDO.setEnterpriseList(enterpriseList); + } + } + adminUserDO.setTenantDOList(tenantDOList); + //根据userID查找对应业务线 + List businessWarehouseDOList = businessWarehouseService.getBusinessWarehouseListByUserId(adminUserDO.getId()); + adminUserDO.setBusinessWarehouseList(businessWarehouseDOList); + //查询当前企业信息 + EnterpriseDO enterpriseDO = enterpriseService.getEnterprise(adminUserDO.getEnterpriseId()); + adminUserDO.setEnterprise(enterpriseDO); + //查询当前租户信息 + TenantDO tenantDO = tenantService.getTenant(adminUserDO.getTenantId()); + adminUserDO.setTenantDO(tenantDO); + return adminUserDO; } @Override diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/businesswarehouse/BusinessWarehouseMapper.xml b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/businesswarehouse/BusinessWarehouseMapper.xml new file mode 100644 index 0000000..bc7c06d --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/businesswarehouse/BusinessWarehouseMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + 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 index e170329..94bf65a 100644 --- 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 @@ -8,5 +8,8 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - + diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/tenant/TenantMapper.xml b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/tenant/TenantMapper.xml new file mode 100644 index 0000000..50212b0 --- /dev/null +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/tenant/TenantMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/SubjectBasicController.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/SubjectBasicController.java new file mode 100644 index 0000000..9dd5c9e --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/SubjectBasicController.java @@ -0,0 +1,102 @@ +package com.yunxi.scm.module.xxjj.controller.admin.subjectbasic; + +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.subjectbasic.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.subjectbasic.SubjectBasicDO; +import com.yunxi.scm.module.xxjj.convert.subjectbasic.SubjectBasicConvert; +import com.yunxi.scm.module.xxjj.service.subjectbasic.SubjectBasicService; + +@Tag(name = "管理后台 - 基础业务信息表(客户，供应商，服务商主体)") +@RestController +@RequestMapping("/xxjj/subject-basic") +@Validated +public class SubjectBasicController { + + @Resource + private SubjectBasicService subjectBasicService; + + @PostMapping("/create") + @Operation(summary = "创建基础业务信息表(客户，供应商，服务商主体)") + @PreAuthorize("@ss.hasPermission('xxjj:subject-basic:create')") + public CommonResult createSubjectBasic(@Valid @RequestBody SubjectBasicCreateReqVO createReqVO) { + return success(subjectBasicService.createSubjectBasic(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新基础业务信息表(客户，供应商，服务商主体)") + @PreAuthorize("@ss.hasPermission('xxjj:subject-basic:update')") + public CommonResult updateSubjectBasic(@Valid @RequestBody SubjectBasicUpdateReqVO updateReqVO) { + subjectBasicService.updateSubjectBasic(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除基础业务信息表(客户，供应商，服务商主体)") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('xxjj:subject-basic:delete')") + public CommonResult deleteSubjectBasic(@RequestParam("id") Long id) { + subjectBasicService.deleteSubjectBasic(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得基础业务信息表(客户，供应商，服务商主体)") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('xxjj:subject-basic:query')") + public CommonResult getSubjectBasic(@RequestParam("id") Long id) { + SubjectBasicDO subjectBasic = subjectBasicService.getSubjectBasic(id); + return success(SubjectBasicConvert.INSTANCE.convert(subjectBasic)); + } + + @GetMapping("/list") + @Operation(summary = "获得基础业务信息表(客户，供应商，服务商主体)列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('xxjj:subject-basic:query')") + public CommonResult> getSubjectBasicList(@RequestParam("ids") Collection ids) { + List list = subjectBasicService.getSubjectBasicList(ids); + return success(SubjectBasicConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得基础业务信息表(客户，供应商，服务商主体)分页") + @PreAuthorize("@ss.hasPermission('xxjj:subject-basic:query')") + public CommonResult> getSubjectBasicPage(@Valid SubjectBasicPageReqVO pageVO) { + PageResult pageResult = subjectBasicService.getSubjectBasicPage(pageVO); + return success(SubjectBasicConvert.INSTANCE.convertPage(pageResult)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出基础业务信息表(客户，供应商，服务商主体) Excel") + @PreAuthorize("@ss.hasPermission('xxjj:subject-basic:export')") + @OperateLog(type = EXPORT) + public void exportSubjectBasicExcel(@Valid SubjectBasicExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = subjectBasicService.getSubjectBasicList(exportReqVO); + // 导出 Excel + List datas = SubjectBasicConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "基础业务信息表(客户，供应商，服务商主体).xls", "数据", SubjectBasicExcelVO.class, datas); + } + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicBaseVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicBaseVO.java new file mode 100644 index 0000000..c9fa9b0 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicBaseVO.java @@ -0,0 +1,271 @@ +package com.yunxi.scm.module.xxjj.controller.admin.subjectbasic.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import javax.validation.constraints.*; +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 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class SubjectBasicBaseVO { + + @Schema(description = "业务类型(0：客户 1：供应商 2：服务商)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "业务类型(0：客户 1：供应商 2：服务商)不能为空") + private String businessType; + + @Schema(description = "分类(0：一级 1：二级 2：三级)", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "分类(0：一级 1：二级 2：三级)不能为空") + private String calssify; + + @Schema(description = "客户名称", example = "赵六") + private String name; + + @Schema(description = "公司logo") + private String logo; + + @Schema(description = "企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)") + private String enterpriseNature; + + @Schema(description = "行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)") + private String industryClassify; + + @Schema(description = "客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)") + private String customerSource; + + @Schema(description = "客户星级(0：一星 1：二星 2：三星 3：四星 4：五星)") + private String customerStarrating; + + @Schema(description = "业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置)") + private String industrySchedule; + + @Schema(description = "归属人员") + private String belongingPeople; + + @Schema(description = "所在城市") + private String city; + + @Schema(description = "国家") + private String country; + + @Schema(description = "详细地址") + private String address; + + @Schema(description = "公司电话") + private String phone; + + @Schema(description = "公司传真") + private String companyFax; + + @Schema(description = "公司网址") + private String companyHttp; + + @Schema(description = "公司介绍") + private String companyProfile; + + @Schema(description = "客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)不能为空") + private String customerStatus; + + @Schema(description = "社会信息代码证（营业执照）") + private String socialInformationCodeCertificate; + + @Schema(description = "注册地址") + private String registerAddress; + + @Schema(description = "社会统一信息代码") + private String informationCode; + + @Schema(description = "经营时间开始") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime operateStart; + + @Schema(description = "经营时间结束") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime operateEnd; + + @Schema(description = "注册资金") + private String registerCapital; + + @Schema(description = "经营范围") + private String businessScope; + + @Schema(description = "实缴资金证明") + private String proofPaidCapital; + + @Schema(description = "资产证明") + private String assetCertificate; + + @Schema(description = "资产抵押证明") + private String assetCertificateMortgage; + + @Schema(description = "其他资质文件") + private String otherQualifications; + + @Schema(description = "合作时间开始") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime collaborationStart; + + @Schema(description = "合作时间结束") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime collaborationEnd; + + @Schema(description = "需求量（每月下限）") + private Long demandVolumeDown; + + @Schema(description = "需求量（每月上限）") + private Long demandVolumeUpper; + + @Schema(description = "资金额度") + private Long fundLimit; + + @Schema(description = "营业时间") + private String businessHours; + + @Schema(description = "营业时间开始") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime businessStart; + + @Schema(description = "营业时间结束") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime businessEnd; + + @Schema(description = "允许卸货时间开始") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime allowableUnloadingStart; + + @Schema(description = "允许卸货时间结束") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime allowableUnloadingEnd; + + @Schema(description = "卸货时长") + private String unloading; + + @Schema(description = "卸货效率") + private String unloadingEfficiency; + + @Schema(description = "允许装货时间开始") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime allowableShipmentStart; + + @Schema(description = "允许装货时间结束") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime allowableShipmentEnd; + + @Schema(description = "装货时长") + private String shipment; + + @Schema(description = "装货效果") + private String shipmentEffciency; + + @Schema(description = "付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)") + private String paymentMethod; + + @Schema(description = "账户名称", example = "李四") + private String accountName; + + @Schema(description = "银行账号", example = "1405") + private String bankAccount; + + @Schema(description = "开户银行") + private String bankDeposit; + + @Schema(description = "开户地区") + private String depositArea; + + @Schema(description = "支行名称") + private String bankBranch; + + @Schema(description = "公司税号") + private String companyTaxNumber; + + @Schema(description = "企业名称", example = "李四") + private String enterpriseName; + + @Schema(description = "单位地址") + private String workAddress; + + @Schema(description = "合作方式(0：买断 1：联营)") + private String collaborationMethod; + + @Schema(description = "结算方式(0:先货后款 1：先款后货)") + private String settlementMethod; + + @Schema(description = "账期") + private String accountPeriod; + + @Schema(description = "压款方式(0：无 1：按金额 2：按比例)") + private String underpaymentMethod; + + @Schema(description = "申请压款比例") + private String applyForUnderpaymentRatio; + + @Schema(description = "保证金方式(0：无 1：按金额 2：按比例)") + private String marginMethod; + + @Schema(description = "申请保证金比例") + private String applyForMarginRatio; + + @Schema(description = "逾期利率(0：按年化1：按月化)") + private String overdueInterestRate; + + @Schema(description = "申请逾期利率") + private String applyForOverdueRatio; + + @Schema(description = "预留字段1") + private String reservedFields1; + + @Schema(description = "预留字段2") + private String reservedFields2; + + @Schema(description = "预留字段3") + private String reservedFields3; + + @Schema(description = "预留字段4") + private String reservedFields4; + + @Schema(description = "预留字段5") + private String reservedFields5; + + @Schema(description = "预留字段6") + private String reservedFields6; + + @Schema(description = "信用级别(0：S 1：A 2：B)") + private String creditRating; + + @Schema(description = "信用级别(0：开启 1：关闭)") + private String autoCreditRating; + + @Schema(description = "应收款上限") + private Long accountsReceivableUpper; + + @Schema(description = "订单量下限") + private Long orderQuantityDown; + + @Schema(description = "订单量上限") + private Long orderQuantityUpper; + + @Schema(description = "应收款项逾期限制") + private Long accountsReceivableOverdue; + + @Schema(description = "完税证明超时限制") + private Long taxPaymentCertificate; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicCreateReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicCreateReqVO.java new file mode 100644 index 0000000..16b2dba --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicCreateReqVO.java @@ -0,0 +1,14 @@ +package com.yunxi.scm.module.xxjj.controller.admin.subjectbasic.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 SubjectBasicCreateReqVO extends SubjectBasicBaseVO { + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicExcelVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicExcelVO.java new file mode 100644 index 0000000..8e019ce --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicExcelVO.java @@ -0,0 +1,263 @@ +package com.yunxi.scm.module.xxjj.controller.admin.subjectbasic.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 基础业务信息表(客户，供应商，服务商主体) Excel VO + * + * @author 长江云息 + */ +@Data +public class SubjectBasicExcelVO { + + @ExcelProperty("编号") + private Long id; + + @ExcelProperty("业务类型(0：客户 1：供应商 2：服务商)") + private String businessType; + + @ExcelProperty("分类(0：一级 1：二级 2：三级)") + private String calssify; + + @ExcelProperty("客户名称") + private String name; + + @ExcelProperty("公司logo") + private String logo; + + @ExcelProperty("企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)") + private String enterpriseNature; + + @ExcelProperty("行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)") + private String industryClassify; + + @ExcelProperty("客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)") + private String customerSource; + + @ExcelProperty("客户星级(0：一星 1：二星 2：三星 3：四星 4：五星)") + private String customerStarrating; + + @ExcelProperty("业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置)") + private String industrySchedule; + + @ExcelProperty("归属人员") + private String belongingPeople; + + @ExcelProperty("所在城市") + private String city; + + @ExcelProperty("国家") + private String country; + + @ExcelProperty("详细地址") + private String address; + + @ExcelProperty("公司电话") + private String phone; + + @ExcelProperty("公司传真") + private String companyFax; + + @ExcelProperty("公司网址") + private String companyHttp; + + @ExcelProperty("公司介绍") + private String companyProfile; + + @ExcelProperty("客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)") + private String customerStatus; + + @ExcelProperty("社会信息代码证（营业执照）") + private String socialInformationCodeCertificate; + + @ExcelProperty("注册地址") + private String registerAddress; + + @ExcelProperty("社会统一信息代码") + private String informationCode; + + @ExcelProperty("经营时间开始") + private LocalDateTime operateStart; + + @ExcelProperty("经营时间结束") + private LocalDateTime operateEnd; + + @ExcelProperty("注册资金") + private String registerCapital; + + @ExcelProperty("经营范围") + private String businessScope; + + @ExcelProperty("实缴资金证明") + private String proofPaidCapital; + + @ExcelProperty("资产证明") + private String assetCertificate; + + @ExcelProperty("资产抵押证明") + private String assetCertificateMortgage; + + @ExcelProperty("其他资质文件") + private String otherQualifications; + + @ExcelProperty("合作时间开始") + private LocalDateTime collaborationStart; + + @ExcelProperty("合作时间结束") + private LocalDateTime collaborationEnd; + + @ExcelProperty("需求量（每月下限）") + private Long demandVolumeDown; + + @ExcelProperty("需求量（每月上限）") + private Long demandVolumeUpper; + + @ExcelProperty("资金额度") + private Long fundLimit; + + @ExcelProperty("营业时间") + private String businessHours; + + @ExcelProperty("营业时间开始") + private LocalDateTime businessStart; + + @ExcelProperty("营业时间结束") + private LocalDateTime businessEnd; + + @ExcelProperty("允许卸货时间开始") + private LocalDateTime allowableUnloadingStart; + + @ExcelProperty("允许卸货时间结束") + private LocalDateTime allowableUnloadingEnd; + + @ExcelProperty("卸货时长") + private String unloading; + + @ExcelProperty("卸货效率") + private String unloadingEfficiency; + + @ExcelProperty("允许装货时间开始") + private LocalDateTime allowableShipmentStart; + + @ExcelProperty("允许装货时间结束") + private LocalDateTime allowableShipmentEnd; + + @ExcelProperty("装货时长") + private String shipment; + + @ExcelProperty("装货效果") + private String shipmentEffciency; + + @ExcelProperty("付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)") + private String paymentMethod; + + @ExcelProperty("账户名称") + private String accountName; + + @ExcelProperty("银行账号") + private String bankAccount; + + @ExcelProperty("开户银行") + private String bankDeposit; + + @ExcelProperty("开户地区") + private String depositArea; + + @ExcelProperty("支行名称") + private String bankBranch; + + @ExcelProperty("公司税号") + private String companyTaxNumber; + + @ExcelProperty("企业名称") + private String enterpriseName; + + @ExcelProperty("单位地址") + private String workAddress; + + @ExcelProperty("合作方式(0：买断 1：联营)") + private String collaborationMethod; + + @ExcelProperty("结算方式(0:先货后款 1：先款后货)") + private String settlementMethod; + + @ExcelProperty("账期") + private String accountPeriod; + + @ExcelProperty("压款方式(0：无 1：按金额 2：按比例)") + private String underpaymentMethod; + + @ExcelProperty("申请压款比例") + private String applyForUnderpaymentRatio; + + @ExcelProperty("保证金方式(0：无 1：按金额 2：按比例)") + private String marginMethod; + + @ExcelProperty("申请保证金比例") + private String applyForMarginRatio; + + @ExcelProperty("逾期利率(0：按年化1：按月化)") + private String overdueInterestRate; + + @ExcelProperty("申请逾期利率") + private String applyForOverdueRatio; + + @ExcelProperty("预留字段1") + private String reservedFields1; + + @ExcelProperty("预留字段2") + private String reservedFields2; + + @ExcelProperty("预留字段3") + private String reservedFields3; + + @ExcelProperty("预留字段4") + private String reservedFields4; + + @ExcelProperty("预留字段5") + private String reservedFields5; + + @ExcelProperty("预留字段6") + private String reservedFields6; + + @ExcelProperty("信用级别(0：S 1：A 2：B)") + private String creditRating; + + @ExcelProperty("信用级别(0：开启 1：关闭)") + private String autoCreditRating; + + @ExcelProperty("应收款上限") + private Long accountsReceivableUpper; + + @ExcelProperty("订单量下限") + private Long orderQuantityDown; + + @ExcelProperty("订单量上限") + private Long orderQuantityUpper; + + @ExcelProperty("应收款项逾期限制") + private Long accountsReceivableOverdue; + + @ExcelProperty("完税证明超时限制") + private Long taxPaymentCertificate; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicExportReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicExportReqVO.java new file mode 100644 index 0000000..03ce393 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicExportReqVO.java @@ -0,0 +1,248 @@ +package com.yunxi.scm.module.xxjj.controller.admin.subjectbasic.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，参数和 SubjectBasicPageReqVO 是一致的") +@Data +public class SubjectBasicExportReqVO { + + @Schema(description = "业务类型(0：客户 1：供应商 2：服务商)", example = "2") + private String businessType; + + @Schema(description = "分类(0：一级 1：二级 2：三级)") + private String calssify; + + @Schema(description = "客户名称", example = "赵六") + private String name; + + @Schema(description = "公司logo") + private String logo; + + @Schema(description = "企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)") + private String enterpriseNature; + + @Schema(description = "行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)") + private String industryClassify; + + @Schema(description = "客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)") + private String customerSource; + + @Schema(description = "客户星级(0：一星 1：二星 2：三星 3：四星 4：五星)") + private String customerStarrating; + + @Schema(description = "业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置)") + private String industrySchedule; + + @Schema(description = "归属人员") + private String belongingPeople; + + @Schema(description = "所在城市") + private String city; + + @Schema(description = "国家") + private String country; + + @Schema(description = "详细地址") + private String address; + + @Schema(description = "公司电话") + private String phone; + + @Schema(description = "公司传真") + private String companyFax; + + @Schema(description = "公司网址") + private String companyHttp; + + @Schema(description = "公司介绍") + private String companyProfile; + + @Schema(description = "客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)", example = "2") + private String customerStatus; + + @Schema(description = "社会信息代码证（营业执照）") + private String socialInformationCodeCertificate; + + @Schema(description = "注册地址") + private String registerAddress; + + @Schema(description = "社会统一信息代码") + private String informationCode; + + @Schema(description = "经营时间开始") + private LocalDateTime operateStart; + + @Schema(description = "经营时间结束") + private LocalDateTime operateEnd; + + @Schema(description = "注册资金") + private String registerCapital; + + @Schema(description = "经营范围") + private String businessScope; + + @Schema(description = "实缴资金证明") + private String proofPaidCapital; + + @Schema(description = "资产证明") + private String assetCertificate; + + @Schema(description = "资产抵押证明") + private String assetCertificateMortgage; + + @Schema(description = "其他资质文件") + private String otherQualifications; + + @Schema(description = "合作时间开始") + private LocalDateTime collaborationStart; + + @Schema(description = "合作时间结束") + private LocalDateTime collaborationEnd; + + @Schema(description = "需求量（每月下限）") + private Long demandVolumeDown; + + @Schema(description = "需求量（每月上限）") + private Long demandVolumeUpper; + + @Schema(description = "资金额度") + private Long fundLimit; + + @Schema(description = "营业时间") + private String businessHours; + + @Schema(description = "营业时间开始") + private LocalDateTime businessStart; + + @Schema(description = "营业时间结束") + private LocalDateTime businessEnd; + + @Schema(description = "允许卸货时间开始") + private LocalDateTime allowableUnloadingStart; + + @Schema(description = "允许卸货时间结束") + private LocalDateTime allowableUnloadingEnd; + + @Schema(description = "卸货时长") + private String unloading; + + @Schema(description = "卸货效率") + private String unloadingEfficiency; + + @Schema(description = "允许装货时间开始") + private LocalDateTime allowableShipmentStart; + + @Schema(description = "允许装货时间结束") + private LocalDateTime allowableShipmentEnd; + + @Schema(description = "装货时长") + private String shipment; + + @Schema(description = "装货效果") + private String shipmentEffciency; + + @Schema(description = "付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)") + private String paymentMethod; + + @Schema(description = "账户名称", example = "李四") + private String accountName; + + @Schema(description = "银行账号", example = "1405") + private String bankAccount; + + @Schema(description = "开户银行") + private String bankDeposit; + + @Schema(description = "开户地区") + private String depositArea; + + @Schema(description = "支行名称") + private String bankBranch; + + @Schema(description = "公司税号") + private String companyTaxNumber; + + @Schema(description = "企业名称", example = "李四") + private String enterpriseName; + + @Schema(description = "单位地址") + private String workAddress; + + @Schema(description = "合作方式(0：买断 1：联营)") + private String collaborationMethod; + + @Schema(description = "结算方式(0:先货后款 1：先款后货)") + private String settlementMethod; + + @Schema(description = "账期") + private String accountPeriod; + + @Schema(description = "压款方式(0：无 1：按金额 2：按比例)") + private String underpaymentMethod; + + @Schema(description = "申请压款比例") + private String applyForUnderpaymentRatio; + + @Schema(description = "保证金方式(0：无 1：按金额 2：按比例)") + private String marginMethod; + + @Schema(description = "申请保证金比例") + private String applyForMarginRatio; + + @Schema(description = "逾期利率(0：按年化1：按月化)") + private String overdueInterestRate; + + @Schema(description = "申请逾期利率") + private String applyForOverdueRatio; + + @Schema(description = "预留字段1") + private String reservedFields1; + + @Schema(description = "预留字段2") + private String reservedFields2; + + @Schema(description = "预留字段3") + private String reservedFields3; + + @Schema(description = "预留字段4") + private String reservedFields4; + + @Schema(description = "预留字段5") + private String reservedFields5; + + @Schema(description = "预留字段6") + private String reservedFields6; + + @Schema(description = "信用级别(0：S 1：A 2：B)") + private String creditRating; + + @Schema(description = "信用级别(0：开启 1：关闭)") + private String autoCreditRating; + + @Schema(description = "应收款上限") + private Long accountsReceivableUpper; + + @Schema(description = "订单量下限") + private Long orderQuantityDown; + + @Schema(description = "订单量上限") + private Long orderQuantityUpper; + + @Schema(description = "应收款项逾期限制") + private Long accountsReceivableOverdue; + + @Schema(description = "完税证明超时限制") + private Long taxPaymentCertificate; + + @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/subjectbasic/vo/SubjectBasicPageReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicPageReqVO.java new file mode 100644 index 0000000..3bf94be --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicPageReqVO.java @@ -0,0 +1,250 @@ +package com.yunxi.scm.module.xxjj.controller.admin.subjectbasic.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 SubjectBasicPageReqVO extends PageParam { + + @Schema(description = "业务类型(0：客户 1：供应商 2：服务商)", example = "2") + private String businessType; + + @Schema(description = "分类(0：一级 1：二级 2：三级)") + private String calssify; + + @Schema(description = "客户名称", example = "赵六") + private String name; + + @Schema(description = "公司logo") + private String logo; + + @Schema(description = "企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)") + private String enterpriseNature; + + @Schema(description = "行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)") + private String industryClassify; + + @Schema(description = "客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)") + private String customerSource; + + @Schema(description = "客户星级(0：一星 1：二星 2：三星 3：四星 4：五星)") + private String customerStarrating; + + @Schema(description = "业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置)") + private String industrySchedule; + + @Schema(description = "归属人员") + private String belongingPeople; + + @Schema(description = "所在城市") + private String city; + + @Schema(description = "国家") + private String country; + + @Schema(description = "详细地址") + private String address; + + @Schema(description = "公司电话") + private String phone; + + @Schema(description = "公司传真") + private String companyFax; + + @Schema(description = "公司网址") + private String companyHttp; + + @Schema(description = "公司介绍") + private String companyProfile; + + @Schema(description = "客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)", example = "2") + private String customerStatus; + + @Schema(description = "社会信息代码证（营业执照）") + private String socialInformationCodeCertificate; + + @Schema(description = "注册地址") + private String registerAddress; + + @Schema(description = "社会统一信息代码") + private String informationCode; + + @Schema(description = "经营时间开始") + private LocalDateTime operateStart; + + @Schema(description = "经营时间结束") + private LocalDateTime operateEnd; + + @Schema(description = "注册资金") + private String registerCapital; + + @Schema(description = "经营范围") + private String businessScope; + + @Schema(description = "实缴资金证明") + private String proofPaidCapital; + + @Schema(description = "资产证明") + private String assetCertificate; + + @Schema(description = "资产抵押证明") + private String assetCertificateMortgage; + + @Schema(description = "其他资质文件") + private String otherQualifications; + + @Schema(description = "合作时间开始") + private LocalDateTime collaborationStart; + + @Schema(description = "合作时间结束") + private LocalDateTime collaborationEnd; + + @Schema(description = "需求量（每月下限）") + private Long demandVolumeDown; + + @Schema(description = "需求量（每月上限）") + private Long demandVolumeUpper; + + @Schema(description = "资金额度") + private Long fundLimit; + + @Schema(description = "营业时间") + private String businessHours; + + @Schema(description = "营业时间开始") + private LocalDateTime businessStart; + + @Schema(description = "营业时间结束") + private LocalDateTime businessEnd; + + @Schema(description = "允许卸货时间开始") + private LocalDateTime allowableUnloadingStart; + + @Schema(description = "允许卸货时间结束") + private LocalDateTime allowableUnloadingEnd; + + @Schema(description = "卸货时长") + private String unloading; + + @Schema(description = "卸货效率") + private String unloadingEfficiency; + + @Schema(description = "允许装货时间开始") + private LocalDateTime allowableShipmentStart; + + @Schema(description = "允许装货时间结束") + private LocalDateTime allowableShipmentEnd; + + @Schema(description = "装货时长") + private String shipment; + + @Schema(description = "装货效果") + private String shipmentEffciency; + + @Schema(description = "付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)") + private String paymentMethod; + + @Schema(description = "账户名称", example = "李四") + private String accountName; + + @Schema(description = "银行账号", example = "1405") + private String bankAccount; + + @Schema(description = "开户银行") + private String bankDeposit; + + @Schema(description = "开户地区") + private String depositArea; + + @Schema(description = "支行名称") + private String bankBranch; + + @Schema(description = "公司税号") + private String companyTaxNumber; + + @Schema(description = "企业名称", example = "李四") + private String enterpriseName; + + @Schema(description = "单位地址") + private String workAddress; + + @Schema(description = "合作方式(0：买断 1：联营)") + private String collaborationMethod; + + @Schema(description = "结算方式(0:先货后款 1：先款后货)") + private String settlementMethod; + + @Schema(description = "账期") + private String accountPeriod; + + @Schema(description = "压款方式(0：无 1：按金额 2：按比例)") + private String underpaymentMethod; + + @Schema(description = "申请压款比例") + private String applyForUnderpaymentRatio; + + @Schema(description = "保证金方式(0：无 1：按金额 2：按比例)") + private String marginMethod; + + @Schema(description = "申请保证金比例") + private String applyForMarginRatio; + + @Schema(description = "逾期利率(0：按年化1：按月化)") + private String overdueInterestRate; + + @Schema(description = "申请逾期利率") + private String applyForOverdueRatio; + + @Schema(description = "预留字段1") + private String reservedFields1; + + @Schema(description = "预留字段2") + private String reservedFields2; + + @Schema(description = "预留字段3") + private String reservedFields3; + + @Schema(description = "预留字段4") + private String reservedFields4; + + @Schema(description = "预留字段5") + private String reservedFields5; + + @Schema(description = "预留字段6") + private String reservedFields6; + + @Schema(description = "信用级别(0：S 1：A 2：B)") + private String creditRating; + + @Schema(description = "信用级别(0：开启 1：关闭)") + private String autoCreditRating; + + @Schema(description = "应收款上限") + private Long accountsReceivableUpper; + + @Schema(description = "订单量下限") + private Long orderQuantityDown; + + @Schema(description = "订单量上限") + private Long orderQuantityUpper; + + @Schema(description = "应收款项逾期限制") + private Long accountsReceivableOverdue; + + @Schema(description = "完税证明超时限制") + private Long taxPaymentCertificate; + + @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/subjectbasic/vo/SubjectBasicRespVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicRespVO.java new file mode 100644 index 0000000..7b5ae44 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicRespVO.java @@ -0,0 +1,19 @@ +package com.yunxi.scm.module.xxjj.controller.admin.subjectbasic.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 SubjectBasicRespVO extends SubjectBasicBaseVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11809") + 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/subjectbasic/vo/SubjectBasicUpdateReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicUpdateReqVO.java new file mode 100644 index 0000000..0266766 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.yunxi.scm.module.xxjj.controller.admin.subjectbasic.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 SubjectBasicUpdateReqVO extends SubjectBasicBaseVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11809") + @NotNull(message = "编号不能为空") + private Long id; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/subjectbasic/SubjectBasicConvert.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/subjectbasic/SubjectBasicConvert.java new file mode 100644 index 0000000..e04b766 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/subjectbasic/SubjectBasicConvert.java @@ -0,0 +1,34 @@ +package com.yunxi.scm.module.xxjj.convert.subjectbasic; + +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.subjectbasic.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.subjectbasic.SubjectBasicDO; + +/** + * 基础业务信息表(客户，供应商，服务商主体) Convert + * + * @author 长江云息 + */ +@Mapper +public interface SubjectBasicConvert { + + SubjectBasicConvert INSTANCE = Mappers.getMapper(SubjectBasicConvert.class); + + SubjectBasicDO convert(SubjectBasicCreateReqVO bean); + + SubjectBasicDO convert(SubjectBasicUpdateReqVO bean); + + SubjectBasicRespVO convert(SubjectBasicDO 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/subjectbasic/SubjectBasicDO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/subjectbasic/SubjectBasicDO.java new file mode 100644 index 0000000..f0909ce --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/subjectbasic/SubjectBasicDO.java @@ -0,0 +1,345 @@ +package com.yunxi.scm.module.xxjj.dal.dataobject.subjectbasic; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +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_subject_basic") +@KeySequence("xxjj_subject_basic_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SubjectBasicDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 业务类型(0：客户 1：供应商 2：服务商) + */ + private String businessType; + /** + * 分类(0：一级 1：二级 2：三级) + */ + private String calssify; + /** + * 客户名称 + */ + private String name; + /** + * 公司logo + */ + private String logo; + /** + * 企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业) + */ + private String enterpriseNature; + /** + * 行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电) + */ + private String industryClassify; + /** + * 客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径) + */ + private String customerSource; + /** + * 客户星级(0：一星 1：二星 2：三星 3：四星 4：五星) + */ + private String customerStarrating; + /** + * 业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置) + */ + private String industrySchedule; + /** + * 归属人员 + */ + private String belongingPeople; + /** + * 所在城市 + */ + private String city; + /** + * 国家 + */ + private String country; + /** + * 详细地址 + */ + private String address; + /** + * 公司电话 + */ + private String phone; + /** + * 公司传真 + */ + private String companyFax; + /** + * 公司网址 + */ + private String companyHttp; + /** + * 公司介绍 + */ + private String companyProfile; + /** + * 客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭) + */ + private String customerStatus; + /** + * 社会信息代码证（营业执照） + */ + private String socialInformationCodeCertificate; + /** + * 注册地址 + */ + private String registerAddress; + /** + * 社会统一信息代码 + */ + private String informationCode; + /** + * 经营时间开始 + */ + private LocalDateTime operateStart; + /** + * 经营时间结束 + */ + private LocalDateTime operateEnd; + /** + * 注册资金 + */ + private String registerCapital; + /** + * 经营范围 + */ + private String businessScope; + /** + * 实缴资金证明 + */ + private String proofPaidCapital; + /** + * 资产证明 + */ + private String assetCertificate; + /** + * 资产抵押证明 + */ + private String assetCertificateMortgage; + /** + * 其他资质文件 + */ + private String otherQualifications; + /** + * 合作时间开始 + */ + private LocalDateTime collaborationStart; + /** + * 合作时间结束 + */ + private LocalDateTime collaborationEnd; + /** + * 需求量（每月下限） + */ + private Long demandVolumeDown; + /** + * 需求量（每月上限） + */ + private Long demandVolumeUpper; + /** + * 资金额度 + */ + private Long fundLimit; + /** + * 营业时间 + */ + private String businessHours; + /** + * 营业时间开始 + */ + private LocalDateTime businessStart; + /** + * 营业时间结束 + */ + private LocalDateTime businessEnd; + /** + * 允许卸货时间开始 + */ + private LocalDateTime allowableUnloadingStart; + /** + * 允许卸货时间结束 + */ + private LocalDateTime allowableUnloadingEnd; + /** + * 卸货时长 + */ + private String unloading; + /** + * 卸货效率 + */ + private String unloadingEfficiency; + /** + * 允许装货时间开始 + */ + private LocalDateTime allowableShipmentStart; + /** + * 允许装货时间结束 + */ + private LocalDateTime allowableShipmentEnd; + /** + * 装货时长 + */ + private String shipment; + /** + * 装货效果 + */ + private String shipmentEffciency; + /** + * 付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表) + */ + private String paymentMethod; + /** + * 账户名称 + */ + private String accountName; + /** + * 银行账号 + */ + private String bankAccount; + /** + * 开户银行 + */ + private String bankDeposit; + /** + * 开户地区 + */ + private String depositArea; + /** + * 支行名称 + */ + private String bankBranch; + /** + * 公司税号 + */ + private String companyTaxNumber; + /** + * 企业名称 + */ + private String enterpriseName; + /** + * 单位地址 + */ + private String workAddress; + /** + * 合作方式(0：买断 1：联营) + */ + private String collaborationMethod; + /** + * 结算方式(0:先货后款 1：先款后货) + */ + private String settlementMethod; + /** + * 账期 + */ + private String accountPeriod; + /** + * 压款方式(0：无 1：按金额 2：按比例) + */ + private String underpaymentMethod; + /** + * 申请压款比例 + */ + private String applyForUnderpaymentRatio; + /** + * 保证金方式(0：无 1：按金额 2：按比例) + */ + private String marginMethod; + /** + * 申请保证金比例 + */ + private String applyForMarginRatio; + /** + * 逾期利率(0：按年化1：按月化) + */ + private String overdueInterestRate; + /** + * 申请逾期利率 + */ + private String applyForOverdueRatio; + /** + * 预留字段1 + */ + private String reservedFields1; + /** + * 预留字段2 + */ + private String reservedFields2; + /** + * 预留字段3 + */ + private String reservedFields3; + /** + * 预留字段4 + */ + private String reservedFields4; + /** + * 预留字段5 + */ + private String reservedFields5; + /** + * 预留字段6 + */ + private String reservedFields6; + /** + * 信用级别(0：S 1：A 2：B) + */ + private String creditRating; + /** + * 信用级别(0：开启 1：关闭) + */ + private String autoCreditRating; + /** + * 应收款上限 + */ + private Long accountsReceivableUpper; + /** + * 订单量下限 + */ + private Long orderQuantityDown; + /** + * 订单量上限 + */ + private Long orderQuantityUpper; + /** + * 应收款项逾期限制 + */ + private Long accountsReceivableOverdue; + /** + * 完税证明超时限制 + */ + private Long taxPaymentCertificate; + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/subjectbasic/SubjectBasicMapper.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/subjectbasic/SubjectBasicMapper.java new file mode 100644 index 0000000..2f1e2b4 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/subjectbasic/SubjectBasicMapper.java @@ -0,0 +1,184 @@ +package com.yunxi.scm.module.xxjj.dal.mysql.subjectbasic; + +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.subjectbasic.SubjectBasicDO; +import org.apache.ibatis.annotations.Mapper; +import com.yunxi.scm.module.xxjj.controller.admin.subjectbasic.vo.*; + +/** + * 基础业务信息表(客户，供应商，服务商主体) Mapper + * + * @author 长江云息 + */ +@Mapper +public interface SubjectBasicMapper extends BaseMapperX { + + default PageResult selectPage(SubjectBasicPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(SubjectBasicDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(SubjectBasicDO::getCalssify, reqVO.getCalssify()) + .likeIfPresent(SubjectBasicDO::getName, reqVO.getName()) + .eqIfPresent(SubjectBasicDO::getLogo, reqVO.getLogo()) + .eqIfPresent(SubjectBasicDO::getEnterpriseNature, reqVO.getEnterpriseNature()) + .eqIfPresent(SubjectBasicDO::getIndustryClassify, reqVO.getIndustryClassify()) + .eqIfPresent(SubjectBasicDO::getCustomerSource, reqVO.getCustomerSource()) + .eqIfPresent(SubjectBasicDO::getCustomerStarrating, reqVO.getCustomerStarrating()) + .eqIfPresent(SubjectBasicDO::getIndustrySchedule, reqVO.getIndustrySchedule()) + .eqIfPresent(SubjectBasicDO::getBelongingPeople, reqVO.getBelongingPeople()) + .eqIfPresent(SubjectBasicDO::getCity, reqVO.getCity()) + .eqIfPresent(SubjectBasicDO::getCountry, reqVO.getCountry()) + .eqIfPresent(SubjectBasicDO::getAddress, reqVO.getAddress()) + .eqIfPresent(SubjectBasicDO::getPhone, reqVO.getPhone()) + .eqIfPresent(SubjectBasicDO::getCompanyFax, reqVO.getCompanyFax()) + .eqIfPresent(SubjectBasicDO::getCompanyHttp, reqVO.getCompanyHttp()) + .eqIfPresent(SubjectBasicDO::getCompanyProfile, reqVO.getCompanyProfile()) + .eqIfPresent(SubjectBasicDO::getCustomerStatus, reqVO.getCustomerStatus()) + .eqIfPresent(SubjectBasicDO::getSocialInformationCodeCertificate, reqVO.getSocialInformationCodeCertificate()) + .eqIfPresent(SubjectBasicDO::getRegisterAddress, reqVO.getRegisterAddress()) + .eqIfPresent(SubjectBasicDO::getInformationCode, reqVO.getInformationCode()) + .eqIfPresent(SubjectBasicDO::getOperateStart, reqVO.getOperateStart()) + .eqIfPresent(SubjectBasicDO::getOperateEnd, reqVO.getOperateEnd()) + .eqIfPresent(SubjectBasicDO::getRegisterCapital, reqVO.getRegisterCapital()) + .eqIfPresent(SubjectBasicDO::getBusinessScope, reqVO.getBusinessScope()) + .eqIfPresent(SubjectBasicDO::getProofPaidCapital, reqVO.getProofPaidCapital()) + .eqIfPresent(SubjectBasicDO::getAssetCertificate, reqVO.getAssetCertificate()) + .eqIfPresent(SubjectBasicDO::getAssetCertificateMortgage, reqVO.getAssetCertificateMortgage()) + .eqIfPresent(SubjectBasicDO::getOtherQualifications, reqVO.getOtherQualifications()) + .eqIfPresent(SubjectBasicDO::getCollaborationStart, reqVO.getCollaborationStart()) + .eqIfPresent(SubjectBasicDO::getCollaborationEnd, reqVO.getCollaborationEnd()) + .eqIfPresent(SubjectBasicDO::getDemandVolumeDown, reqVO.getDemandVolumeDown()) + .eqIfPresent(SubjectBasicDO::getDemandVolumeUpper, reqVO.getDemandVolumeUpper()) + .eqIfPresent(SubjectBasicDO::getFundLimit, reqVO.getFundLimit()) + .eqIfPresent(SubjectBasicDO::getBusinessHours, reqVO.getBusinessHours()) + .eqIfPresent(SubjectBasicDO::getBusinessStart, reqVO.getBusinessStart()) + .eqIfPresent(SubjectBasicDO::getBusinessEnd, reqVO.getBusinessEnd()) + .eqIfPresent(SubjectBasicDO::getAllowableUnloadingStart, reqVO.getAllowableUnloadingStart()) + .eqIfPresent(SubjectBasicDO::getAllowableUnloadingEnd, reqVO.getAllowableUnloadingEnd()) + .eqIfPresent(SubjectBasicDO::getUnloading, reqVO.getUnloading()) + .eqIfPresent(SubjectBasicDO::getUnloadingEfficiency, reqVO.getUnloadingEfficiency()) + .eqIfPresent(SubjectBasicDO::getAllowableShipmentStart, reqVO.getAllowableShipmentStart()) + .eqIfPresent(SubjectBasicDO::getAllowableShipmentEnd, reqVO.getAllowableShipmentEnd()) + .eqIfPresent(SubjectBasicDO::getShipment, reqVO.getShipment()) + .eqIfPresent(SubjectBasicDO::getShipmentEffciency, reqVO.getShipmentEffciency()) + .eqIfPresent(SubjectBasicDO::getPaymentMethod, reqVO.getPaymentMethod()) + .likeIfPresent(SubjectBasicDO::getAccountName, reqVO.getAccountName()) + .eqIfPresent(SubjectBasicDO::getBankAccount, reqVO.getBankAccount()) + .eqIfPresent(SubjectBasicDO::getBankDeposit, reqVO.getBankDeposit()) + .eqIfPresent(SubjectBasicDO::getDepositArea, reqVO.getDepositArea()) + .eqIfPresent(SubjectBasicDO::getBankBranch, reqVO.getBankBranch()) + .eqIfPresent(SubjectBasicDO::getCompanyTaxNumber, reqVO.getCompanyTaxNumber()) + .likeIfPresent(SubjectBasicDO::getEnterpriseName, reqVO.getEnterpriseName()) + .eqIfPresent(SubjectBasicDO::getWorkAddress, reqVO.getWorkAddress()) + .eqIfPresent(SubjectBasicDO::getCollaborationMethod, reqVO.getCollaborationMethod()) + .eqIfPresent(SubjectBasicDO::getSettlementMethod, reqVO.getSettlementMethod()) + .eqIfPresent(SubjectBasicDO::getAccountPeriod, reqVO.getAccountPeriod()) + .eqIfPresent(SubjectBasicDO::getUnderpaymentMethod, reqVO.getUnderpaymentMethod()) + .eqIfPresent(SubjectBasicDO::getApplyForUnderpaymentRatio, reqVO.getApplyForUnderpaymentRatio()) + .eqIfPresent(SubjectBasicDO::getMarginMethod, reqVO.getMarginMethod()) + .eqIfPresent(SubjectBasicDO::getApplyForMarginRatio, reqVO.getApplyForMarginRatio()) + .eqIfPresent(SubjectBasicDO::getOverdueInterestRate, reqVO.getOverdueInterestRate()) + .eqIfPresent(SubjectBasicDO::getApplyForOverdueRatio, reqVO.getApplyForOverdueRatio()) + .eqIfPresent(SubjectBasicDO::getReservedFields1, reqVO.getReservedFields1()) + .eqIfPresent(SubjectBasicDO::getReservedFields2, reqVO.getReservedFields2()) + .eqIfPresent(SubjectBasicDO::getReservedFields3, reqVO.getReservedFields3()) + .eqIfPresent(SubjectBasicDO::getReservedFields4, reqVO.getReservedFields4()) + .eqIfPresent(SubjectBasicDO::getReservedFields5, reqVO.getReservedFields5()) + .eqIfPresent(SubjectBasicDO::getReservedFields6, reqVO.getReservedFields6()) + .eqIfPresent(SubjectBasicDO::getCreditRating, reqVO.getCreditRating()) + .eqIfPresent(SubjectBasicDO::getAutoCreditRating, reqVO.getAutoCreditRating()) + .eqIfPresent(SubjectBasicDO::getAccountsReceivableUpper, reqVO.getAccountsReceivableUpper()) + .eqIfPresent(SubjectBasicDO::getOrderQuantityDown, reqVO.getOrderQuantityDown()) + .eqIfPresent(SubjectBasicDO::getOrderQuantityUpper, reqVO.getOrderQuantityUpper()) + .eqIfPresent(SubjectBasicDO::getAccountsReceivableOverdue, reqVO.getAccountsReceivableOverdue()) + .eqIfPresent(SubjectBasicDO::getTaxPaymentCertificate, reqVO.getTaxPaymentCertificate()) + .betweenIfPresent(SubjectBasicDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(SubjectBasicDO::getId)); + } + + default List selectList(SubjectBasicExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(SubjectBasicDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(SubjectBasicDO::getCalssify, reqVO.getCalssify()) + .likeIfPresent(SubjectBasicDO::getName, reqVO.getName()) + .eqIfPresent(SubjectBasicDO::getLogo, reqVO.getLogo()) + .eqIfPresent(SubjectBasicDO::getEnterpriseNature, reqVO.getEnterpriseNature()) + .eqIfPresent(SubjectBasicDO::getIndustryClassify, reqVO.getIndustryClassify()) + .eqIfPresent(SubjectBasicDO::getCustomerSource, reqVO.getCustomerSource()) + .eqIfPresent(SubjectBasicDO::getCustomerStarrating, reqVO.getCustomerStarrating()) + .eqIfPresent(SubjectBasicDO::getIndustrySchedule, reqVO.getIndustrySchedule()) + .eqIfPresent(SubjectBasicDO::getBelongingPeople, reqVO.getBelongingPeople()) + .eqIfPresent(SubjectBasicDO::getCity, reqVO.getCity()) + .eqIfPresent(SubjectBasicDO::getCountry, reqVO.getCountry()) + .eqIfPresent(SubjectBasicDO::getAddress, reqVO.getAddress()) + .eqIfPresent(SubjectBasicDO::getPhone, reqVO.getPhone()) + .eqIfPresent(SubjectBasicDO::getCompanyFax, reqVO.getCompanyFax()) + .eqIfPresent(SubjectBasicDO::getCompanyHttp, reqVO.getCompanyHttp()) + .eqIfPresent(SubjectBasicDO::getCompanyProfile, reqVO.getCompanyProfile()) + .eqIfPresent(SubjectBasicDO::getCustomerStatus, reqVO.getCustomerStatus()) + .eqIfPresent(SubjectBasicDO::getSocialInformationCodeCertificate, reqVO.getSocialInformationCodeCertificate()) + .eqIfPresent(SubjectBasicDO::getRegisterAddress, reqVO.getRegisterAddress()) + .eqIfPresent(SubjectBasicDO::getInformationCode, reqVO.getInformationCode()) + .eqIfPresent(SubjectBasicDO::getOperateStart, reqVO.getOperateStart()) + .eqIfPresent(SubjectBasicDO::getOperateEnd, reqVO.getOperateEnd()) + .eqIfPresent(SubjectBasicDO::getRegisterCapital, reqVO.getRegisterCapital()) + .eqIfPresent(SubjectBasicDO::getBusinessScope, reqVO.getBusinessScope()) + .eqIfPresent(SubjectBasicDO::getProofPaidCapital, reqVO.getProofPaidCapital()) + .eqIfPresent(SubjectBasicDO::getAssetCertificate, reqVO.getAssetCertificate()) + .eqIfPresent(SubjectBasicDO::getAssetCertificateMortgage, reqVO.getAssetCertificateMortgage()) + .eqIfPresent(SubjectBasicDO::getOtherQualifications, reqVO.getOtherQualifications()) + .eqIfPresent(SubjectBasicDO::getCollaborationStart, reqVO.getCollaborationStart()) + .eqIfPresent(SubjectBasicDO::getCollaborationEnd, reqVO.getCollaborationEnd()) + .eqIfPresent(SubjectBasicDO::getDemandVolumeDown, reqVO.getDemandVolumeDown()) + .eqIfPresent(SubjectBasicDO::getDemandVolumeUpper, reqVO.getDemandVolumeUpper()) + .eqIfPresent(SubjectBasicDO::getFundLimit, reqVO.getFundLimit()) + .eqIfPresent(SubjectBasicDO::getBusinessHours, reqVO.getBusinessHours()) + .eqIfPresent(SubjectBasicDO::getBusinessStart, reqVO.getBusinessStart()) + .eqIfPresent(SubjectBasicDO::getBusinessEnd, reqVO.getBusinessEnd()) + .eqIfPresent(SubjectBasicDO::getAllowableUnloadingStart, reqVO.getAllowableUnloadingStart()) + .eqIfPresent(SubjectBasicDO::getAllowableUnloadingEnd, reqVO.getAllowableUnloadingEnd()) + .eqIfPresent(SubjectBasicDO::getUnloading, reqVO.getUnloading()) + .eqIfPresent(SubjectBasicDO::getUnloadingEfficiency, reqVO.getUnloadingEfficiency()) + .eqIfPresent(SubjectBasicDO::getAllowableShipmentStart, reqVO.getAllowableShipmentStart()) + .eqIfPresent(SubjectBasicDO::getAllowableShipmentEnd, reqVO.getAllowableShipmentEnd()) + .eqIfPresent(SubjectBasicDO::getShipment, reqVO.getShipment()) + .eqIfPresent(SubjectBasicDO::getShipmentEffciency, reqVO.getShipmentEffciency()) + .eqIfPresent(SubjectBasicDO::getPaymentMethod, reqVO.getPaymentMethod()) + .likeIfPresent(SubjectBasicDO::getAccountName, reqVO.getAccountName()) + .eqIfPresent(SubjectBasicDO::getBankAccount, reqVO.getBankAccount()) + .eqIfPresent(SubjectBasicDO::getBankDeposit, reqVO.getBankDeposit()) + .eqIfPresent(SubjectBasicDO::getDepositArea, reqVO.getDepositArea()) + .eqIfPresent(SubjectBasicDO::getBankBranch, reqVO.getBankBranch()) + .eqIfPresent(SubjectBasicDO::getCompanyTaxNumber, reqVO.getCompanyTaxNumber()) + .likeIfPresent(SubjectBasicDO::getEnterpriseName, reqVO.getEnterpriseName()) + .eqIfPresent(SubjectBasicDO::getWorkAddress, reqVO.getWorkAddress()) + .eqIfPresent(SubjectBasicDO::getCollaborationMethod, reqVO.getCollaborationMethod()) + .eqIfPresent(SubjectBasicDO::getSettlementMethod, reqVO.getSettlementMethod()) + .eqIfPresent(SubjectBasicDO::getAccountPeriod, reqVO.getAccountPeriod()) + .eqIfPresent(SubjectBasicDO::getUnderpaymentMethod, reqVO.getUnderpaymentMethod()) + .eqIfPresent(SubjectBasicDO::getApplyForUnderpaymentRatio, reqVO.getApplyForUnderpaymentRatio()) + .eqIfPresent(SubjectBasicDO::getMarginMethod, reqVO.getMarginMethod()) + .eqIfPresent(SubjectBasicDO::getApplyForMarginRatio, reqVO.getApplyForMarginRatio()) + .eqIfPresent(SubjectBasicDO::getOverdueInterestRate, reqVO.getOverdueInterestRate()) + .eqIfPresent(SubjectBasicDO::getApplyForOverdueRatio, reqVO.getApplyForOverdueRatio()) + .eqIfPresent(SubjectBasicDO::getReservedFields1, reqVO.getReservedFields1()) + .eqIfPresent(SubjectBasicDO::getReservedFields2, reqVO.getReservedFields2()) + .eqIfPresent(SubjectBasicDO::getReservedFields3, reqVO.getReservedFields3()) + .eqIfPresent(SubjectBasicDO::getReservedFields4, reqVO.getReservedFields4()) + .eqIfPresent(SubjectBasicDO::getReservedFields5, reqVO.getReservedFields5()) + .eqIfPresent(SubjectBasicDO::getReservedFields6, reqVO.getReservedFields6()) + .eqIfPresent(SubjectBasicDO::getCreditRating, reqVO.getCreditRating()) + .eqIfPresent(SubjectBasicDO::getAutoCreditRating, reqVO.getAutoCreditRating()) + .eqIfPresent(SubjectBasicDO::getAccountsReceivableUpper, reqVO.getAccountsReceivableUpper()) + .eqIfPresent(SubjectBasicDO::getOrderQuantityDown, reqVO.getOrderQuantityDown()) + .eqIfPresent(SubjectBasicDO::getOrderQuantityUpper, reqVO.getOrderQuantityUpper()) + .eqIfPresent(SubjectBasicDO::getAccountsReceivableOverdue, reqVO.getAccountsReceivableOverdue()) + .eqIfPresent(SubjectBasicDO::getTaxPaymentCertificate, reqVO.getTaxPaymentCertificate()) + .betweenIfPresent(SubjectBasicDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(SubjectBasicDO::getId)); + } + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java index 1c247f6..624b9ce 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java @@ -67,4 +67,6 @@ public interface ErrorCodeConstants { ErrorCode ENTERPRISE_NOT_EXISTS = new ErrorCode(1002004015, "企业信息不存在"); // ========== 企业合约 TODO 补充编号 ========== ErrorCode ENTERPRISE_CONTRACT_NOT_EXISTS = new ErrorCode(1002004016, "企业合约不存在"); + + ErrorCode SUBJECT_BASIC_NOT_EXISTS = new ErrorCode(1002004017, "基础业务信息表(客户，供应商，服务商主体)不存在"); } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/subjectbasic/SubjectBasicService.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/subjectbasic/SubjectBasicService.java new file mode 100644 index 0000000..0c4650d --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/subjectbasic/SubjectBasicService.java @@ -0,0 +1,70 @@ +package com.yunxi.scm.module.xxjj.service.subjectbasic; + +import java.util.*; +import javax.validation.*; +import com.yunxi.scm.module.xxjj.controller.admin.subjectbasic.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.subjectbasic.SubjectBasicDO; +import com.yunxi.scm.framework.common.pojo.PageResult; + +/** + * 基础业务信息表(客户，供应商，服务商主体) Service 接口 + * + * @author 长江云息 + */ +public interface SubjectBasicService { + + /** + * 创建基础业务信息表(客户，供应商，服务商主体) + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createSubjectBasic(@Valid SubjectBasicCreateReqVO createReqVO); + + /** + * 更新基础业务信息表(客户，供应商，服务商主体) + * + * @param updateReqVO 更新信息 + */ + void updateSubjectBasic(@Valid SubjectBasicUpdateReqVO updateReqVO); + + /** + * 删除基础业务信息表(客户，供应商，服务商主体) + * + * @param id 编号 + */ + void deleteSubjectBasic(Long id); + + /** + * 获得基础业务信息表(客户，供应商，服务商主体) + * + * @param id 编号 + * @return 基础业务信息表(客户，供应商，服务商主体) + */ + SubjectBasicDO getSubjectBasic(Long id); + + /** + * 获得基础业务信息表(客户，供应商，服务商主体)列表 + * + * @param ids 编号 + * @return 基础业务信息表(客户，供应商，服务商主体)列表 + */ + List getSubjectBasicList(Collection ids); + + /** + * 获得基础业务信息表(客户，供应商，服务商主体)分页 + * + * @param pageReqVO 分页查询 + * @return 基础业务信息表(客户，供应商，服务商主体)分页 + */ + PageResult getSubjectBasicPage(SubjectBasicPageReqVO pageReqVO); + + /** + * 获得基础业务信息表(客户，供应商，服务商主体)列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 基础业务信息表(客户，供应商，服务商主体)列表 + */ + List getSubjectBasicList(SubjectBasicExportReqVO exportReqVO); + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/subjectbasic/SubjectBasicServiceImpl.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/subjectbasic/SubjectBasicServiceImpl.java new file mode 100644 index 0000000..0958e80 --- /dev/null +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/subjectbasic/SubjectBasicServiceImpl.java @@ -0,0 +1,82 @@ +package com.yunxi.scm.module.xxjj.service.subjectbasic; + +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.subjectbasic.vo.*; +import com.yunxi.scm.module.xxjj.dal.dataobject.subjectbasic.SubjectBasicDO; +import com.yunxi.scm.framework.common.pojo.PageResult; + +import com.yunxi.scm.module.xxjj.convert.subjectbasic.SubjectBasicConvert; +import com.yunxi.scm.module.xxjj.dal.mysql.subjectbasic.SubjectBasicMapper; + +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 SubjectBasicServiceImpl implements SubjectBasicService { + + @Resource + private SubjectBasicMapper subjectBasicMapper; + + @Override + public Long createSubjectBasic(SubjectBasicCreateReqVO createReqVO) { + // 插入 + SubjectBasicDO subjectBasic = SubjectBasicConvert.INSTANCE.convert(createReqVO); + subjectBasicMapper.insert(subjectBasic); + // 返回 + return subjectBasic.getId(); + } + + @Override + public void updateSubjectBasic(SubjectBasicUpdateReqVO updateReqVO) { + // 校验存在 + validateSubjectBasicExists(updateReqVO.getId()); + // 更新 + SubjectBasicDO updateObj = SubjectBasicConvert.INSTANCE.convert(updateReqVO); + subjectBasicMapper.updateById(updateObj); + } + + @Override + public void deleteSubjectBasic(Long id) { + // 校验存在 + validateSubjectBasicExists(id); + // 删除 + subjectBasicMapper.deleteById(id); + } + + private void validateSubjectBasicExists(Long id) { + if (subjectBasicMapper.selectById(id) == null) { + throw exception(SUBJECT_BASIC_NOT_EXISTS); + } + } + + @Override + public SubjectBasicDO getSubjectBasic(Long id) { + return subjectBasicMapper.selectById(id); + } + + @Override + public List getSubjectBasicList(Collection ids) { + return subjectBasicMapper.selectBatchIds(ids); + } + + @Override + public PageResult getSubjectBasicPage(SubjectBasicPageReqVO pageReqVO) { + return subjectBasicMapper.selectPage(pageReqVO); + } + + @Override + public List getSubjectBasicList(SubjectBasicExportReqVO exportReqVO) { + return subjectBasicMapper.selectList(exportReqVO); + } + +} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/enterprise/EnterpriseMapper.xml b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/enterprise/EnterpriseMapper.xml index 1614c33..eff773a 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/enterprise/EnterpriseMapper.xml +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/enterprise/EnterpriseMapper.xml @@ -8,5 +8,4 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/subjectbasic/SubjectBasicMapper.xml similarity index 84% rename from yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml rename to yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/subjectbasic/SubjectBasicMapper.xml index 22cbd0b..81ef639 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/subjectbasic/SubjectBasicMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/yudao-ui-admin-vben-master/src/views/base/login/LoginFormTitle.vue b/yunxi-ui-admin-vben/src/views/base/login/LoginFormTitle.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/login/LoginFormTitle.vue rename to yunxi-ui-admin-vben/src/views/base/login/LoginFormTitle.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/login/MobileForm.vue b/yunxi-ui-admin-vben/src/views/base/login/MobileForm.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/login/MobileForm.vue rename to yunxi-ui-admin-vben/src/views/base/login/MobileForm.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/login/QrCodeForm.vue b/yunxi-ui-admin-vben/src/views/base/login/QrCodeForm.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/login/QrCodeForm.vue rename to yunxi-ui-admin-vben/src/views/base/login/QrCodeForm.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/login/RegisterForm.vue b/yunxi-ui-admin-vben/src/views/base/login/RegisterForm.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/login/RegisterForm.vue rename to yunxi-ui-admin-vben/src/views/base/login/RegisterForm.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/login/SSOForm.vue b/yunxi-ui-admin-vben/src/views/base/login/SSOForm.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/login/SSOForm.vue rename to yunxi-ui-admin-vben/src/views/base/login/SSOForm.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/login/SessionTimeoutLogin.vue b/yunxi-ui-admin-vben/src/views/base/login/SessionTimeoutLogin.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/login/SessionTimeoutLogin.vue rename to yunxi-ui-admin-vben/src/views/base/login/SessionTimeoutLogin.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/login/sso.vue b/yunxi-ui-admin-vben/src/views/base/login/sso.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/login/sso.vue rename to yunxi-ui-admin-vben/src/views/base/login/sso.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/login/useLogin.ts b/yunxi-ui-admin-vben/src/views/base/login/useLogin.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/login/useLogin.ts rename to yunxi-ui-admin-vben/src/views/base/login/useLogin.ts diff --git a/yudao-ui-admin-vben-master/src/views/base/profile/AccountBind.vue b/yunxi-ui-admin-vben/src/views/base/profile/AccountBind.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/profile/AccountBind.vue rename to yunxi-ui-admin-vben/src/views/base/profile/AccountBind.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/profile/BaseSetting.vue b/yunxi-ui-admin-vben/src/views/base/profile/BaseSetting.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/profile/BaseSetting.vue rename to yunxi-ui-admin-vben/src/views/base/profile/BaseSetting.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/profile/MsgNotify.vue b/yunxi-ui-admin-vben/src/views/base/profile/MsgNotify.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/profile/MsgNotify.vue rename to yunxi-ui-admin-vben/src/views/base/profile/MsgNotify.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/profile/PasswordModal.vue b/yunxi-ui-admin-vben/src/views/base/profile/PasswordModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/profile/PasswordModal.vue rename to yunxi-ui-admin-vben/src/views/base/profile/PasswordModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/profile/SecureSetting.vue b/yunxi-ui-admin-vben/src/views/base/profile/SecureSetting.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/profile/SecureSetting.vue rename to yunxi-ui-admin-vben/src/views/base/profile/SecureSetting.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/profile/data.ts b/yunxi-ui-admin-vben/src/views/base/profile/data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/profile/data.ts rename to yunxi-ui-admin-vben/src/views/base/profile/data.ts diff --git a/yudao-ui-admin-vben-master/src/views/base/profile/index.vue b/yunxi-ui-admin-vben/src/views/base/profile/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/profile/index.vue rename to yunxi-ui-admin-vben/src/views/base/profile/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/profile/index1.vue b/yunxi-ui-admin-vben/src/views/base/profile/index1.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/profile/index1.vue rename to yunxi-ui-admin-vben/src/views/base/profile/index1.vue diff --git a/yudao-ui-admin-vben-master/src/views/base/redirect/index.vue b/yunxi-ui-admin-vben/src/views/base/redirect/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/base/redirect/index.vue rename to yunxi-ui-admin-vben/src/views/base/redirect/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/definition/index.vue b/yunxi-ui-admin-vben/src/views/bpm/definition/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/definition/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/definition/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/form/FormModal.vue b/yunxi-ui-admin-vben/src/views/bpm/form/FormModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/form/FormModal.vue rename to yunxi-ui-admin-vben/src/views/bpm/form/FormModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/form/editor/index.vue b/yunxi-ui-admin-vben/src/views/bpm/form/editor/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/form/editor/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/form/editor/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/form/form.data.ts b/yunxi-ui-admin-vben/src/views/bpm/form/form.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/form/form.data.ts rename to yunxi-ui-admin-vben/src/views/bpm/form/form.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/bpm/form/index.vue b/yunxi-ui-admin-vben/src/views/bpm/form/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/form/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/form/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/group/GroupModal.vue b/yunxi-ui-admin-vben/src/views/bpm/group/GroupModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/group/GroupModal.vue rename to yunxi-ui-admin-vben/src/views/bpm/group/GroupModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/group/group.data.ts b/yunxi-ui-admin-vben/src/views/bpm/group/group.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/group/group.data.ts rename to yunxi-ui-admin-vben/src/views/bpm/group/group.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/bpm/group/index.vue b/yunxi-ui-admin-vben/src/views/bpm/group/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/group/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/group/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/model/ModelImportModal.vue b/yunxi-ui-admin-vben/src/views/bpm/model/ModelImportModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/model/ModelImportModal.vue rename to yunxi-ui-admin-vben/src/views/bpm/model/ModelImportModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/model/ModelModal.vue b/yunxi-ui-admin-vben/src/views/bpm/model/ModelModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/model/ModelModal.vue rename to yunxi-ui-admin-vben/src/views/bpm/model/ModelModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/model/editor/index.vue b/yunxi-ui-admin-vben/src/views/bpm/model/editor/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/model/editor/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/model/editor/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/model/index.vue b/yunxi-ui-admin-vben/src/views/bpm/model/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/model/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/model/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/model/model.data.ts b/yunxi-ui-admin-vben/src/views/bpm/model/model.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/model/model.data.ts rename to yunxi-ui-admin-vben/src/views/bpm/model/model.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/bpm/oa/leave/create.vue b/yunxi-ui-admin-vben/src/views/bpm/oa/leave/create.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/oa/leave/create.vue rename to yunxi-ui-admin-vben/src/views/bpm/oa/leave/create.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/oa/leave/detail.vue b/yunxi-ui-admin-vben/src/views/bpm/oa/leave/detail.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/oa/leave/detail.vue rename to yunxi-ui-admin-vben/src/views/bpm/oa/leave/detail.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/oa/leave/index.vue b/yunxi-ui-admin-vben/src/views/bpm/oa/leave/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/oa/leave/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/oa/leave/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/oa/leave/leave.data.ts b/yunxi-ui-admin-vben/src/views/bpm/oa/leave/leave.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/oa/leave/leave.data.ts rename to yunxi-ui-admin-vben/src/views/bpm/oa/leave/leave.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/bpm/processInstance/create/create.data.ts b/yunxi-ui-admin-vben/src/views/bpm/processInstance/create/create.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/processInstance/create/create.data.ts rename to yunxi-ui-admin-vben/src/views/bpm/processInstance/create/create.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/bpm/processInstance/create/index.vue b/yunxi-ui-admin-vben/src/views/bpm/processInstance/create/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/processInstance/create/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/processInstance/create/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/processInstance/detail/index.vue b/yunxi-ui-admin-vben/src/views/bpm/processInstance/detail/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/processInstance/detail/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/processInstance/detail/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/processInstance/index.vue b/yunxi-ui-admin-vben/src/views/bpm/processInstance/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/processInstance/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/processInstance/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/processInstance/processInstance.data.ts b/yunxi-ui-admin-vben/src/views/bpm/processInstance/processInstance.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/processInstance/processInstance.data.ts rename to yunxi-ui-admin-vben/src/views/bpm/processInstance/processInstance.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/bpm/task/done/done.data.ts b/yunxi-ui-admin-vben/src/views/bpm/task/done/done.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/task/done/done.data.ts rename to yunxi-ui-admin-vben/src/views/bpm/task/done/done.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/bpm/task/done/index.vue b/yunxi-ui-admin-vben/src/views/bpm/task/done/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/task/done/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/task/done/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/task/todo/index.vue b/yunxi-ui-admin-vben/src/views/bpm/task/todo/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/task/todo/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/task/todo/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/bpm/task/todo/todo.data.ts b/yunxi-ui-admin-vben/src/views/bpm/task/todo/todo.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/task/todo/todo.data.ts rename to yunxi-ui-admin-vben/src/views/bpm/task/todo/todo.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/bpm/taskAssignRule/index.vue b/yunxi-ui-admin-vben/src/views/bpm/taskAssignRule/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/bpm/taskAssignRule/index.vue rename to yunxi-ui-admin-vben/src/views/bpm/taskAssignRule/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/GrowCard.vue b/yunxi-ui-admin-vben/src/views/dashboard/analysis/components/GrowCard.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/GrowCard.vue rename to yunxi-ui-admin-vben/src/views/dashboard/analysis/components/GrowCard.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/SalesProductPie.vue b/yunxi-ui-admin-vben/src/views/dashboard/analysis/components/SalesProductPie.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/SalesProductPie.vue rename to yunxi-ui-admin-vben/src/views/dashboard/analysis/components/SalesProductPie.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/SiteAnalysis.vue b/yunxi-ui-admin-vben/src/views/dashboard/analysis/components/SiteAnalysis.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/SiteAnalysis.vue rename to yunxi-ui-admin-vben/src/views/dashboard/analysis/components/SiteAnalysis.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/VisitAnalysis.vue b/yunxi-ui-admin-vben/src/views/dashboard/analysis/components/VisitAnalysis.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/VisitAnalysis.vue rename to yunxi-ui-admin-vben/src/views/dashboard/analysis/components/VisitAnalysis.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/VisitAnalysisBar.vue b/yunxi-ui-admin-vben/src/views/dashboard/analysis/components/VisitAnalysisBar.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/VisitAnalysisBar.vue rename to yunxi-ui-admin-vben/src/views/dashboard/analysis/components/VisitAnalysisBar.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/VisitRadar.vue b/yunxi-ui-admin-vben/src/views/dashboard/analysis/components/VisitRadar.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/VisitRadar.vue rename to yunxi-ui-admin-vben/src/views/dashboard/analysis/components/VisitRadar.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/VisitSource.vue b/yunxi-ui-admin-vben/src/views/dashboard/analysis/components/VisitSource.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/VisitSource.vue rename to yunxi-ui-admin-vben/src/views/dashboard/analysis/components/VisitSource.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/props.ts b/yunxi-ui-admin-vben/src/views/dashboard/analysis/components/props.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/analysis/components/props.ts rename to yunxi-ui-admin-vben/src/views/dashboard/analysis/components/props.ts diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/analysis/data.ts b/yunxi-ui-admin-vben/src/views/dashboard/analysis/data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/analysis/data.ts rename to yunxi-ui-admin-vben/src/views/dashboard/analysis/data.ts diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/analysis/index.vue b/yunxi-ui-admin-vben/src/views/dashboard/analysis/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/analysis/index.vue rename to yunxi-ui-admin-vben/src/views/dashboard/analysis/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/DynamicInfo.vue b/yunxi-ui-admin-vben/src/views/dashboard/workbench/components/DynamicInfo.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/DynamicInfo.vue rename to yunxi-ui-admin-vben/src/views/dashboard/workbench/components/DynamicInfo.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/ProjectCard.vue b/yunxi-ui-admin-vben/src/views/dashboard/workbench/components/ProjectCard.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/ProjectCard.vue rename to yunxi-ui-admin-vben/src/views/dashboard/workbench/components/ProjectCard.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/QuickNav.vue b/yunxi-ui-admin-vben/src/views/dashboard/workbench/components/QuickNav.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/QuickNav.vue rename to yunxi-ui-admin-vben/src/views/dashboard/workbench/components/QuickNav.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/SaleRadar.vue b/yunxi-ui-admin-vben/src/views/dashboard/workbench/components/SaleRadar.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/SaleRadar.vue rename to yunxi-ui-admin-vben/src/views/dashboard/workbench/components/SaleRadar.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/WorkbenchHeader.vue b/yunxi-ui-admin-vben/src/views/dashboard/workbench/components/WorkbenchHeader.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/WorkbenchHeader.vue rename to yunxi-ui-admin-vben/src/views/dashboard/workbench/components/WorkbenchHeader.vue diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/data.ts b/yunxi-ui-admin-vben/src/views/dashboard/workbench/components/data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/workbench/components/data.ts rename to yunxi-ui-admin-vben/src/views/dashboard/workbench/components/data.ts diff --git a/yudao-ui-admin-vben-master/src/views/dashboard/workbench/index.vue b/yunxi-ui-admin-vben/src/views/dashboard/workbench/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/dashboard/workbench/index.vue rename to yunxi-ui-admin-vben/src/views/dashboard/workbench/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/apiAccessLog/AccessLogModal.vue b/yunxi-ui-admin-vben/src/views/infra/apiAccessLog/AccessLogModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/apiAccessLog/AccessLogModal.vue rename to yunxi-ui-admin-vben/src/views/infra/apiAccessLog/AccessLogModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/apiAccessLog/apiAccessLog.data.ts b/yunxi-ui-admin-vben/src/views/infra/apiAccessLog/apiAccessLog.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/apiAccessLog/apiAccessLog.data.ts rename to yunxi-ui-admin-vben/src/views/infra/apiAccessLog/apiAccessLog.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/apiAccessLog/index.vue b/yunxi-ui-admin-vben/src/views/infra/apiAccessLog/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/apiAccessLog/index.vue rename to yunxi-ui-admin-vben/src/views/infra/apiAccessLog/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/apiErrorLog/ErrorLogModal.vue b/yunxi-ui-admin-vben/src/views/infra/apiErrorLog/ErrorLogModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/apiErrorLog/ErrorLogModal.vue rename to yunxi-ui-admin-vben/src/views/infra/apiErrorLog/ErrorLogModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/apiErrorLog/apiErrorLog.data.ts b/yunxi-ui-admin-vben/src/views/infra/apiErrorLog/apiErrorLog.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/apiErrorLog/apiErrorLog.data.ts rename to yunxi-ui-admin-vben/src/views/infra/apiErrorLog/apiErrorLog.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/apiErrorLog/index.vue b/yunxi-ui-admin-vben/src/views/infra/apiErrorLog/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/apiErrorLog/index.vue rename to yunxi-ui-admin-vben/src/views/infra/apiErrorLog/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/build/index.vue b/yunxi-ui-admin-vben/src/views/infra/build/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/build/index.vue rename to yunxi-ui-admin-vben/src/views/infra/build/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/codegen/EditTable.vue b/yunxi-ui-admin-vben/src/views/infra/codegen/EditTable.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/codegen/EditTable.vue rename to yunxi-ui-admin-vben/src/views/infra/codegen/EditTable.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/codegen/codegen.data.ts b/yunxi-ui-admin-vben/src/views/infra/codegen/codegen.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/codegen/codegen.data.ts rename to yunxi-ui-admin-vben/src/views/infra/codegen/codegen.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/codegen/components/BasicInfoForm.vue b/yunxi-ui-admin-vben/src/views/infra/codegen/components/BasicInfoForm.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/codegen/components/BasicInfoForm.vue rename to yunxi-ui-admin-vben/src/views/infra/codegen/components/BasicInfoForm.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/codegen/components/CloumInfoForm.vue b/yunxi-ui-admin-vben/src/views/infra/codegen/components/CloumInfoForm.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/codegen/components/CloumInfoForm.vue rename to yunxi-ui-admin-vben/src/views/infra/codegen/components/CloumInfoForm.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/codegen/components/FinishForm.vue b/yunxi-ui-admin-vben/src/views/infra/codegen/components/FinishForm.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/codegen/components/FinishForm.vue rename to yunxi-ui-admin-vben/src/views/infra/codegen/components/FinishForm.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/codegen/components/ImportTableModal.vue b/yunxi-ui-admin-vben/src/views/infra/codegen/components/ImportTableModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/codegen/components/ImportTableModal.vue rename to yunxi-ui-admin-vben/src/views/infra/codegen/components/ImportTableModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/codegen/components/PreviewModal.vue b/yunxi-ui-admin-vben/src/views/infra/codegen/components/PreviewModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/codegen/components/PreviewModal.vue rename to yunxi-ui-admin-vben/src/views/infra/codegen/components/PreviewModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/codegen/components/data.ts b/yunxi-ui-admin-vben/src/views/infra/codegen/components/data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/codegen/components/data.ts rename to yunxi-ui-admin-vben/src/views/infra/codegen/components/data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/codegen/index.vue b/yunxi-ui-admin-vben/src/views/infra/codegen/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/codegen/index.vue rename to yunxi-ui-admin-vben/src/views/infra/codegen/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/config/ConfigModal.vue b/yunxi-ui-admin-vben/src/views/infra/config/ConfigModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/config/ConfigModal.vue rename to yunxi-ui-admin-vben/src/views/infra/config/ConfigModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/config/config.data.ts b/yunxi-ui-admin-vben/src/views/infra/config/config.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/config/config.data.ts rename to yunxi-ui-admin-vben/src/views/infra/config/config.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/config/index.vue b/yunxi-ui-admin-vben/src/views/infra/config/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/config/index.vue rename to yunxi-ui-admin-vben/src/views/infra/config/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue b/yunxi-ui-admin-vben/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue rename to yunxi-ui-admin-vben/src/views/infra/dataSourceConfig/DataSourceConfigModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/dataSourceConfig/dataSourceConfig.data.ts b/yunxi-ui-admin-vben/src/views/infra/dataSourceConfig/dataSourceConfig.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/dataSourceConfig/dataSourceConfig.data.ts rename to yunxi-ui-admin-vben/src/views/infra/dataSourceConfig/dataSourceConfig.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/dataSourceConfig/index.vue b/yunxi-ui-admin-vben/src/views/infra/dataSourceConfig/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/dataSourceConfig/index.vue rename to yunxi-ui-admin-vben/src/views/infra/dataSourceConfig/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/dbDoc/index.vue b/yunxi-ui-admin-vben/src/views/infra/dbDoc/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/dbDoc/index.vue rename to yunxi-ui-admin-vben/src/views/infra/dbDoc/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/druid/index.vue b/yunxi-ui-admin-vben/src/views/infra/druid/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/druid/index.vue rename to yunxi-ui-admin-vben/src/views/infra/druid/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/file/file.data.ts b/yunxi-ui-admin-vben/src/views/infra/file/file.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/file/file.data.ts rename to yunxi-ui-admin-vben/src/views/infra/file/file.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/file/index.vue b/yunxi-ui-admin-vben/src/views/infra/file/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/file/index.vue rename to yunxi-ui-admin-vben/src/views/infra/file/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/fileConfig/FileConfigModal.vue b/yunxi-ui-admin-vben/src/views/infra/fileConfig/FileConfigModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/fileConfig/FileConfigModal.vue rename to yunxi-ui-admin-vben/src/views/infra/fileConfig/FileConfigModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/fileConfig/ficleConfig.data.ts b/yunxi-ui-admin-vben/src/views/infra/fileConfig/ficleConfig.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/fileConfig/ficleConfig.data.ts rename to yunxi-ui-admin-vben/src/views/infra/fileConfig/ficleConfig.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/fileConfig/index.vue b/yunxi-ui-admin-vben/src/views/infra/fileConfig/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/fileConfig/index.vue rename to yunxi-ui-admin-vben/src/views/infra/fileConfig/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/job/JobModal.vue b/yunxi-ui-admin-vben/src/views/infra/job/JobModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/job/JobModal.vue rename to yunxi-ui-admin-vben/src/views/infra/job/JobModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/job/index.vue b/yunxi-ui-admin-vben/src/views/infra/job/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/job/index.vue rename to yunxi-ui-admin-vben/src/views/infra/job/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/job/job.data.ts b/yunxi-ui-admin-vben/src/views/infra/job/job.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/job/job.data.ts rename to yunxi-ui-admin-vben/src/views/infra/job/job.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/job/logger/JobLogModal.vue b/yunxi-ui-admin-vben/src/views/infra/job/logger/JobLogModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/job/logger/JobLogModal.vue rename to yunxi-ui-admin-vben/src/views/infra/job/logger/JobLogModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/job/logger/index.vue b/yunxi-ui-admin-vben/src/views/infra/job/logger/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/job/logger/index.vue rename to yunxi-ui-admin-vben/src/views/infra/job/logger/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/job/logger/jobLog.data.ts b/yunxi-ui-admin-vben/src/views/infra/job/logger/jobLog.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/job/logger/jobLog.data.ts rename to yunxi-ui-admin-vben/src/views/infra/job/logger/jobLog.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/redis/components/CommandStats.vue b/yunxi-ui-admin-vben/src/views/infra/redis/components/CommandStats.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/redis/components/CommandStats.vue rename to yunxi-ui-admin-vben/src/views/infra/redis/components/CommandStats.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/redis/components/Memory.vue b/yunxi-ui-admin-vben/src/views/infra/redis/components/Memory.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/redis/components/Memory.vue rename to yunxi-ui-admin-vben/src/views/infra/redis/components/Memory.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/redis/index.vue b/yunxi-ui-admin-vben/src/views/infra/redis/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/redis/index.vue rename to yunxi-ui-admin-vben/src/views/infra/redis/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/redis/redis.data.ts b/yunxi-ui-admin-vben/src/views/infra/redis/redis.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/redis/redis.data.ts rename to yunxi-ui-admin-vben/src/views/infra/redis/redis.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/infra/server/index.vue b/yunxi-ui-admin-vben/src/views/infra/server/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/server/index.vue rename to yunxi-ui-admin-vben/src/views/infra/server/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/skywalking/index.vue b/yunxi-ui-admin-vben/src/views/infra/skywalking/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/skywalking/index.vue rename to yunxi-ui-admin-vben/src/views/infra/skywalking/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/swagger/index.vue b/yunxi-ui-admin-vben/src/views/infra/swagger/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/swagger/index.vue rename to yunxi-ui-admin-vben/src/views/infra/swagger/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/testDemo/index.vue b/yunxi-ui-admin-vben/src/views/infra/testDemo/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/testDemo/index.vue rename to yunxi-ui-admin-vben/src/views/infra/testDemo/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/infra/webSocket/index.vue b/yunxi-ui-admin-vben/src/views/infra/webSocket/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/infra/webSocket/index.vue rename to yunxi-ui-admin-vben/src/views/infra/webSocket/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/market/banner/index.vue b/yunxi-ui-admin-vben/src/views/mall/market/banner/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/market/banner/index.vue rename to yunxi-ui-admin-vben/src/views/mall/market/banner/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/product/brand/index.vue b/yunxi-ui-admin-vben/src/views/mall/product/brand/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/product/brand/index.vue rename to yunxi-ui-admin-vben/src/views/mall/product/brand/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/product/category/index.vue b/yunxi-ui-admin-vben/src/views/mall/product/category/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/product/category/index.vue rename to yunxi-ui-admin-vben/src/views/mall/product/category/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/product/property/index.vue b/yunxi-ui-admin-vben/src/views/mall/product/property/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/product/property/index.vue rename to yunxi-ui-admin-vben/src/views/mall/product/property/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/product/spu/index.vue b/yunxi-ui-admin-vben/src/views/mall/product/spu/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/product/spu/index.vue rename to yunxi-ui-admin-vben/src/views/mall/product/spu/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/promotion/coupon/index.vue b/yunxi-ui-admin-vben/src/views/mall/promotion/coupon/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/promotion/coupon/index.vue rename to yunxi-ui-admin-vben/src/views/mall/promotion/coupon/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/promotion/couponTemplate/index.vue b/yunxi-ui-admin-vben/src/views/mall/promotion/couponTemplate/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/promotion/couponTemplate/index.vue rename to yunxi-ui-admin-vben/src/views/mall/promotion/couponTemplate/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/promotion/discountActivity/index.vue b/yunxi-ui-admin-vben/src/views/mall/promotion/discountActivity/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/promotion/discountActivity/index.vue rename to yunxi-ui-admin-vben/src/views/mall/promotion/discountActivity/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/promotion/rewardActivity/index.vue b/yunxi-ui-admin-vben/src/views/mall/promotion/rewardActivity/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/promotion/rewardActivity/index.vue rename to yunxi-ui-admin-vben/src/views/mall/promotion/rewardActivity/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/promotion/seckill/seckillActivity/index.vue b/yunxi-ui-admin-vben/src/views/mall/promotion/seckill/seckillActivity/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/promotion/seckill/seckillActivity/index.vue rename to yunxi-ui-admin-vben/src/views/mall/promotion/seckill/seckillActivity/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/promotion/seckill/seckillTime/index.vue b/yunxi-ui-admin-vben/src/views/mall/promotion/seckill/seckillTime/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/promotion/seckill/seckillTime/index.vue rename to yunxi-ui-admin-vben/src/views/mall/promotion/seckill/seckillTime/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/trade/afterSale/index.vue b/yunxi-ui-admin-vben/src/views/mall/trade/afterSale/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/trade/afterSale/index.vue rename to yunxi-ui-admin-vben/src/views/mall/trade/afterSale/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/trade/expressCompany/index.vue b/yunxi-ui-admin-vben/src/views/mall/trade/expressCompany/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/trade/expressCompany/index.vue rename to yunxi-ui-admin-vben/src/views/mall/trade/expressCompany/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mall/trade/order/index.vue b/yunxi-ui-admin-vben/src/views/mall/trade/order/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mall/trade/order/index.vue rename to yunxi-ui-admin-vben/src/views/mall/trade/order/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/group/GroupModal.vue b/yunxi-ui-admin-vben/src/views/member/group/GroupModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/group/GroupModal.vue rename to yunxi-ui-admin-vben/src/views/member/group/GroupModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/group/group.data.ts b/yunxi-ui-admin-vben/src/views/member/group/group.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/group/group.data.ts rename to yunxi-ui-admin-vben/src/views/member/group/group.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/member/group/index.vue b/yunxi-ui-admin-vben/src/views/member/group/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/group/index.vue rename to yunxi-ui-admin-vben/src/views/member/group/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/level/LevelModal.vue b/yunxi-ui-admin-vben/src/views/member/level/LevelModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/level/LevelModal.vue rename to yunxi-ui-admin-vben/src/views/member/level/LevelModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/level/index.vue b/yunxi-ui-admin-vben/src/views/member/level/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/level/index.vue rename to yunxi-ui-admin-vben/src/views/member/level/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/level/level.data.ts b/yunxi-ui-admin-vben/src/views/member/level/level.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/level/level.data.ts rename to yunxi-ui-admin-vben/src/views/member/level/level.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/member/point/config/index.vue b/yunxi-ui-admin-vben/src/views/member/point/config/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/point/config/index.vue rename to yunxi-ui-admin-vben/src/views/member/point/config/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/point/record/index.vue b/yunxi-ui-admin-vben/src/views/member/point/record/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/point/record/index.vue rename to yunxi-ui-admin-vben/src/views/member/point/record/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/point/record/record.data.ts b/yunxi-ui-admin-vben/src/views/member/point/record/record.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/point/record/record.data.ts rename to yunxi-ui-admin-vben/src/views/member/point/record/record.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/member/signin/config/ConfigModal.vue b/yunxi-ui-admin-vben/src/views/member/signin/config/ConfigModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/signin/config/ConfigModal.vue rename to yunxi-ui-admin-vben/src/views/member/signin/config/ConfigModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/signin/config/config.data.ts b/yunxi-ui-admin-vben/src/views/member/signin/config/config.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/signin/config/config.data.ts rename to yunxi-ui-admin-vben/src/views/member/signin/config/config.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/member/signin/config/index.vue b/yunxi-ui-admin-vben/src/views/member/signin/config/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/signin/config/index.vue rename to yunxi-ui-admin-vben/src/views/member/signin/config/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/signin/record/index.vue b/yunxi-ui-admin-vben/src/views/member/signin/record/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/signin/record/index.vue rename to yunxi-ui-admin-vben/src/views/member/signin/record/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/signin/record/record.data.ts b/yunxi-ui-admin-vben/src/views/member/signin/record/record.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/signin/record/record.data.ts rename to yunxi-ui-admin-vben/src/views/member/signin/record/record.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/member/tag/TagModal.vue b/yunxi-ui-admin-vben/src/views/member/tag/TagModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/tag/TagModal.vue rename to yunxi-ui-admin-vben/src/views/member/tag/TagModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/tag/index.vue b/yunxi-ui-admin-vben/src/views/member/tag/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/tag/index.vue rename to yunxi-ui-admin-vben/src/views/member/tag/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/tag/tag.data.ts b/yunxi-ui-admin-vben/src/views/member/tag/tag.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/tag/tag.data.ts rename to yunxi-ui-admin-vben/src/views/member/tag/tag.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/member/user/UpdateLevelModal.vue b/yunxi-ui-admin-vben/src/views/member/user/UpdateLevelModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/user/UpdateLevelModal.vue rename to yunxi-ui-admin-vben/src/views/member/user/UpdateLevelModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/user/UserDetailDrawer.vue b/yunxi-ui-admin-vben/src/views/member/user/UserDetailDrawer.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/user/UserDetailDrawer.vue rename to yunxi-ui-admin-vben/src/views/member/user/UserDetailDrawer.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/user/UserModal.vue b/yunxi-ui-admin-vben/src/views/member/user/UserModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/user/UserModal.vue rename to yunxi-ui-admin-vben/src/views/member/user/UserModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/user/index.vue b/yunxi-ui-admin-vben/src/views/member/user/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/user/index.vue rename to yunxi-ui-admin-vben/src/views/member/user/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/member/user/user.data.ts b/yunxi-ui-admin-vben/src/views/member/user/user.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/member/user/user.data.ts rename to yunxi-ui-admin-vben/src/views/member/user/user.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/mp/account/AccountModal.vue b/yunxi-ui-admin-vben/src/views/mp/account/AccountModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/account/AccountModal.vue rename to yunxi-ui-admin-vben/src/views/mp/account/AccountModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/account/account.data.ts b/yunxi-ui-admin-vben/src/views/mp/account/account.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/account/account.data.ts rename to yunxi-ui-admin-vben/src/views/mp/account/account.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/mp/account/index.vue b/yunxi-ui-admin-vben/src/views/mp/account/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/account/index.vue rename to yunxi-ui-admin-vben/src/views/mp/account/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/autoReply/index.vue b/yunxi-ui-admin-vben/src/views/mp/autoReply/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/autoReply/index.vue rename to yunxi-ui-admin-vben/src/views/mp/autoReply/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/WxAccountSelect/index.vue b/yunxi-ui-admin-vben/src/views/mp/components/WxAccountSelect/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/WxAccountSelect/index.vue rename to yunxi-ui-admin-vben/src/views/mp/components/WxAccountSelect/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/WxLocation/index.vue b/yunxi-ui-admin-vben/src/views/mp/components/WxLocation/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/WxLocation/index.vue rename to yunxi-ui-admin-vben/src/views/mp/components/WxLocation/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/WxMaterialSelect/index.vue b/yunxi-ui-admin-vben/src/views/mp/components/WxMaterialSelect/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/WxMaterialSelect/index.vue rename to yunxi-ui-admin-vben/src/views/mp/components/WxMaterialSelect/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/WxMaterialSelect/type.ts b/yunxi-ui-admin-vben/src/views/mp/components/WxMaterialSelect/type.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/WxMaterialSelect/type.ts rename to yunxi-ui-admin-vben/src/views/mp/components/WxMaterialSelect/type.ts diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/WxMsg/index.vue b/yunxi-ui-admin-vben/src/views/mp/components/WxMsg/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/WxMsg/index.vue rename to yunxi-ui-admin-vben/src/views/mp/components/WxMsg/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/WxMusic/index.vue b/yunxi-ui-admin-vben/src/views/mp/components/WxMusic/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/WxMusic/index.vue rename to yunxi-ui-admin-vben/src/views/mp/components/WxMusic/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/WxNews/index.vue b/yunxi-ui-admin-vben/src/views/mp/components/WxNews/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/WxNews/index.vue rename to yunxi-ui-admin-vben/src/views/mp/components/WxNews/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/WxReply/index.vue b/yunxi-ui-admin-vben/src/views/mp/components/WxReply/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/WxReply/index.vue rename to yunxi-ui-admin-vben/src/views/mp/components/WxReply/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/WxVideoPlay/index.vue b/yunxi-ui-admin-vben/src/views/mp/components/WxVideoPlay/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/WxVideoPlay/index.vue rename to yunxi-ui-admin-vben/src/views/mp/components/WxVideoPlay/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/WxVoicePlay/index.vue b/yunxi-ui-admin-vben/src/views/mp/components/WxVoicePlay/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/WxVoicePlay/index.vue rename to yunxi-ui-admin-vben/src/views/mp/components/WxVoicePlay/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/components/index.ts b/yunxi-ui-admin-vben/src/views/mp/components/index.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/components/index.ts rename to yunxi-ui-admin-vben/src/views/mp/components/index.ts diff --git a/yudao-ui-admin-vben-master/src/views/mp/draft/index.vue b/yunxi-ui-admin-vben/src/views/mp/draft/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/draft/index.vue rename to yunxi-ui-admin-vben/src/views/mp/draft/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/freePublish/index.vue b/yunxi-ui-admin-vben/src/views/mp/freePublish/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/freePublish/index.vue rename to yunxi-ui-admin-vben/src/views/mp/freePublish/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/material/index.vue b/yunxi-ui-admin-vben/src/views/mp/material/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/material/index.vue rename to yunxi-ui-admin-vben/src/views/mp/material/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/menu/index.vue b/yunxi-ui-admin-vben/src/views/mp/menu/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/menu/index.vue rename to yunxi-ui-admin-vben/src/views/mp/menu/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/message/MessageModal.vue b/yunxi-ui-admin-vben/src/views/mp/message/MessageModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/message/MessageModal.vue rename to yunxi-ui-admin-vben/src/views/mp/message/MessageModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/message/index.vue b/yunxi-ui-admin-vben/src/views/mp/message/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/message/index.vue rename to yunxi-ui-admin-vben/src/views/mp/message/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/message/message.data.ts b/yunxi-ui-admin-vben/src/views/mp/message/message.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/message/message.data.ts rename to yunxi-ui-admin-vben/src/views/mp/message/message.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/mp/statistics/components/InterfaceSummaryChart.vue b/yunxi-ui-admin-vben/src/views/mp/statistics/components/InterfaceSummaryChart.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/statistics/components/InterfaceSummaryChart.vue rename to yunxi-ui-admin-vben/src/views/mp/statistics/components/InterfaceSummaryChart.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/statistics/components/UpstreamMessageChart.vue b/yunxi-ui-admin-vben/src/views/mp/statistics/components/UpstreamMessageChart.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/statistics/components/UpstreamMessageChart.vue rename to yunxi-ui-admin-vben/src/views/mp/statistics/components/UpstreamMessageChart.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/statistics/components/UserCumulateChart.vue b/yunxi-ui-admin-vben/src/views/mp/statistics/components/UserCumulateChart.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/statistics/components/UserCumulateChart.vue rename to yunxi-ui-admin-vben/src/views/mp/statistics/components/UserCumulateChart.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/statistics/components/UserSummaryChart.vue b/yunxi-ui-admin-vben/src/views/mp/statistics/components/UserSummaryChart.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/statistics/components/UserSummaryChart.vue rename to yunxi-ui-admin-vben/src/views/mp/statistics/components/UserSummaryChart.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/statistics/index.vue b/yunxi-ui-admin-vben/src/views/mp/statistics/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/statistics/index.vue rename to yunxi-ui-admin-vben/src/views/mp/statistics/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/statistics/statistics.data.ts b/yunxi-ui-admin-vben/src/views/mp/statistics/statistics.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/statistics/statistics.data.ts rename to yunxi-ui-admin-vben/src/views/mp/statistics/statistics.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/mp/tag/TagModal.vue b/yunxi-ui-admin-vben/src/views/mp/tag/TagModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/tag/TagModal.vue rename to yunxi-ui-admin-vben/src/views/mp/tag/TagModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/tag/index.vue b/yunxi-ui-admin-vben/src/views/mp/tag/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/tag/index.vue rename to yunxi-ui-admin-vben/src/views/mp/tag/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/tag/tag.data.ts b/yunxi-ui-admin-vben/src/views/mp/tag/tag.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/tag/tag.data.ts rename to yunxi-ui-admin-vben/src/views/mp/tag/tag.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/mp/user/MpUserModal.vue b/yunxi-ui-admin-vben/src/views/mp/user/MpUserModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/user/MpUserModal.vue rename to yunxi-ui-admin-vben/src/views/mp/user/MpUserModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/user/index.vue b/yunxi-ui-admin-vben/src/views/mp/user/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/user/index.vue rename to yunxi-ui-admin-vben/src/views/mp/user/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/mp/user/mpuser.data.ts b/yunxi-ui-admin-vben/src/views/mp/user/mpuser.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/mp/user/mpuser.data.ts rename to yunxi-ui-admin-vben/src/views/mp/user/mpuser.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/pay/app/AppModal.vue b/yunxi-ui-admin-vben/src/views/pay/app/AppModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/app/AppModal.vue rename to yunxi-ui-admin-vben/src/views/pay/app/AppModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/app/ChannelModal.vue b/yunxi-ui-admin-vben/src/views/pay/app/ChannelModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/app/ChannelModal.vue rename to yunxi-ui-admin-vben/src/views/pay/app/ChannelModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/app/app.data.ts b/yunxi-ui-admin-vben/src/views/pay/app/app.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/app/app.data.ts rename to yunxi-ui-admin-vben/src/views/pay/app/app.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/pay/app/index.vue b/yunxi-ui-admin-vben/src/views/pay/app/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/app/index.vue rename to yunxi-ui-admin-vben/src/views/pay/app/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/cashier/cashier.data.ts b/yunxi-ui-admin-vben/src/views/pay/cashier/cashier.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/cashier/cashier.data.ts rename to yunxi-ui-admin-vben/src/views/pay/cashier/cashier.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/pay/cashier/index.vue b/yunxi-ui-admin-vben/src/views/pay/cashier/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/cashier/index.vue rename to yunxi-ui-admin-vben/src/views/pay/cashier/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/demo/DemoModal.vue b/yunxi-ui-admin-vben/src/views/pay/demo/DemoModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/demo/DemoModal.vue rename to yunxi-ui-admin-vben/src/views/pay/demo/DemoModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/demo/demo.data.ts b/yunxi-ui-admin-vben/src/views/pay/demo/demo.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/demo/demo.data.ts rename to yunxi-ui-admin-vben/src/views/pay/demo/demo.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/pay/demo/index.vue b/yunxi-ui-admin-vben/src/views/pay/demo/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/demo/index.vue rename to yunxi-ui-admin-vben/src/views/pay/demo/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/notify/NotifyModal.vue b/yunxi-ui-admin-vben/src/views/pay/notify/NotifyModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/notify/NotifyModal.vue rename to yunxi-ui-admin-vben/src/views/pay/notify/NotifyModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/notify/index.vue b/yunxi-ui-admin-vben/src/views/pay/notify/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/notify/index.vue rename to yunxi-ui-admin-vben/src/views/pay/notify/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/notify/notify.data.ts b/yunxi-ui-admin-vben/src/views/pay/notify/notify.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/notify/notify.data.ts rename to yunxi-ui-admin-vben/src/views/pay/notify/notify.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/pay/order/OrderModal.vue b/yunxi-ui-admin-vben/src/views/pay/order/OrderModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/order/OrderModal.vue rename to yunxi-ui-admin-vben/src/views/pay/order/OrderModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/order/index.vue b/yunxi-ui-admin-vben/src/views/pay/order/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/order/index.vue rename to yunxi-ui-admin-vben/src/views/pay/order/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/order/order.data.ts b/yunxi-ui-admin-vben/src/views/pay/order/order.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/order/order.data.ts rename to yunxi-ui-admin-vben/src/views/pay/order/order.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/pay/refund/RefundModal.vue b/yunxi-ui-admin-vben/src/views/pay/refund/RefundModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/refund/RefundModal.vue rename to yunxi-ui-admin-vben/src/views/pay/refund/RefundModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/refund/index.vue b/yunxi-ui-admin-vben/src/views/pay/refund/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/refund/index.vue rename to yunxi-ui-admin-vben/src/views/pay/refund/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/pay/refund/refund.data.ts b/yunxi-ui-admin-vben/src/views/pay/refund/refund.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/pay/refund/refund.data.ts rename to yunxi-ui-admin-vben/src/views/pay/refund/refund.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/report/goview/index.vue b/yunxi-ui-admin-vben/src/views/report/goview/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/report/goview/index.vue rename to yunxi-ui-admin-vben/src/views/report/goview/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/report/jmreport/index.vue b/yunxi-ui-admin-vben/src/views/report/jmreport/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/report/jmreport/index.vue rename to yunxi-ui-admin-vben/src/views/report/jmreport/index.vue diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/index.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/index.vue new file mode 100644 index 0000000..829b278 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/index.vue @@ -0,0 +1,235 @@ + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/ConfirmDel.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/ConfirmDel.vue new file mode 100644 index 0000000..e69de29 diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/ModalAdd.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/ModalAdd.vue new file mode 100644 index 0000000..efe1da3 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/ModalAdd.vue @@ -0,0 +1,77 @@ + + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/ModalEdit.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/ModalEdit.vue new file mode 100644 index 0000000..3ddd2c0 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/ModalEdit.vue @@ -0,0 +1,73 @@ + + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/TransferList.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/TransferList.vue new file mode 100644 index 0000000..1da1e3e --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/branch/src/TransferList.vue @@ -0,0 +1,58 @@ + + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/index.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/index.vue new file mode 100644 index 0000000..1bdc167 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/index.vue @@ -0,0 +1,258 @@ + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/AuthInfo.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/AuthInfo.vue new file mode 100644 index 0000000..d573d58 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/AuthInfo.vue @@ -0,0 +1,250 @@ + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/BasicInfo.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/BasicInfo.vue new file mode 100644 index 0000000..ac6b474 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/BasicInfo.vue @@ -0,0 +1,285 @@ + + + + + + diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/Branch.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/Branch.vue new file mode 100644 index 0000000..864da8a --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/Branch.vue @@ -0,0 +1,321 @@ + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/CustomerInfo.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/CustomerInfo.vue new file mode 100644 index 0000000..16de80e --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/CustomerInfo.vue @@ -0,0 +1,455 @@ + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/EmployeeInfo.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/EmployeeInfo.vue new file mode 100644 index 0000000..a6ff6d3 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/EmployeeInfo.vue @@ -0,0 +1,521 @@ + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/OperateRecords.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/OperateRecords.vue new file mode 100644 index 0000000..086433f --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/OperateRecords.vue @@ -0,0 +1,169 @@ + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/OrgInfo.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/OrgInfo.vue new file mode 100644 index 0000000..eeec121 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/OrgInfo.vue @@ -0,0 +1,317 @@ + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/ProviderInfo.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/ProviderInfo.vue new file mode 100644 index 0000000..1f69bd1 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/ProviderInfo.vue @@ -0,0 +1,569 @@ + + + + + \ No newline at end of file diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/SupplierInfo.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/SupplierInfo.vue new file mode 100644 index 0000000..16de80e --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/SupplierInfo.vue @@ -0,0 +1,455 @@ + + + + + \ No newline at end of file diff --git a/yudao-ui-admin-vben-master/src/views/system/area/AreaModal.vue b/yunxi-ui-admin-vben/src/views/system/area/AreaModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/area/AreaModal.vue rename to yunxi-ui-admin-vben/src/views/system/area/AreaModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/area/area.data.ts b/yunxi-ui-admin-vben/src/views/system/area/area.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/area/area.data.ts rename to yunxi-ui-admin-vben/src/views/system/area/area.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/area/index.vue b/yunxi-ui-admin-vben/src/views/system/area/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/area/index.vue rename to yunxi-ui-admin-vben/src/views/system/area/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/dept/DeptModal.vue b/yunxi-ui-admin-vben/src/views/system/dept/DeptModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/dept/DeptModal.vue rename to yunxi-ui-admin-vben/src/views/system/dept/DeptModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/dept/dept.data.ts b/yunxi-ui-admin-vben/src/views/system/dept/dept.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/dept/dept.data.ts rename to yunxi-ui-admin-vben/src/views/system/dept/dept.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/dept/index.vue b/yunxi-ui-admin-vben/src/views/system/dept/index.vue similarity index 99% rename from yudao-ui-admin-vben-master/src/views/system/dept/index.vue rename to yunxi-ui-admin-vben/src/views/system/dept/index.vue index 42b2b2a..4ea0448 100644 --- a/yudao-ui-admin-vben-master/src/views/system/dept/index.vue +++ b/yunxi-ui-admin-vben/src/views/system/dept/index.vue @@ -38,6 +38,7 @@ const [register, { expandAll, collapseAll, getForm, reload }] = useTable({ async function getList() { const res = await getDeptPage(getForm().getFieldsValue() as any) + console.log('dept',res) return handleTree(res, 'id') } diff --git a/yudao-ui-admin-vben-master/src/views/system/dict/DictData.vue b/yunxi-ui-admin-vben/src/views/system/dict/DictData.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/dict/DictData.vue rename to yunxi-ui-admin-vben/src/views/system/dict/DictData.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/dict/DictDataModal.vue b/yunxi-ui-admin-vben/src/views/system/dict/DictDataModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/dict/DictDataModal.vue rename to yunxi-ui-admin-vben/src/views/system/dict/DictDataModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/dict/DictTypeModal.vue b/yunxi-ui-admin-vben/src/views/system/dict/DictTypeModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/dict/DictTypeModal.vue rename to yunxi-ui-admin-vben/src/views/system/dict/DictTypeModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/dict/dict.data.ts b/yunxi-ui-admin-vben/src/views/system/dict/dict.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/dict/dict.data.ts rename to yunxi-ui-admin-vben/src/views/system/dict/dict.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/dict/dict.type.ts b/yunxi-ui-admin-vben/src/views/system/dict/dict.type.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/dict/dict.type.ts rename to yunxi-ui-admin-vben/src/views/system/dict/dict.type.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/dict/index.vue b/yunxi-ui-admin-vben/src/views/system/dict/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/dict/index.vue rename to yunxi-ui-admin-vben/src/views/system/dict/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/errorCode/ErrorCodeModal.vue b/yunxi-ui-admin-vben/src/views/system/errorCode/ErrorCodeModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/errorCode/ErrorCodeModal.vue rename to yunxi-ui-admin-vben/src/views/system/errorCode/ErrorCodeModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/errorCode/errorCode.data.ts b/yunxi-ui-admin-vben/src/views/system/errorCode/errorCode.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/errorCode/errorCode.data.ts rename to yunxi-ui-admin-vben/src/views/system/errorCode/errorCode.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/errorCode/index.vue b/yunxi-ui-admin-vben/src/views/system/errorCode/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/errorCode/index.vue rename to yunxi-ui-admin-vben/src/views/system/errorCode/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/loginlog/index.vue b/yunxi-ui-admin-vben/src/views/system/loginlog/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/loginlog/index.vue rename to yunxi-ui-admin-vben/src/views/system/loginlog/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/loginlog/index1.vue b/yunxi-ui-admin-vben/src/views/system/loginlog/index1.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/loginlog/index1.vue rename to yunxi-ui-admin-vben/src/views/system/loginlog/index1.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/loginlog/loginLog.data.ts b/yunxi-ui-admin-vben/src/views/system/loginlog/loginLog.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/loginlog/loginLog.data.ts rename to yunxi-ui-admin-vben/src/views/system/loginlog/loginLog.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/mail/account/AccountModal.vue b/yunxi-ui-admin-vben/src/views/system/mail/account/AccountModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/mail/account/AccountModal.vue rename to yunxi-ui-admin-vben/src/views/system/mail/account/AccountModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/mail/account/account.data.ts b/yunxi-ui-admin-vben/src/views/system/mail/account/account.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/mail/account/account.data.ts rename to yunxi-ui-admin-vben/src/views/system/mail/account/account.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/mail/account/index.vue b/yunxi-ui-admin-vben/src/views/system/mail/account/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/mail/account/index.vue rename to yunxi-ui-admin-vben/src/views/system/mail/account/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/mail/log/MailLogModal.vue b/yunxi-ui-admin-vben/src/views/system/mail/log/MailLogModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/mail/log/MailLogModal.vue rename to yunxi-ui-admin-vben/src/views/system/mail/log/MailLogModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/mail/log/index.vue b/yunxi-ui-admin-vben/src/views/system/mail/log/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/mail/log/index.vue rename to yunxi-ui-admin-vben/src/views/system/mail/log/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/mail/log/mailLog.data.ts b/yunxi-ui-admin-vben/src/views/system/mail/log/mailLog.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/mail/log/mailLog.data.ts rename to yunxi-ui-admin-vben/src/views/system/mail/log/mailLog.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/mail/template/SendMailModal.vue b/yunxi-ui-admin-vben/src/views/system/mail/template/SendMailModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/mail/template/SendMailModal.vue rename to yunxi-ui-admin-vben/src/views/system/mail/template/SendMailModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/mail/template/TemplateModal.vue b/yunxi-ui-admin-vben/src/views/system/mail/template/TemplateModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/mail/template/TemplateModal.vue rename to yunxi-ui-admin-vben/src/views/system/mail/template/TemplateModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/mail/template/index.vue b/yunxi-ui-admin-vben/src/views/system/mail/template/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/mail/template/index.vue rename to yunxi-ui-admin-vben/src/views/system/mail/template/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/mail/template/template.data.ts b/yunxi-ui-admin-vben/src/views/system/mail/template/template.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/mail/template/template.data.ts rename to yunxi-ui-admin-vben/src/views/system/mail/template/template.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/menu/MenuModal.vue b/yunxi-ui-admin-vben/src/views/system/menu/MenuModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/menu/MenuModal.vue rename to yunxi-ui-admin-vben/src/views/system/menu/MenuModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/menu/index.vue b/yunxi-ui-admin-vben/src/views/system/menu/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/menu/index.vue rename to yunxi-ui-admin-vben/src/views/system/menu/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/menu/menu.data.ts b/yunxi-ui-admin-vben/src/views/system/menu/menu.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/menu/menu.data.ts rename to yunxi-ui-admin-vben/src/views/system/menu/menu.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/notice/NoticeModal.vue b/yunxi-ui-admin-vben/src/views/system/notice/NoticeModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notice/NoticeModal.vue rename to yunxi-ui-admin-vben/src/views/system/notice/NoticeModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/notice/index.vue b/yunxi-ui-admin-vben/src/views/system/notice/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notice/index.vue rename to yunxi-ui-admin-vben/src/views/system/notice/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/notice/index1.vue b/yunxi-ui-admin-vben/src/views/system/notice/index1.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notice/index1.vue rename to yunxi-ui-admin-vben/src/views/system/notice/index1.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/notice/notice.data.ts b/yunxi-ui-admin-vben/src/views/system/notice/notice.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notice/notice.data.ts rename to yunxi-ui-admin-vben/src/views/system/notice/notice.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/components/MessageInfoModal.vue b/yunxi-ui-admin-vben/src/views/system/notify/components/MessageInfoModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/components/MessageInfoModal.vue rename to yunxi-ui-admin-vben/src/views/system/notify/components/MessageInfoModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/components/message.data.ts b/yunxi-ui-admin-vben/src/views/system/notify/components/message.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/components/message.data.ts rename to yunxi-ui-admin-vben/src/views/system/notify/components/message.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/message/index.vue b/yunxi-ui-admin-vben/src/views/system/notify/message/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/message/index.vue rename to yunxi-ui-admin-vben/src/views/system/notify/message/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/message/index1.vue b/yunxi-ui-admin-vben/src/views/system/notify/message/index1.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/message/index1.vue rename to yunxi-ui-admin-vben/src/views/system/notify/message/index1.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/message/message.data.ts b/yunxi-ui-admin-vben/src/views/system/notify/message/message.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/message/message.data.ts rename to yunxi-ui-admin-vben/src/views/system/notify/message/message.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/my/index.vue b/yunxi-ui-admin-vben/src/views/system/notify/my/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/my/index.vue rename to yunxi-ui-admin-vben/src/views/system/notify/my/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/my/my.data.ts b/yunxi-ui-admin-vben/src/views/system/notify/my/my.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/my/my.data.ts rename to yunxi-ui-admin-vben/src/views/system/notify/my/my.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/template/SendNotifyModal.vue b/yunxi-ui-admin-vben/src/views/system/notify/template/SendNotifyModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/template/SendNotifyModal.vue rename to yunxi-ui-admin-vben/src/views/system/notify/template/SendNotifyModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/template/TemplateModal.vue b/yunxi-ui-admin-vben/src/views/system/notify/template/TemplateModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/template/TemplateModal.vue rename to yunxi-ui-admin-vben/src/views/system/notify/template/TemplateModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/template/index.vue b/yunxi-ui-admin-vben/src/views/system/notify/template/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/template/index.vue rename to yunxi-ui-admin-vben/src/views/system/notify/template/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/notify/template/template.data.ts b/yunxi-ui-admin-vben/src/views/system/notify/template/template.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/notify/template/template.data.ts rename to yunxi-ui-admin-vben/src/views/system/notify/template/template.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/oauth2/client/ClientModal.vue b/yunxi-ui-admin-vben/src/views/system/oauth2/client/ClientModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/oauth2/client/ClientModal.vue rename to yunxi-ui-admin-vben/src/views/system/oauth2/client/ClientModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/oauth2/client/client.data.ts b/yunxi-ui-admin-vben/src/views/system/oauth2/client/client.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/oauth2/client/client.data.ts rename to yunxi-ui-admin-vben/src/views/system/oauth2/client/client.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/oauth2/client/index.vue b/yunxi-ui-admin-vben/src/views/system/oauth2/client/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/oauth2/client/index.vue rename to yunxi-ui-admin-vben/src/views/system/oauth2/client/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/oauth2/token/index.vue b/yunxi-ui-admin-vben/src/views/system/oauth2/token/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/oauth2/token/index.vue rename to yunxi-ui-admin-vben/src/views/system/oauth2/token/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/oauth2/token/token.data.ts b/yunxi-ui-admin-vben/src/views/system/oauth2/token/token.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/oauth2/token/token.data.ts rename to yunxi-ui-admin-vben/src/views/system/oauth2/token/token.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/operatelog/LogInfoModal.vue b/yunxi-ui-admin-vben/src/views/system/operatelog/LogInfoModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/operatelog/LogInfoModal.vue rename to yunxi-ui-admin-vben/src/views/system/operatelog/LogInfoModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/operatelog/index.vue b/yunxi-ui-admin-vben/src/views/system/operatelog/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/operatelog/index.vue rename to yunxi-ui-admin-vben/src/views/system/operatelog/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/operatelog/operateLog.data.ts b/yunxi-ui-admin-vben/src/views/system/operatelog/operateLog.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/operatelog/operateLog.data.ts rename to yunxi-ui-admin-vben/src/views/system/operatelog/operateLog.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/post/PostModal.vue b/yunxi-ui-admin-vben/src/views/system/post/PostModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/post/PostModal.vue rename to yunxi-ui-admin-vben/src/views/system/post/PostModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/post/index.vue b/yunxi-ui-admin-vben/src/views/system/post/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/post/index.vue rename to yunxi-ui-admin-vben/src/views/system/post/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/post/post.data.ts b/yunxi-ui-admin-vben/src/views/system/post/post.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/post/post.data.ts rename to yunxi-ui-admin-vben/src/views/system/post/post.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/role/RoleMenuModal.vue b/yunxi-ui-admin-vben/src/views/system/role/RoleMenuModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/role/RoleMenuModal.vue rename to yunxi-ui-admin-vben/src/views/system/role/RoleMenuModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/role/RoleModal.vue b/yunxi-ui-admin-vben/src/views/system/role/RoleModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/role/RoleModal.vue rename to yunxi-ui-admin-vben/src/views/system/role/RoleModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/role/RoleScopeModal.vue b/yunxi-ui-admin-vben/src/views/system/role/RoleScopeModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/role/RoleScopeModal.vue rename to yunxi-ui-admin-vben/src/views/system/role/RoleScopeModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/role/index.vue b/yunxi-ui-admin-vben/src/views/system/role/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/role/index.vue rename to yunxi-ui-admin-vben/src/views/system/role/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/role/role.data.ts b/yunxi-ui-admin-vben/src/views/system/role/role.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/role/role.data.ts rename to yunxi-ui-admin-vben/src/views/system/role/role.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/sensitiveWord/SensitiveWordModal.vue b/yunxi-ui-admin-vben/src/views/system/sensitiveWord/SensitiveWordModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sensitiveWord/SensitiveWordModal.vue rename to yunxi-ui-admin-vben/src/views/system/sensitiveWord/SensitiveWordModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/sensitiveWord/index.vue b/yunxi-ui-admin-vben/src/views/system/sensitiveWord/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sensitiveWord/index.vue rename to yunxi-ui-admin-vben/src/views/system/sensitiveWord/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/sensitiveWord/sensitiveWord.data.ts b/yunxi-ui-admin-vben/src/views/system/sensitiveWord/sensitiveWord.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sensitiveWord/sensitiveWord.data.ts rename to yunxi-ui-admin-vben/src/views/system/sensitiveWord/sensitiveWord.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/sms/channel/SmsChannelModal.vue b/yunxi-ui-admin-vben/src/views/system/sms/channel/SmsChannelModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sms/channel/SmsChannelModal.vue rename to yunxi-ui-admin-vben/src/views/system/sms/channel/SmsChannelModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/sms/channel/index.vue b/yunxi-ui-admin-vben/src/views/system/sms/channel/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sms/channel/index.vue rename to yunxi-ui-admin-vben/src/views/system/sms/channel/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/sms/channel/smsChannel.data.ts b/yunxi-ui-admin-vben/src/views/system/sms/channel/smsChannel.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sms/channel/smsChannel.data.ts rename to yunxi-ui-admin-vben/src/views/system/sms/channel/smsChannel.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/sms/log/index.vue b/yunxi-ui-admin-vben/src/views/system/sms/log/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sms/log/index.vue rename to yunxi-ui-admin-vben/src/views/system/sms/log/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/sms/log/smsLog.data.ts b/yunxi-ui-admin-vben/src/views/system/sms/log/smsLog.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sms/log/smsLog.data.ts rename to yunxi-ui-admin-vben/src/views/system/sms/log/smsLog.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/sms/template/SendSmsModal.vue b/yunxi-ui-admin-vben/src/views/system/sms/template/SendSmsModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sms/template/SendSmsModal.vue rename to yunxi-ui-admin-vben/src/views/system/sms/template/SendSmsModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/sms/template/SmsTemplateModal.vue b/yunxi-ui-admin-vben/src/views/system/sms/template/SmsTemplateModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sms/template/SmsTemplateModal.vue rename to yunxi-ui-admin-vben/src/views/system/sms/template/SmsTemplateModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/sms/template/index.vue b/yunxi-ui-admin-vben/src/views/system/sms/template/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sms/template/index.vue rename to yunxi-ui-admin-vben/src/views/system/sms/template/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/sms/template/smsTemplate.data.ts b/yunxi-ui-admin-vben/src/views/system/sms/template/smsTemplate.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/sms/template/smsTemplate.data.ts rename to yunxi-ui-admin-vben/src/views/system/sms/template/smsTemplate.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/tenant/TenantModal.vue b/yunxi-ui-admin-vben/src/views/system/tenant/TenantModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/tenant/TenantModal.vue rename to yunxi-ui-admin-vben/src/views/system/tenant/TenantModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/tenant/index.vue b/yunxi-ui-admin-vben/src/views/system/tenant/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/tenant/index.vue rename to yunxi-ui-admin-vben/src/views/system/tenant/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/tenant/tenant.data.ts b/yunxi-ui-admin-vben/src/views/system/tenant/tenant.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/tenant/tenant.data.ts rename to yunxi-ui-admin-vben/src/views/system/tenant/tenant.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/tenantPackage/TenantPackageModal.vue b/yunxi-ui-admin-vben/src/views/system/tenantPackage/TenantPackageModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/tenantPackage/TenantPackageModal.vue rename to yunxi-ui-admin-vben/src/views/system/tenantPackage/TenantPackageModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/tenantPackage/index.vue b/yunxi-ui-admin-vben/src/views/system/tenantPackage/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/tenantPackage/index.vue rename to yunxi-ui-admin-vben/src/views/system/tenantPackage/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/tenantPackage/tenantPackage.data.ts b/yunxi-ui-admin-vben/src/views/system/tenantPackage/tenantPackage.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/tenantPackage/tenantPackage.data.ts rename to yunxi-ui-admin-vben/src/views/system/tenantPackage/tenantPackage.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/system/user/DeptTree.vue b/yunxi-ui-admin-vben/src/views/system/user/DeptTree.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/user/DeptTree.vue rename to yunxi-ui-admin-vben/src/views/system/user/DeptTree.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/user/ResetPwdModal.vue b/yunxi-ui-admin-vben/src/views/system/user/ResetPwdModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/user/ResetPwdModal.vue rename to yunxi-ui-admin-vben/src/views/system/user/ResetPwdModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/user/UserModal.vue b/yunxi-ui-admin-vben/src/views/system/user/UserModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/user/UserModal.vue rename to yunxi-ui-admin-vben/src/views/system/user/UserModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/user/UserRoleModal.vue b/yunxi-ui-admin-vben/src/views/system/user/UserRoleModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/user/UserRoleModal.vue rename to yunxi-ui-admin-vben/src/views/system/user/UserRoleModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/user/index.vue b/yunxi-ui-admin-vben/src/views/system/user/index.vue similarity index 97% rename from yudao-ui-admin-vben-master/src/views/system/user/index.vue rename to yunxi-ui-admin-vben/src/views/system/user/index.vue index 4f55b3f..c24b17d 100644 --- a/yudao-ui-admin-vben-master/src/views/system/user/index.vue +++ b/yunxi-ui-admin-vben/src/views/system/user/index.vue @@ -12,7 +12,7 @@ import { IconEnum } from '@/enums/appEnum' import { BasicTable, TableAction, useTable } from '@/components/Table' import type { UserExportReqVO } from '@/api/system/user' import { deleteUser, exportUser, getUserPage } from '@/api/system/user' - +import { useUserStore } from '@/store/modules/user' defineOptions({ name: 'SystemUser' }) const { t } = useI18n() @@ -21,7 +21,7 @@ const [registerModal, { openModal }] = useModal() const [registerRoleModal, { openModal: openRoleModal }] = useModal() const [registerPwdModal, { openModal: openPwdModal }] = useModal() const searchInfo = reactive({}) - +const userStore = useUserStore() const [registerTable, { getForm, reload }] = useTable({ title: '账号列表', api: getUserPage, @@ -44,6 +44,8 @@ const [registerTable, { getForm, reload }] = useTable({ /** 新增按钮操作 */ function handleCreate() { + const userinfo = userStore.getUserInfo + debugger openModal(true, { isUpdate: false }) } diff --git a/yudao-ui-admin-vben-master/src/views/system/user/index1.vue b/yunxi-ui-admin-vben/src/views/system/user/index1.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/system/user/index1.vue rename to yunxi-ui-admin-vben/src/views/system/user/index1.vue diff --git a/yudao-ui-admin-vben-master/src/views/system/user/user.data.ts b/yunxi-ui-admin-vben/src/views/system/user/user.data.ts similarity index 99% rename from yudao-ui-admin-vben-master/src/views/system/user/user.data.ts rename to yunxi-ui-admin-vben/src/views/system/user/user.data.ts index 87b0af2..5c8b3a6 100644 --- a/yudao-ui-admin-vben-master/src/views/system/user/user.data.ts +++ b/yunxi-ui-admin-vben/src/views/system/user/user.data.ts @@ -30,6 +30,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'deptId', width: 120, customRender: ({ record }) => { + console.log('record',record) return useRender.renderTag(record.dept && record.dept.name) }, }, diff --git a/yudao-ui-admin-vben-master/src/views/users/configuration/index.vue b/yunxi-ui-admin-vben/src/views/users/configuration/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/users/configuration/index.vue rename to yunxi-ui-admin-vben/src/views/users/configuration/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/users/mine/index.vue b/yunxi-ui-admin-vben/src/views/users/mine/index.vue similarity index 94% rename from yudao-ui-admin-vben-master/src/views/users/mine/index.vue rename to yunxi-ui-admin-vben/src/views/users/mine/index.vue index 0267187..f47166c 100644 --- a/yudao-ui-admin-vben-master/src/views/users/mine/index.vue +++ b/yunxi-ui-admin-vben/src/views/users/mine/index.vue @@ -1,6 +1,8 @@ diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue b/yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue similarity index 98% rename from yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue rename to yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue index af624f5..994099f 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue +++ b/yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue @@ -45,6 +45,7 @@ async function handleSubmit() { if (unref(isUpdate)) { await updateBusinessWarehouse(values) } else { + values.diffFlag = 0 await createBusinessWarehouse(values) } closeModal() diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts b/yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts similarity index 84% rename from yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts rename to yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts index 96c522f..b27beb1 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts +++ b/yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts @@ -168,6 +168,7 @@ export const createFormSchema: FormSchema[] = [ field: 'belongUserId', component: 'Input', }, +<<<<<<< HEAD:yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts { label: '区分标志', field: 'diffFlag', @@ -177,6 +178,17 @@ export const createFormSchema: FormSchema[] = [ options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number'), }, }, +======= + // { + // label: '区分标志', + // field: 'diffFlag', + // required: true, + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number') + // } + // }, +>>>>>>> add9532e04020984b8af814009400f6d2b947fce:yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts ] export const updateFormSchema: FormSchema[] = [ @@ -239,6 +251,7 @@ export const updateFormSchema: FormSchema[] = [ field: 'belongUserId', component: 'Input', }, +<<<<<<< HEAD:yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts { label: '区分标志', field: 'diffFlag', @@ -248,4 +261,15 @@ export const updateFormSchema: FormSchema[] = [ options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number'), }, }, +======= + // { + // label: '区分标志', + // field: 'diffFlag', + // required: true, + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number') + // } + // }, +>>>>>>> add9532e04020984b8af814009400f6d2b947fce:yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts ] diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue b/yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/index.vue similarity index 83% rename from yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue rename to yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/index.vue index 6bf4ca8..af32c91 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue +++ b/yunxi-ui-admin-vben/src/views/xxjj/businessWarehouse/index.vue @@ -13,6 +13,9 @@ + diff --git a/yunxi-ui-admin-vben/src/views/xxjj/customer/subjectBasic.data.ts b/yunxi-ui-admin-vben/src/views/xxjj/customer/subjectBasic.data.ts new file mode 100644 index 0000000..2db58c9 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/xxjj/customer/subjectBasic.data.ts @@ -0,0 +1,1732 @@ +import { BasicColumn, FormSchema, useRender } from '@/components/Table' +import { DICT_TYPE, getDictOptions } from '@/utils/dict' + +export const columns: BasicColumn[] = [ + { + title: '编号', + dataIndex: 'id', + width: 160 + }, + /* { + title: '业务类型(0：客户 1：供应商 2：服务商)', + dataIndex: 'businessType', + width: 160 + }, */ + { + title: '客户名称', + dataIndex: 'name', + width: 160 + }, + { + title: '客户状态', + dataIndex: 'customerStatus', + width: 180, + customRender: ({ text }) => { + return useRender.renderDict(text, DICT_TYPE.CUSTOMER_STATUS) + } + }, + { + title: '客户分类', + dataIndex: 'calssify', + width: 160, + customRender: ({ text }) => { + return useRender.renderDict(text, DICT_TYPE.CUSTOMER_CALSSIFY) + } + }, + /* { + title: '公司logo', + dataIndex: 'logo', + width: 160 + }, */ + { + title: '企业性质', + dataIndex: 'enterpriseNature', + width: 160, + customRender: ({ text }) => { + return useRender.renderDict(text, DICT_TYPE.enterpriseNature) + } + }, + { + title: '行业分类', + dataIndex: 'industryClassify', + width: 160, + customRender: ({ text }) => { + return useRender.renderDict(text, DICT_TYPE.industryClassify) + } + }, + { + title: '信用等级', + dataIndex: 'customerStarrating', + width: 160, + customRender: ({ text }) => { + return useRender.renderDict(text, DICT_TYPE.CUSTOMER_STARRATING) + } + }, + { + title: '业务进度', + dataIndex: 'industrySchedule', + width: 160, + customRender: ({ text }) => { + return useRender.renderDict(text, DICT_TYPE.industrySchedule) + } + }, + { + title: '归属人员', + dataIndex: 'belongingPeople', + width: 160 + }, + + + + + /* { + title: '客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)', + dataIndex: 'customerSource', + width: 160 + }, + { + title: '所在城市', + dataIndex: 'city', + width: 160 + }, + { + title: '国家', + dataIndex: 'country', + width: 160 + }, + { + title: '详细地址', + dataIndex: 'address', + width: 160 + }, + { + title: '公司电话', + dataIndex: 'phone', + width: 160 + }, + { + title: '公司传真', + dataIndex: 'companyFax', + width: 160 + }, + { + title: '公司网址', + dataIndex: 'companyHttp', + width: 160 + }, + { + title: '公司介绍', + dataIndex: 'companyProfile', + width: 160 + }, + { + title: '客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)', + dataIndex: 'customerStatus', + width: 160 + }, + { + title: '社会信息代码证（营业执照）', + dataIndex: 'socialInformationCodeCertificate', + width: 160 + }, + { + title: '注册地址', + dataIndex: 'registerAddress', + width: 160 + }, + { + title: '社会统一信息代码', + dataIndex: 'informationCode', + width: 160 + }, + { + title: '经营时间开始', + dataIndex: 'operateStart', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '经营时间结束', + dataIndex: 'operateEnd', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '注册资金', + dataIndex: 'registerCapital', + width: 160 + }, + { + title: '经营范围', + dataIndex: 'businessScope', + width: 160 + }, + { + title: '实缴资金证明', + dataIndex: 'proofPaidCapital', + width: 160 + }, + { + title: '资产证明', + dataIndex: 'assetCertificate', + width: 160 + }, + { + title: '资产抵押证明', + dataIndex: 'assetCertificateMortgage', + width: 160 + }, + { + title: '其他资质文件', + dataIndex: 'otherQualifications', + width: 160 + }, + { + title: '合作时间开始', + dataIndex: 'collaborationStart', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '合作时间结束', + dataIndex: 'collaborationEnd', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '需求量（每月下限）', + dataIndex: 'demandVolumeDown', + width: 160 + }, + { + title: '需求量（每月上限）', + dataIndex: 'demandVolumeUpper', + width: 160 + }, + { + title: '资金额度', + dataIndex: 'fundLimit', + width: 160 + }, + { + title: '营业时间', + dataIndex: 'businessHours', + width: 160 + }, + { + title: '营业时间开始', + dataIndex: 'businessStart', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '营业时间结束', + dataIndex: 'businessEnd', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '允许卸货时间开始', + dataIndex: 'allowableUnloadingStart', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '允许卸货时间结束', + dataIndex: 'allowableUnloadingEnd', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '卸货时长', + dataIndex: 'unloading', + width: 160 + }, + { + title: '卸货效率', + dataIndex: 'unloadingEfficiency', + width: 160 + }, + { + title: '允许装货时间开始', + dataIndex: 'allowableShipmentStart', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '允许装货时间结束', + dataIndex: 'allowableShipmentEnd', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '装货时长', + dataIndex: 'shipment', + width: 160 + }, + { + title: '装货效果', + dataIndex: 'shipmentEffciency', + width: 160 + }, + { + title: '付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)', + dataIndex: 'paymentMethod', + width: 160 + }, + { + title: '账户名称', + dataIndex: 'accountName', + width: 160 + }, + { + title: '银行账号', + dataIndex: 'bankAccount', + width: 160 + }, + { + title: '开户银行', + dataIndex: 'bankDeposit', + width: 160 + }, + { + title: '开户地区', + dataIndex: 'depositArea', + width: 160 + }, + { + title: '支行名称', + dataIndex: 'bankBranch', + width: 160 + }, + { + title: '公司税号', + dataIndex: 'companyTaxNumber', + width: 160 + }, + { + title: '企业名称', + dataIndex: 'enterpriseName', + width: 160 + }, + { + title: '单位地址', + dataIndex: 'workAddress', + width: 160 + }, + { + title: '合作方式(0：买断 1：联营)', + dataIndex: 'collaborationMethod', + width: 160 + }, + { + title: '结算方式(0:先货后款 1：先款后货)', + dataIndex: 'settlementMethod', + width: 160 + }, + { + title: '账期', + dataIndex: 'accountPeriod', + width: 160 + }, + { + title: '压款方式(0：无 1：按金额 2：按比例)', + dataIndex: 'underpaymentMethod', + width: 160 + }, + { + title: '申请压款比例', + dataIndex: 'applyForUnderpaymentRatio', + width: 160 + }, + { + title: '保证金方式(0：无 1：按金额 2：按比例)', + dataIndex: 'marginMethod', + width: 160 + }, + { + title: '申请保证金比例', + dataIndex: 'applyForMarginRatio', + width: 160 + }, + { + title: '逾期利率(0：按年化1：按月化)', + dataIndex: 'overdueInterestRate', + width: 160 + }, + { + title: '申请逾期利率', + dataIndex: 'applyForOverdueRatio', + width: 160 + }, + { + title: '预留字段1', + dataIndex: 'reservedFields1', + width: 160 + }, + { + title: '预留字段2', + dataIndex: 'reservedFields2', + width: 160 + }, + { + title: '预留字段3', + dataIndex: 'reservedFields3', + width: 160 + }, + { + title: '预留字段4', + dataIndex: 'reservedFields4', + width: 160 + }, + { + title: '预留字段5', + dataIndex: 'reservedFields5', + width: 160 + }, + { + title: '预留字段6', + dataIndex: 'reservedFields6', + width: 160 + }, + { + title: '信用级别(0：S 1：A 2：B)', + dataIndex: 'creditRating', + width: 160 + }, + { + title: '信用级别(0：开启 1：关闭)', + dataIndex: 'autoCreditRating', + width: 160 + }, + { + title: '应收款上限', + dataIndex: 'accountsReceivableUpper', + width: 160 + }, + { + title: '订单量下限', + dataIndex: 'orderQuantityDown', + width: 160 + }, + { + title: '订单量上限', + dataIndex: 'orderQuantityUpper', + width: 160 + }, + { + title: '应收款项逾期限制', + dataIndex: 'accountsReceivableOverdue', + width: 160 + }, + { + title: '完税证明超时限制', + dataIndex: 'taxPaymentCertificate', + width: 160 + }, */ + { + title: '创建时间', + dataIndex: 'createTime', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, +] + +export const searchFormSchema: FormSchema[] = [ + /* { + label: '业务类型(0：客户 1：供应商 2：服务商)', + field: 'businessType', + component: 'Select', + componentProps: { + options: [] + }, + colProps: { span: 8 } + }, + */ + { + label: '客户名称', + field: 'name', + component: 'Input', + colProps: { span: 4 } + }, + { + label: '客户状态', + field: 'customerStatus', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.CUSTOMER_STATUS) + }, + colProps: { span: 4 } + }, + { + label: '客户分类', + field: 'calssify', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.CUSTOMER_CALSSIFY) + }, + colProps: { span: 4 } + }, + { + label: '信用等级', + field: 'customerStarrating', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.CUSTOMER_STARRATING) + }, + colProps: { span: 4 } + }, + { + label: '业务进度', + field: 'industrySchedule', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.industrySchedule) + }, + colProps: { span: 4 } + }, + { + label: '行业分类', + field: 'industryClassify', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.industryClassify) + }, + colProps: { span: 4 } + }, + { + label: '客户来源', + field: 'customerSource', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.customerSource) + }, + colProps: { span: 4 } + }, + { + label: '企业性质', + field: 'enterpriseNature', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.enterpriseNature) + }, + colProps: { span: 4 } + }, + { + label: '归属人员', + field: 'belongingPeople', + component: 'Input', + colProps: { span: 4 } + }, + { + label: '所在城市', + field: 'city', + component: 'Input', + colProps: { span: 4 } + }, + /* { + label: '国家', + field: 'country', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '详细地址', + field: 'address', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司电话', + field: 'phone', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司传真', + field: 'companyFax', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司网址', + field: 'companyHttp', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司介绍', + field: 'companyProfile', + colProps: { span: 8 } + }, + { + label: '社会信息代码证（营业执照）', + field: 'socialInformationCodeCertificate', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '注册地址', + field: 'registerAddress', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '社会统一信息代码', + field: 'informationCode', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '经营时间开始', + field: 'operateStart', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '经营时间结束', + field: 'operateEnd', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '注册资金', + field: 'registerCapital', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '经营范围', + field: 'businessScope', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '实缴资金证明', + field: 'proofPaidCapital', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '资产证明', + field: 'assetCertificate', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '资产抵押证明', + field: 'assetCertificateMortgage', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '其他资质文件', + field: 'otherQualifications', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '合作时间开始', + field: 'collaborationStart', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '合作时间结束', + field: 'collaborationEnd', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '需求量（每月下限）', + field: 'demandVolumeDown', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '需求量（每月上限）', + field: 'demandVolumeUpper', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '资金额度', + field: 'fundLimit', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '营业时间', + field: 'businessHours', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '营业时间开始', + field: 'businessStart', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '营业时间结束', + field: 'businessEnd', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '允许卸货时间开始', + field: 'allowableUnloadingStart', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '允许卸货时间结束', + field: 'allowableUnloadingEnd', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '卸货时长', + field: 'unloading', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '卸货效率', + field: 'unloadingEfficiency', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '允许装货时间开始', + field: 'allowableShipmentStart', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '允许装货时间结束', + field: 'allowableShipmentEnd', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '装货时长', + field: 'shipment', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '装货效果', + field: 'shipmentEffciency', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)', + field: 'paymentMethod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '账户名称', + field: 'accountName', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '银行账号', + field: 'bankAccount', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '开户银行', + field: 'bankDeposit', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '开户地区', + field: 'depositArea', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '支行名称', + field: 'bankBranch', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司税号', + field: 'companyTaxNumber', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '企业名称', + field: 'enterpriseName', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '单位地址', + field: 'workAddress', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '合作方式(0：买断 1：联营)', + field: 'collaborationMethod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '结算方式(0:先货后款 1：先款后货)', + field: 'settlementMethod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '账期', + field: 'accountPeriod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '压款方式(0：无 1：按金额 2：按比例)', + field: 'underpaymentMethod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '申请压款比例', + field: 'applyForUnderpaymentRatio', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '保证金方式(0：无 1：按金额 2：按比例)', + field: 'marginMethod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '申请保证金比例', + field: 'applyForMarginRatio', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '逾期利率(0：按年化1：按月化)', + field: 'overdueInterestRate', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '申请逾期利率', + field: 'applyForOverdueRatio', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段1', + field: 'reservedFields1', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段2', + field: 'reservedFields2', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段3', + field: 'reservedFields3', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段4', + field: 'reservedFields4', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段5', + field: 'reservedFields5', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段6', + field: 'reservedFields6', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '信用级别(0：S 1：A 2：B)', + field: 'creditRating', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '信用级别(0：开启 1：关闭)', + field: 'autoCreditRating', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '应收款上限', + field: 'accountsReceivableUpper', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '订单量下限', + field: 'orderQuantityDown', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '订单量上限', + field: 'orderQuantityUpper', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '应收款项逾期限制', + field: 'accountsReceivableOverdue', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '完税证明超时限制', + field: 'taxPaymentCertificate', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '创建时间', + field: 'createTime', + component: 'RangePicker', + colProps: { span: 8 } + }, */ +] + +export const createFormSchema: FormSchema[] = [ + { + label: '编号', + field: 'id', + show: false, + component: 'Input' + }, + { + label: '业务类型(0：客户 1：供应商 2：服务商)', + field: 'businessType', + required: true, + component: 'Select', + componentProps: { + options:[] + } + }, + { + label: '分类(0：一级 1：二级 2：三级)', + field: 'calssify', + required: true, + component: 'Input' + }, + { + label: '客户名称', + field: 'name', + component: 'Input' + }, + { + label: '公司logo', + field: 'logo', + component: 'Input' + }, + { + label: '企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)', + field: 'enterpriseNature', + component: 'Input' + }, + { + label: '行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)', + field: 'industryClassify', + component: 'Input' + }, + { + label: '客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)', + field: 'customerSource', + component: 'Input' + }, + { + label: '客户星级(0：一星 1：二星 2：三星 3：四星 4：五星)', + field: 'customerStarrating', + component: 'Input' + }, + { + label: '业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置)', + field: 'industrySchedule', + component: 'Input' + }, + { + label: '归属人员', + field: 'belongingPeople', + component: 'Input' + }, + { + label: '所在城市', + field: 'city', + component: 'Input' + }, + { + label: '国家', + field: 'country', + component: 'Input' + }, + { + label: '详细地址', + field: 'address', + component: 'Input' + }, + { + label: '公司电话', + field: 'phone', + component: 'Input' + }, + { + label: '公司传真', + field: 'companyFax', + component: 'Input' + }, + { + label: '公司网址', + field: 'companyHttp', + component: 'Input' + }, + { + label: '公司介绍', + field: 'companyProfile', + }, + { + label: '客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)', + field: 'customerStatus', + required: true, + component: 'RadioButtonGroup', + componentProps: { + options:[] + } + }, + { + label: '社会信息代码证（营业执照）', + field: 'socialInformationCodeCertificate', + component: 'Input' + }, + { + label: '注册地址', + field: 'registerAddress', + component: 'Input' + }, + { + label: '社会统一信息代码', + field: 'informationCode', + component: 'Input' + }, + { + label: '经营时间开始', + field: 'operateStart', + component: 'Input' + }, + { + label: '经营时间结束', + field: 'operateEnd', + component: 'Input' + }, + { + label: '注册资金', + field: 'registerCapital', + component: 'Input' + }, + { + label: '经营范围', + field: 'businessScope', + component: 'Input' + }, + { + label: '实缴资金证明', + field: 'proofPaidCapital', + component: 'Input' + }, + { + label: '资产证明', + field: 'assetCertificate', + component: 'Input' + }, + { + label: '资产抵押证明', + field: 'assetCertificateMortgage', + component: 'Input' + }, + { + label: '其他资质文件', + field: 'otherQualifications', + component: 'Input' + }, + { + label: '合作时间开始', + field: 'collaborationStart', + component: 'Input' + }, + { + label: '合作时间结束', + field: 'collaborationEnd', + component: 'Input' + }, + { + label: '需求量（每月下限）', + field: 'demandVolumeDown', + component: 'Input' + }, + { + label: '需求量（每月上限）', + field: 'demandVolumeUpper', + component: 'Input' + }, + { + label: '资金额度', + field: 'fundLimit', + component: 'Input' + }, + { + label: '营业时间', + field: 'businessHours', + component: 'Input' + }, + { + label: '营业时间开始', + field: 'businessStart', + component: 'Input' + }, + { + label: '营业时间结束', + field: 'businessEnd', + component: 'Input' + }, + { + label: '允许卸货时间开始', + field: 'allowableUnloadingStart', + component: 'Input' + }, + { + label: '允许卸货时间结束', + field: 'allowableUnloadingEnd', + component: 'Input' + }, + { + label: '卸货时长', + field: 'unloading', + component: 'Input' + }, + { + label: '卸货效率', + field: 'unloadingEfficiency', + component: 'Input' + }, + { + label: '允许装货时间开始', + field: 'allowableShipmentStart', + component: 'Input' + }, + { + label: '允许装货时间结束', + field: 'allowableShipmentEnd', + component: 'Input' + }, + { + label: '装货时长', + field: 'shipment', + component: 'Input' + }, + { + label: '装货效果', + field: 'shipmentEffciency', + component: 'Input' + }, + { + label: '付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)', + field: 'paymentMethod', + component: 'Input' + }, + { + label: '账户名称', + field: 'accountName', + component: 'Input' + }, + { + label: '银行账号', + field: 'bankAccount', + component: 'Input' + }, + { + label: '开户银行', + field: 'bankDeposit', + component: 'Input' + }, + { + label: '开户地区', + field: 'depositArea', + component: 'Input' + }, + { + label: '支行名称', + field: 'bankBranch', + component: 'Input' + }, + { + label: '公司税号', + field: 'companyTaxNumber', + component: 'Input' + }, + { + label: '企业名称', + field: 'enterpriseName', + component: 'Input' + }, + { + label: '单位地址', + field: 'workAddress', + component: 'Input' + }, + { + label: '合作方式(0：买断 1：联营)', + field: 'collaborationMethod', + component: 'Input' + }, + { + label: '结算方式(0:先货后款 1：先款后货)', + field: 'settlementMethod', + component: 'Input' + }, + { + label: '账期', + field: 'accountPeriod', + component: 'Input' + }, + { + label: '压款方式(0：无 1：按金额 2：按比例)', + field: 'underpaymentMethod', + component: 'Input' + }, + { + label: '申请压款比例', + field: 'applyForUnderpaymentRatio', + component: 'Input' + }, + { + label: '保证金方式(0：无 1：按金额 2：按比例)', + field: 'marginMethod', + component: 'Input' + }, + { + label: '申请保证金比例', + field: 'applyForMarginRatio', + component: 'Input' + }, + { + label: '逾期利率(0：按年化1：按月化)', + field: 'overdueInterestRate', + component: 'Input' + }, + { + label: '申请逾期利率', + field: 'applyForOverdueRatio', + component: 'Input' + }, + { + label: '预留字段1', + field: 'reservedFields1', + component: 'Input' + }, + { + label: '预留字段2', + field: 'reservedFields2', + component: 'Input' + }, + { + label: '预留字段3', + field: 'reservedFields3', + component: 'Input' + }, + { + label: '预留字段4', + field: 'reservedFields4', + component: 'Input' + }, + { + label: '预留字段5', + field: 'reservedFields5', + component: 'Input' + }, + { + label: '预留字段6', + field: 'reservedFields6', + component: 'Input' + }, + { + label: '信用级别(0：S 1：A 2：B)', + field: 'creditRating', + component: 'Input' + }, + { + label: '信用级别(0：开启 1：关闭)', + field: 'autoCreditRating', + component: 'Input' + }, + { + label: '应收款上限', + field: 'accountsReceivableUpper', + component: 'Input' + }, + { + label: '订单量下限', + field: 'orderQuantityDown', + component: 'Input' + }, + { + label: '订单量上限', + field: 'orderQuantityUpper', + component: 'Input' + }, + { + label: '应收款项逾期限制', + field: 'accountsReceivableOverdue', + component: 'Input' + }, + { + label: '完税证明超时限制', + field: 'taxPaymentCertificate', + component: 'Input' + }, +] + +export const updateFormSchema: FormSchema[] = [ + { + label: '编号', + field: 'id', + show: false, + component: 'Input' + }, + { + label: '业务类型(0：客户 1：供应商 2：服务商)', + field: 'businessType', + required: true, + component: 'Select', + componentProps: { + options:[] + } + }, + { + label: '分类(0：一级 1：二级 2：三级)', + field: 'calssify', + required: true, + component: 'Input' + }, + { + label: '客户名称', + field: 'name', + component: 'Input' + }, + { + label: '公司logo', + field: 'logo', + component: 'Input' + }, + { + label: '企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)', + field: 'enterpriseNature', + component: 'Input' + }, + { + label: '行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)', + field: 'industryClassify', + component: 'Input' + }, + { + label: '客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)', + field: 'customerSource', + component: 'Input' + }, + { + label: '客户星级(0：一星 1：二星 2：三星 3：四星 4：五星)', + field: 'customerStarrating', + component: 'Input' + }, + { + label: '业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置)', + field: 'industrySchedule', + component: 'Input' + }, + { + label: '归属人员', + field: 'belongingPeople', + component: 'Input' + }, + { + label: '所在城市', + field: 'city', + component: 'Input' + }, + { + label: '国家', + field: 'country', + component: 'Input' + }, + { + label: '详细地址', + field: 'address', + component: 'Input' + }, + { + label: '公司电话', + field: 'phone', + component: 'Input' + }, + { + label: '公司传真', + field: 'companyFax', + component: 'Input' + }, + { + label: '公司网址', + field: 'companyHttp', + component: 'Input' + }, + { + label: '公司介绍', + field: 'companyProfile', + }, + { + label: '客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)', + field: 'customerStatus', + required: true, + component: 'RadioButtonGroup', + componentProps: { + options:[] + } + }, + { + label: '社会信息代码证（营业执照）', + field: 'socialInformationCodeCertificate', + component: 'Input' + }, + { + label: '注册地址', + field: 'registerAddress', + component: 'Input' + }, + { + label: '社会统一信息代码', + field: 'informationCode', + component: 'Input' + }, + { + label: '经营时间开始', + field: 'operateStart', + component: 'Input' + }, + { + label: '经营时间结束', + field: 'operateEnd', + component: 'Input' + }, + { + label: '注册资金', + field: 'registerCapital', + component: 'Input' + }, + { + label: '经营范围', + field: 'businessScope', + component: 'Input' + }, + { + label: '实缴资金证明', + field: 'proofPaidCapital', + component: 'Input' + }, + { + label: '资产证明', + field: 'assetCertificate', + component: 'Input' + }, + { + label: '资产抵押证明', + field: 'assetCertificateMortgage', + component: 'Input' + }, + { + label: '其他资质文件', + field: 'otherQualifications', + component: 'Input' + }, + { + label: '合作时间开始', + field: 'collaborationStart', + component: 'Input' + }, + { + label: '合作时间结束', + field: 'collaborationEnd', + component: 'Input' + }, + { + label: '需求量（每月下限）', + field: 'demandVolumeDown', + component: 'Input' + }, + { + label: '需求量（每月上限）', + field: 'demandVolumeUpper', + component: 'Input' + }, + { + label: '资金额度', + field: 'fundLimit', + component: 'Input' + }, + { + label: '营业时间', + field: 'businessHours', + component: 'Input' + }, + { + label: '营业时间开始', + field: 'businessStart', + component: 'Input' + }, + { + label: '营业时间结束', + field: 'businessEnd', + component: 'Input' + }, + { + label: '允许卸货时间开始', + field: 'allowableUnloadingStart', + component: 'Input' + }, + { + label: '允许卸货时间结束', + field: 'allowableUnloadingEnd', + component: 'Input' + }, + { + label: '卸货时长', + field: 'unloading', + component: 'Input' + }, + { + label: '卸货效率', + field: 'unloadingEfficiency', + component: 'Input' + }, + { + label: '允许装货时间开始', + field: 'allowableShipmentStart', + component: 'Input' + }, + { + label: '允许装货时间结束', + field: 'allowableShipmentEnd', + component: 'Input' + }, + { + label: '装货时长', + field: 'shipment', + component: 'Input' + }, + { + label: '装货效果', + field: 'shipmentEffciency', + component: 'Input' + }, + { + label: '付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)', + field: 'paymentMethod', + component: 'Input' + }, + { + label: '账户名称', + field: 'accountName', + component: 'Input' + }, + { + label: '银行账号', + field: 'bankAccount', + component: 'Input' + }, + { + label: '开户银行', + field: 'bankDeposit', + component: 'Input' + }, + { + label: '开户地区', + field: 'depositArea', + component: 'Input' + }, + { + label: '支行名称', + field: 'bankBranch', + component: 'Input' + }, + { + label: '公司税号', + field: 'companyTaxNumber', + component: 'Input' + }, + { + label: '企业名称', + field: 'enterpriseName', + component: 'Input' + }, + { + label: '单位地址', + field: 'workAddress', + component: 'Input' + }, + { + label: '合作方式(0：买断 1：联营)', + field: 'collaborationMethod', + component: 'Input' + }, + { + label: '结算方式(0:先货后款 1：先款后货)', + field: 'settlementMethod', + component: 'Input' + }, + { + label: '账期', + field: 'accountPeriod', + component: 'Input' + }, + { + label: '压款方式(0：无 1：按金额 2：按比例)', + field: 'underpaymentMethod', + component: 'Input' + }, + { + label: '申请压款比例', + field: 'applyForUnderpaymentRatio', + component: 'Input' + }, + { + label: '保证金方式(0：无 1：按金额 2：按比例)', + field: 'marginMethod', + component: 'Input' + }, + { + label: '申请保证金比例', + field: 'applyForMarginRatio', + component: 'Input' + }, + { + label: '逾期利率(0：按年化1：按月化)', + field: 'overdueInterestRate', + component: 'Input' + }, + { + label: '申请逾期利率', + field: 'applyForOverdueRatio', + component: 'Input' + }, + { + label: '预留字段1', + field: 'reservedFields1', + component: 'Input' + }, + { + label: '预留字段2', + field: 'reservedFields2', + component: 'Input' + }, + { + label: '预留字段3', + field: 'reservedFields3', + component: 'Input' + }, + { + label: '预留字段4', + field: 'reservedFields4', + component: 'Input' + }, + { + label: '预留字段5', + field: 'reservedFields5', + component: 'Input' + }, + { + label: '预留字段6', + field: 'reservedFields6', + component: 'Input' + }, + { + label: '信用级别(0：S 1：A 2：B)', + field: 'creditRating', + component: 'Input' + }, + { + label: '信用级别(0：开启 1：关闭)', + field: 'autoCreditRating', + component: 'Input' + }, + { + label: '应收款上限', + field: 'accountsReceivableUpper', + component: 'Input' + }, + { + label: '订单量下限', + field: 'orderQuantityDown', + component: 'Input' + }, + { + label: '订单量上限', + field: 'orderQuantityUpper', + component: 'Input' + }, + { + label: '应收款项逾期限制', + field: 'accountsReceivableOverdue', + component: 'Input' + }, + { + label: '完税证明超时限制', + field: 'taxPaymentCertificate', + component: 'Input' + }, +] diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprise/EnterpriseModal.vue b/yunxi-ui-admin-vben/src/views/xxjj/enterprise/EnterpriseModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/xxjj/enterprise/EnterpriseModal.vue rename to yunxi-ui-admin-vben/src/views/xxjj/enterprise/EnterpriseModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprise/enterprise.data.ts b/yunxi-ui-admin-vben/src/views/xxjj/enterprise/enterprise.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/xxjj/enterprise/enterprise.data.ts rename to yunxi-ui-admin-vben/src/views/xxjj/enterprise/enterprise.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprise/index.vue b/yunxi-ui-admin-vben/src/views/xxjj/enterprise/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/xxjj/enterprise/index.vue rename to yunxi-ui-admin-vben/src/views/xxjj/enterprise/index.vue diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue b/yunxi-ui-admin-vben/src/views/xxjj/enterprisebranching/EnterpriseModal.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue rename to yunxi-ui-admin-vben/src/views/xxjj/enterprisebranching/EnterpriseModal.vue diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts b/yunxi-ui-admin-vben/src/views/xxjj/enterprisebranching/enterprise.data.ts similarity index 100% rename from yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts rename to yunxi-ui-admin-vben/src/views/xxjj/enterprisebranching/enterprise.data.ts diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue b/yunxi-ui-admin-vben/src/views/xxjj/enterprisebranching/index.vue similarity index 100% rename from yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue rename to yunxi-ui-admin-vben/src/views/xxjj/enterprisebranching/index.vue diff --git a/yunxi-ui-admin-vben/src/views/xxjj/service/SubjectBasicModal.vue b/yunxi-ui-admin-vben/src/views/xxjj/service/SubjectBasicModal.vue new file mode 100644 index 0000000..0c59c89 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/xxjj/service/SubjectBasicModal.vue @@ -0,0 +1,57 @@ + + diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/customer/index.vue b/yunxi-ui-admin-vben/src/views/xxjj/service/index.vue similarity index 55% rename from yudao-ui-admin-vben-master/src/views/xxjj/customer/index.vue rename to yunxi-ui-admin-vben/src/views/xxjj/service/index.vue index 78fedd9..0bcd993 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/customer/index.vue +++ b/yunxi-ui-admin-vben/src/views/xxjj/service/index.vue @@ -1,22 +1,68 @@ +<<<<<<< HEAD:yudao-ui-admin-vben-master/src/views/xxjj/customer/index.vue +======= + +>>>>>>> add9532e04020984b8af814009400f6d2b947fce:yunxi-ui-admin-vben/src/views/xxjj/service/index.vue diff --git a/yunxi-ui-admin-vben/src/views/xxjj/supplier/index.vue b/yunxi-ui-admin-vben/src/views/xxjj/supplier/index.vue new file mode 100644 index 0000000..4a7119b --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/xxjj/supplier/index.vue @@ -0,0 +1,92 @@ + + diff --git a/yunxi-ui-admin-vben/src/views/xxjj/supplier/subjectBasic.data.ts b/yunxi-ui-admin-vben/src/views/xxjj/supplier/subjectBasic.data.ts new file mode 100644 index 0000000..7a6b279 --- /dev/null +++ b/yunxi-ui-admin-vben/src/views/xxjj/supplier/subjectBasic.data.ts @@ -0,0 +1,1692 @@ +import { BasicColumn, FormSchema, useRender } from '@/components/Table' +import { DICT_TYPE, getDictOptions } from '@/utils/dict' + +export const columns: BasicColumn[] = [ + { + title: '编号', + dataIndex: 'id', + width: 160 + }, + { + title: '业务类型(0：客户 1：供应商 2：服务商)', + dataIndex: 'businessType', + width: 160 + }, + { + title: '分类(0：一级 1：二级 2：三级)', + dataIndex: 'calssify', + width: 160 + }, + { + title: '客户名称', + dataIndex: 'name', + width: 160 + }, + { + title: '公司logo', + dataIndex: 'logo', + width: 160 + }, + { + title: '企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)', + dataIndex: 'enterpriseNature', + width: 160 + }, + { + title: '行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)', + dataIndex: 'industryClassify', + width: 160 + }, + { + title: '客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)', + dataIndex: 'customerSource', + width: 160 + }, + { + title: '客户星级(0：一星 1：二星 2：三星 3：四星 4：五星)', + dataIndex: 'customerStarrating', + width: 160 + }, + { + title: '业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置)', + dataIndex: 'industrySchedule', + width: 160 + }, + { + title: '归属人员', + dataIndex: 'belongingPeople', + width: 160 + }, + { + title: '所在城市', + dataIndex: 'city', + width: 160 + }, + { + title: '国家', + dataIndex: 'country', + width: 160 + }, + { + title: '详细地址', + dataIndex: 'address', + width: 160 + }, + { + title: '公司电话', + dataIndex: 'phone', + width: 160 + }, + { + title: '公司传真', + dataIndex: 'companyFax', + width: 160 + }, + { + title: '公司网址', + dataIndex: 'companyHttp', + width: 160 + }, + { + title: '公司介绍', + dataIndex: 'companyProfile', + width: 160 + }, + { + title: '客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)', + dataIndex: 'customerStatus', + width: 160 + }, + { + title: '社会信息代码证（营业执照）', + dataIndex: 'socialInformationCodeCertificate', + width: 160 + }, + { + title: '注册地址', + dataIndex: 'registerAddress', + width: 160 + }, + { + title: '社会统一信息代码', + dataIndex: 'informationCode', + width: 160 + }, + { + title: '经营时间开始', + dataIndex: 'operateStart', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '经营时间结束', + dataIndex: 'operateEnd', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '注册资金', + dataIndex: 'registerCapital', + width: 160 + }, + { + title: '经营范围', + dataIndex: 'businessScope', + width: 160 + }, + { + title: '实缴资金证明', + dataIndex: 'proofPaidCapital', + width: 160 + }, + { + title: '资产证明', + dataIndex: 'assetCertificate', + width: 160 + }, + { + title: '资产抵押证明', + dataIndex: 'assetCertificateMortgage', + width: 160 + }, + { + title: '其他资质文件', + dataIndex: 'otherQualifications', + width: 160 + }, + { + title: '合作时间开始', + dataIndex: 'collaborationStart', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '合作时间结束', + dataIndex: 'collaborationEnd', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '需求量（每月下限）', + dataIndex: 'demandVolumeDown', + width: 160 + }, + { + title: '需求量（每月上限）', + dataIndex: 'demandVolumeUpper', + width: 160 + }, + { + title: '资金额度', + dataIndex: 'fundLimit', + width: 160 + }, + { + title: '营业时间', + dataIndex: 'businessHours', + width: 160 + }, + { + title: '营业时间开始', + dataIndex: 'businessStart', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '营业时间结束', + dataIndex: 'businessEnd', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '允许卸货时间开始', + dataIndex: 'allowableUnloadingStart', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '允许卸货时间结束', + dataIndex: 'allowableUnloadingEnd', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '卸货时长', + dataIndex: 'unloading', + width: 160 + }, + { + title: '卸货效率', + dataIndex: 'unloadingEfficiency', + width: 160 + }, + { + title: '允许装货时间开始', + dataIndex: 'allowableShipmentStart', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '允许装货时间结束', + dataIndex: 'allowableShipmentEnd', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, + { + title: '装货时长', + dataIndex: 'shipment', + width: 160 + }, + { + title: '装货效果', + dataIndex: 'shipmentEffciency', + width: 160 + }, + { + title: '付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)', + dataIndex: 'paymentMethod', + width: 160 + }, + { + title: '账户名称', + dataIndex: 'accountName', + width: 160 + }, + { + title: '银行账号', + dataIndex: 'bankAccount', + width: 160 + }, + { + title: '开户银行', + dataIndex: 'bankDeposit', + width: 160 + }, + { + title: '开户地区', + dataIndex: 'depositArea', + width: 160 + }, + { + title: '支行名称', + dataIndex: 'bankBranch', + width: 160 + }, + { + title: '公司税号', + dataIndex: 'companyTaxNumber', + width: 160 + }, + { + title: '企业名称', + dataIndex: 'enterpriseName', + width: 160 + }, + { + title: '单位地址', + dataIndex: 'workAddress', + width: 160 + }, + { + title: '合作方式(0：买断 1：联营)', + dataIndex: 'collaborationMethod', + width: 160 + }, + { + title: '结算方式(0:先货后款 1：先款后货)', + dataIndex: 'settlementMethod', + width: 160 + }, + { + title: '账期', + dataIndex: 'accountPeriod', + width: 160 + }, + { + title: '压款方式(0：无 1：按金额 2：按比例)', + dataIndex: 'underpaymentMethod', + width: 160 + }, + { + title: '申请压款比例', + dataIndex: 'applyForUnderpaymentRatio', + width: 160 + }, + { + title: '保证金方式(0：无 1：按金额 2：按比例)', + dataIndex: 'marginMethod', + width: 160 + }, + { + title: '申请保证金比例', + dataIndex: 'applyForMarginRatio', + width: 160 + }, + { + title: '逾期利率(0：按年化1：按月化)', + dataIndex: 'overdueInterestRate', + width: 160 + }, + { + title: '申请逾期利率', + dataIndex: 'applyForOverdueRatio', + width: 160 + }, + { + title: '预留字段1', + dataIndex: 'reservedFields1', + width: 160 + }, + { + title: '预留字段2', + dataIndex: 'reservedFields2', + width: 160 + }, + { + title: '预留字段3', + dataIndex: 'reservedFields3', + width: 160 + }, + { + title: '预留字段4', + dataIndex: 'reservedFields4', + width: 160 + }, + { + title: '预留字段5', + dataIndex: 'reservedFields5', + width: 160 + }, + { + title: '预留字段6', + dataIndex: 'reservedFields6', + width: 160 + }, + { + title: '信用级别(0：S 1：A 2：B)', + dataIndex: 'creditRating', + width: 160 + }, + { + title: '信用级别(0：开启 1：关闭)', + dataIndex: 'autoCreditRating', + width: 160 + }, + { + title: '应收款上限', + dataIndex: 'accountsReceivableUpper', + width: 160 + }, + { + title: '订单量下限', + dataIndex: 'orderQuantityDown', + width: 160 + }, + { + title: '订单量上限', + dataIndex: 'orderQuantityUpper', + width: 160 + }, + { + title: '应收款项逾期限制', + dataIndex: 'accountsReceivableOverdue', + width: 160 + }, + { + title: '完税证明超时限制', + dataIndex: 'taxPaymentCertificate', + width: 160 + }, + { + title: '创建时间', + dataIndex: 'createTime', + width: 180, + customRender: ({ text }) => { + return useRender.renderDate(text) + } + }, +] + +export const searchFormSchema: FormSchema[] = [ + { + label: '业务类型(0：客户 1：供应商 2：服务商)', + field: 'businessType', + component: 'Select', + componentProps: { + options: [] + }, + colProps: { span: 8 } + }, + { + label: '分类(0：一级 1：二级 2：三级)', + field: 'calssify', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '客户名称', + field: 'name', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司logo', + field: 'logo', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)', + field: 'enterpriseNature', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)', + field: 'industryClassify', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)', + field: 'customerSource', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '客户星级(0：一星 1：二星 2：三星 3：四星 4：五星)', + field: 'customerStarrating', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置)', + field: 'industrySchedule', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '归属人员', + field: 'belongingPeople', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '所在城市', + field: 'city', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '国家', + field: 'country', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '详细地址', + field: 'address', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司电话', + field: 'phone', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司传真', + field: 'companyFax', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司网址', + field: 'companyHttp', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司介绍', + field: 'companyProfile', + colProps: { span: 8 } + }, + { + label: '客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)', + field: 'customerStatus', + component: 'Select', + componentProps: { + options: [] + }, + colProps: { span: 8 } + }, + { + label: '社会信息代码证（营业执照）', + field: 'socialInformationCodeCertificate', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '注册地址', + field: 'registerAddress', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '社会统一信息代码', + field: 'informationCode', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '经营时间开始', + field: 'operateStart', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '经营时间结束', + field: 'operateEnd', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '注册资金', + field: 'registerCapital', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '经营范围', + field: 'businessScope', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '实缴资金证明', + field: 'proofPaidCapital', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '资产证明', + field: 'assetCertificate', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '资产抵押证明', + field: 'assetCertificateMortgage', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '其他资质文件', + field: 'otherQualifications', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '合作时间开始', + field: 'collaborationStart', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '合作时间结束', + field: 'collaborationEnd', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '需求量（每月下限）', + field: 'demandVolumeDown', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '需求量（每月上限）', + field: 'demandVolumeUpper', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '资金额度', + field: 'fundLimit', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '营业时间', + field: 'businessHours', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '营业时间开始', + field: 'businessStart', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '营业时间结束', + field: 'businessEnd', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '允许卸货时间开始', + field: 'allowableUnloadingStart', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '允许卸货时间结束', + field: 'allowableUnloadingEnd', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '卸货时长', + field: 'unloading', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '卸货效率', + field: 'unloadingEfficiency', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '允许装货时间开始', + field: 'allowableShipmentStart', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '允许装货时间结束', + field: 'allowableShipmentEnd', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '装货时长', + field: 'shipment', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '装货效果', + field: 'shipmentEffciency', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)', + field: 'paymentMethod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '账户名称', + field: 'accountName', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '银行账号', + field: 'bankAccount', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '开户银行', + field: 'bankDeposit', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '开户地区', + field: 'depositArea', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '支行名称', + field: 'bankBranch', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '公司税号', + field: 'companyTaxNumber', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '企业名称', + field: 'enterpriseName', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '单位地址', + field: 'workAddress', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '合作方式(0：买断 1：联营)', + field: 'collaborationMethod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '结算方式(0:先货后款 1：先款后货)', + field: 'settlementMethod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '账期', + field: 'accountPeriod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '压款方式(0：无 1：按金额 2：按比例)', + field: 'underpaymentMethod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '申请压款比例', + field: 'applyForUnderpaymentRatio', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '保证金方式(0：无 1：按金额 2：按比例)', + field: 'marginMethod', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '申请保证金比例', + field: 'applyForMarginRatio', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '逾期利率(0：按年化1：按月化)', + field: 'overdueInterestRate', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '申请逾期利率', + field: 'applyForOverdueRatio', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段1', + field: 'reservedFields1', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段2', + field: 'reservedFields2', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段3', + field: 'reservedFields3', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段4', + field: 'reservedFields4', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段5', + field: 'reservedFields5', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '预留字段6', + field: 'reservedFields6', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '信用级别(0：S 1：A 2：B)', + field: 'creditRating', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '信用级别(0：开启 1：关闭)', + field: 'autoCreditRating', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '应收款上限', + field: 'accountsReceivableUpper', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '订单量下限', + field: 'orderQuantityDown', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '订单量上限', + field: 'orderQuantityUpper', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '应收款项逾期限制', + field: 'accountsReceivableOverdue', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '完税证明超时限制', + field: 'taxPaymentCertificate', + component: 'Input', + colProps: { span: 8 } + }, + { + label: '创建时间', + field: 'createTime', + component: 'RangePicker', + colProps: { span: 8 } + }, +] + +export const createFormSchema: FormSchema[] = [ + { + label: '编号', + field: 'id', + show: false, + component: 'Input' + }, + { + label: '业务类型(0：客户 1：供应商 2：服务商)', + field: 'businessType', + required: true, + component: 'Select', + componentProps: { + options:[] + } + }, + { + label: '分类(0：一级 1：二级 2：三级)', + field: 'calssify', + required: true, + component: 'Input' + }, + { + label: '客户名称', + field: 'name', + component: 'Input' + }, + { + label: '公司logo', + field: 'logo', + component: 'Input' + }, + { + label: '企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)', + field: 'enterpriseNature', + component: 'Input' + }, + { + label: '行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)', + field: 'industryClassify', + component: 'Input' + }, + { + label: '客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)', + field: 'customerSource', + component: 'Input' + }, + { + label: '客户星级(0：一星 1：二星 2：三星 3：四星 4：五星)', + field: 'customerStarrating', + component: 'Input' + }, + { + label: '业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置)', + field: 'industrySchedule', + component: 'Input' + }, + { + label: '归属人员', + field: 'belongingPeople', + component: 'Input' + }, + { + label: '所在城市', + field: 'city', + component: 'Input' + }, + { + label: '国家', + field: 'country', + component: 'Input' + }, + { + label: '详细地址', + field: 'address', + component: 'Input' + }, + { + label: '公司电话', + field: 'phone', + component: 'Input' + }, + { + label: '公司传真', + field: 'companyFax', + component: 'Input' + }, + { + label: '公司网址', + field: 'companyHttp', + component: 'Input' + }, + { + label: '公司介绍', + field: 'companyProfile', + }, + { + label: '客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)', + field: 'customerStatus', + required: true, + component: 'RadioButtonGroup', + componentProps: { + options:[] + } + }, + { + label: '社会信息代码证（营业执照）', + field: 'socialInformationCodeCertificate', + component: 'Input' + }, + { + label: '注册地址', + field: 'registerAddress', + component: 'Input' + }, + { + label: '社会统一信息代码', + field: 'informationCode', + component: 'Input' + }, + { + label: '经营时间开始', + field: 'operateStart', + component: 'Input' + }, + { + label: '经营时间结束', + field: 'operateEnd', + component: 'Input' + }, + { + label: '注册资金', + field: 'registerCapital', + component: 'Input' + }, + { + label: '经营范围', + field: 'businessScope', + component: 'Input' + }, + { + label: '实缴资金证明', + field: 'proofPaidCapital', + component: 'Input' + }, + { + label: '资产证明', + field: 'assetCertificate', + component: 'Input' + }, + { + label: '资产抵押证明', + field: 'assetCertificateMortgage', + component: 'Input' + }, + { + label: '其他资质文件', + field: 'otherQualifications', + component: 'Input' + }, + { + label: '合作时间开始', + field: 'collaborationStart', + component: 'Input' + }, + { + label: '合作时间结束', + field: 'collaborationEnd', + component: 'Input' + }, + { + label: '需求量（每月下限）', + field: 'demandVolumeDown', + component: 'Input' + }, + { + label: '需求量（每月上限）', + field: 'demandVolumeUpper', + component: 'Input' + }, + { + label: '资金额度', + field: 'fundLimit', + component: 'Input' + }, + { + label: '营业时间', + field: 'businessHours', + component: 'Input' + }, + { + label: '营业时间开始', + field: 'businessStart', + component: 'Input' + }, + { + label: '营业时间结束', + field: 'businessEnd', + component: 'Input' + }, + { + label: '允许卸货时间开始', + field: 'allowableUnloadingStart', + component: 'Input' + }, + { + label: '允许卸货时间结束', + field: 'allowableUnloadingEnd', + component: 'Input' + }, + { + label: '卸货时长', + field: 'unloading', + component: 'Input' + }, + { + label: '卸货效率', + field: 'unloadingEfficiency', + component: 'Input' + }, + { + label: '允许装货时间开始', + field: 'allowableShipmentStart', + component: 'Input' + }, + { + label: '允许装货时间结束', + field: 'allowableShipmentEnd', + component: 'Input' + }, + { + label: '装货时长', + field: 'shipment', + component: 'Input' + }, + { + label: '装货效果', + field: 'shipmentEffciency', + component: 'Input' + }, + { + label: '付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)', + field: 'paymentMethod', + component: 'Input' + }, + { + label: '账户名称', + field: 'accountName', + component: 'Input' + }, + { + label: '银行账号', + field: 'bankAccount', + component: 'Input' + }, + { + label: '开户银行', + field: 'bankDeposit', + component: 'Input' + }, + { + label: '开户地区', + field: 'depositArea', + component: 'Input' + }, + { + label: '支行名称', + field: 'bankBranch', + component: 'Input' + }, + { + label: '公司税号', + field: 'companyTaxNumber', + component: 'Input' + }, + { + label: '企业名称', + field: 'enterpriseName', + component: 'Input' + }, + { + label: '单位地址', + field: 'workAddress', + component: 'Input' + }, + { + label: '合作方式(0：买断 1：联营)', + field: 'collaborationMethod', + component: 'Input' + }, + { + label: '结算方式(0:先货后款 1：先款后货)', + field: 'settlementMethod', + component: 'Input' + }, + { + label: '账期', + field: 'accountPeriod', + component: 'Input' + }, + { + label: '压款方式(0：无 1：按金额 2：按比例)', + field: 'underpaymentMethod', + component: 'Input' + }, + { + label: '申请压款比例', + field: 'applyForUnderpaymentRatio', + component: 'Input' + }, + { + label: '保证金方式(0：无 1：按金额 2：按比例)', + field: 'marginMethod', + component: 'Input' + }, + { + label: '申请保证金比例', + field: 'applyForMarginRatio', + component: 'Input' + }, + { + label: '逾期利率(0：按年化1：按月化)', + field: 'overdueInterestRate', + component: 'Input' + }, + { + label: '申请逾期利率', + field: 'applyForOverdueRatio', + component: 'Input' + }, + { + label: '预留字段1', + field: 'reservedFields1', + component: 'Input' + }, + { + label: '预留字段2', + field: 'reservedFields2', + component: 'Input' + }, + { + label: '预留字段3', + field: 'reservedFields3', + component: 'Input' + }, + { + label: '预留字段4', + field: 'reservedFields4', + component: 'Input' + }, + { + label: '预留字段5', + field: 'reservedFields5', + component: 'Input' + }, + { + label: '预留字段6', + field: 'reservedFields6', + component: 'Input' + }, + { + label: '信用级别(0：S 1：A 2：B)', + field: 'creditRating', + component: 'Input' + }, + { + label: '信用级别(0：开启 1：关闭)', + field: 'autoCreditRating', + component: 'Input' + }, + { + label: '应收款上限', + field: 'accountsReceivableUpper', + component: 'Input' + }, + { + label: '订单量下限', + field: 'orderQuantityDown', + component: 'Input' + }, + { + label: '订单量上限', + field: 'orderQuantityUpper', + component: 'Input' + }, + { + label: '应收款项逾期限制', + field: 'accountsReceivableOverdue', + component: 'Input' + }, + { + label: '完税证明超时限制', + field: 'taxPaymentCertificate', + component: 'Input' + }, +] + +export const updateFormSchema: FormSchema[] = [ + { + label: '编号', + field: 'id', + show: false, + component: 'Input' + }, + { + label: '业务类型(0：客户 1：供应商 2：服务商)', + field: 'businessType', + required: true, + component: 'Select', + componentProps: { + options:[] + } + }, + { + label: '分类(0：一级 1：二级 2：三级)', + field: 'calssify', + required: true, + component: 'Input' + }, + { + label: '客户名称', + field: 'name', + component: 'Input' + }, + { + label: '公司logo', + field: 'logo', + component: 'Input' + }, + { + label: '企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)', + field: 'enterpriseNature', + component: 'Input' + }, + { + label: '行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)', + field: 'industryClassify', + component: 'Input' + }, + { + label: '客户来源(0：电话营销 1：主动来电 2：客户介绍 3：朋友介绍 4：独立开发 5：网络搜索 6：广告杂志 7：展会促销 8：其他途径)', + field: 'customerSource', + component: 'Input' + }, + { + label: '客户星级(0：一星 1：二星 2：三星 3：四星 4：五星)', + field: 'customerStarrating', + component: 'Input' + }, + { + label: '业务进度(0：了解跟进 1：资料收集 2：客户评审 3：风控核准 4：合作洽谈 5：准备签约 6：已经签约 7：合作叫停 8：暂时搁置)', + field: 'industrySchedule', + component: 'Input' + }, + { + label: '归属人员', + field: 'belongingPeople', + component: 'Input' + }, + { + label: '所在城市', + field: 'city', + component: 'Input' + }, + { + label: '国家', + field: 'country', + component: 'Input' + }, + { + label: '详细地址', + field: 'address', + component: 'Input' + }, + { + label: '公司电话', + field: 'phone', + component: 'Input' + }, + { + label: '公司传真', + field: 'companyFax', + component: 'Input' + }, + { + label: '公司网址', + field: 'companyHttp', + component: 'Input' + }, + { + label: '公司介绍', + field: 'companyProfile', + }, + { + label: '客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)', + field: 'customerStatus', + required: true, + component: 'RadioButtonGroup', + componentProps: { + options:[] + } + }, + { + label: '社会信息代码证（营业执照）', + field: 'socialInformationCodeCertificate', + component: 'Input' + }, + { + label: '注册地址', + field: 'registerAddress', + component: 'Input' + }, + { + label: '社会统一信息代码', + field: 'informationCode', + component: 'Input' + }, + { + label: '经营时间开始', + field: 'operateStart', + component: 'Input' + }, + { + label: '经营时间结束', + field: 'operateEnd', + component: 'Input' + }, + { + label: '注册资金', + field: 'registerCapital', + component: 'Input' + }, + { + label: '经营范围', + field: 'businessScope', + component: 'Input' + }, + { + label: '实缴资金证明', + field: 'proofPaidCapital', + component: 'Input' + }, + { + label: '资产证明', + field: 'assetCertificate', + component: 'Input' + }, + { + label: '资产抵押证明', + field: 'assetCertificateMortgage', + component: 'Input' + }, + { + label: '其他资质文件', + field: 'otherQualifications', + component: 'Input' + }, + { + label: '合作时间开始', + field: 'collaborationStart', + component: 'Input' + }, + { + label: '合作时间结束', + field: 'collaborationEnd', + component: 'Input' + }, + { + label: '需求量（每月下限）', + field: 'demandVolumeDown', + component: 'Input' + }, + { + label: '需求量（每月上限）', + field: 'demandVolumeUpper', + component: 'Input' + }, + { + label: '资金额度', + field: 'fundLimit', + component: 'Input' + }, + { + label: '营业时间', + field: 'businessHours', + component: 'Input' + }, + { + label: '营业时间开始', + field: 'businessStart', + component: 'Input' + }, + { + label: '营业时间结束', + field: 'businessEnd', + component: 'Input' + }, + { + label: '允许卸货时间开始', + field: 'allowableUnloadingStart', + component: 'Input' + }, + { + label: '允许卸货时间结束', + field: 'allowableUnloadingEnd', + component: 'Input' + }, + { + label: '卸货时长', + field: 'unloading', + component: 'Input' + }, + { + label: '卸货效率', + field: 'unloadingEfficiency', + component: 'Input' + }, + { + label: '允许装货时间开始', + field: 'allowableShipmentStart', + component: 'Input' + }, + { + label: '允许装货时间结束', + field: 'allowableShipmentEnd', + component: 'Input' + }, + { + label: '装货时长', + field: 'shipment', + component: 'Input' + }, + { + label: '装货效果', + field: 'shipmentEffciency', + component: 'Input' + }, + { + label: '付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)', + field: 'paymentMethod', + component: 'Input' + }, + { + label: '账户名称', + field: 'accountName', + component: 'Input' + }, + { + label: '银行账号', + field: 'bankAccount', + component: 'Input' + }, + { + label: '开户银行', + field: 'bankDeposit', + component: 'Input' + }, + { + label: '开户地区', + field: 'depositArea', + component: 'Input' + }, + { + label: '支行名称', + field: 'bankBranch', + component: 'Input' + }, + { + label: '公司税号', + field: 'companyTaxNumber', + component: 'Input' + }, + { + label: '企业名称', + field: 'enterpriseName', + component: 'Input' + }, + { + label: '单位地址', + field: 'workAddress', + component: 'Input' + }, + { + label: '合作方式(0：买断 1：联营)', + field: 'collaborationMethod', + component: 'Input' + }, + { + label: '结算方式(0:先货后款 1：先款后货)', + field: 'settlementMethod', + component: 'Input' + }, + { + label: '账期', + field: 'accountPeriod', + component: 'Input' + }, + { + label: '压款方式(0：无 1：按金额 2：按比例)', + field: 'underpaymentMethod', + component: 'Input' + }, + { + label: '申请压款比例', + field: 'applyForUnderpaymentRatio', + component: 'Input' + }, + { + label: '保证金方式(0：无 1：按金额 2：按比例)', + field: 'marginMethod', + component: 'Input' + }, + { + label: '申请保证金比例', + field: 'applyForMarginRatio', + component: 'Input' + }, + { + label: '逾期利率(0：按年化1：按月化)', + field: 'overdueInterestRate', + component: 'Input' + }, + { + label: '申请逾期利率', + field: 'applyForOverdueRatio', + component: 'Input' + }, + { + label: '预留字段1', + field: 'reservedFields1', + component: 'Input' + }, + { + label: '预留字段2', + field: 'reservedFields2', + component: 'Input' + }, + { + label: '预留字段3', + field: 'reservedFields3', + component: 'Input' + }, + { + label: '预留字段4', + field: 'reservedFields4', + component: 'Input' + }, + { + label: '预留字段5', + field: 'reservedFields5', + component: 'Input' + }, + { + label: '预留字段6', + field: 'reservedFields6', + component: 'Input' + }, + { + label: '信用级别(0：S 1：A 2：B)', + field: 'creditRating', + component: 'Input' + }, + { + label: '信用级别(0：开启 1：关闭)', + field: 'autoCreditRating', + component: 'Input' + }, + { + label: '应收款上限', + field: 'accountsReceivableUpper', + component: 'Input' + }, + { + label: '订单量下限', + field: 'orderQuantityDown', + component: 'Input' + }, + { + label: '订单量上限', + field: 'orderQuantityUpper', + component: 'Input' + }, + { + label: '应收款项逾期限制', + field: 'accountsReceivableOverdue', + component: 'Input' + }, + { + label: '完税证明超时限制', + field: 'taxPaymentCertificate', + component: 'Input' + }, +] \ No newline at end of file diff --git a/yudao-ui-admin-vben-master/stylelint.config.js b/yunxi-ui-admin-vben/stylelint.config.js similarity index 100% rename from yudao-ui-admin-vben-master/stylelint.config.js rename to yunxi-ui-admin-vben/stylelint.config.js diff --git a/yudao-ui-admin-vben-master/tsconfig.json b/yunxi-ui-admin-vben/tsconfig.json similarity index 100% rename from yudao-ui-admin-vben-master/tsconfig.json rename to yunxi-ui-admin-vben/tsconfig.json diff --git a/yudao-ui-admin-vben-master/uno.config.ts b/yunxi-ui-admin-vben/uno.config.ts similarity index 100% rename from yudao-ui-admin-vben-master/uno.config.ts rename to yunxi-ui-admin-vben/uno.config.ts diff --git a/yudao-ui-admin-vben-master/vite.config.ts b/yunxi-ui-admin-vben/vite.config.ts similarity index 100% rename from yudao-ui-admin-vben-master/vite.config.ts rename to yunxi-ui-admin-vben/vite.config.ts