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 906f6d0e..0bf001a9 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 @@ -178,17 +178,17 @@ public class BusinessWarehouseController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:business-warehouse:enterprise-user')") public CommonResult> getUserPage( BusinessUserVO reqVO) { - String ids = ""; - List tempList = new ArrayList<>(); - List businessList = businessWarehouseService.getBusinessList(reqVO.getId()); - List warehouseList = businessWarehouseService.getWarehouseList(reqVO.getId()); - tempList.addAll(businessList); - tempList.addAll(warehouseList); - for (BusinessWarehouseDO entity : tempList){ - ids = ids + entity.getId() + ","; - } - ids = ids.substring(0, ids.length() - 1); - PageResult pageResult = businessWarehouseService.queryUserList(ids,reqVO); +// String ids = ""; +// List tempList = new ArrayList<>(); +// List businessList = businessWarehouseService.getBusinessList(reqVO.getId()); +// List warehouseList = businessWarehouseService.getWarehouseList(reqVO.getId()); +// tempList.addAll(businessList); +// tempList.addAll(warehouseList); +// for (BusinessWarehouseDO entity : tempList){ +// ids = ids + entity.getId() + ","; +// } +// ids = ids.substring(0, ids.length() - 1); + PageResult pageResult = businessWarehouseService.queryUserList(reqVO); return success(pageResult); } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java index 1c6bf67f..35e4fab0 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java @@ -25,6 +25,7 @@ import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; +import java.util.stream.Collectors; import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.common.pojo.CommonResult; @@ -168,7 +169,7 @@ public class EnterpriseController { } @GetMapping("/simpleBusiness") - @Operation(summary = "获得企业-业务线精简信息") + @Operation(summary = "获得企业-业务线-仓库精简信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:enterprise:simpleBusiness')") public CommonResult> getEnterpriseSimple() { @@ -181,6 +182,7 @@ public class EnterpriseController { List enterpriseSimpleVOList = EnterpriseConvert.INSTANCE.convertList03(list); List enterpriseSimpleList = new ArrayList<>(enterpriseSimpleVOList); List temp = new ArrayList<>(); + List temp2 = new ArrayList<>(); for (EnterpriseSimpleVO enterpriseSimpleVO : enterpriseSimpleList) { //查询出业务线List @@ -197,14 +199,16 @@ public class EnterpriseController { for (EnterpriseSimpleVO entity2 : warehouseStringList){ entity2.setId("C-" + entity2.getId()); entity2.setParentId("B-" + entity2.getParentId()); - temp.add(entity2); + temp2.add(entity2); } temp.add(entity); } enterpriseSimpleVO.setId("A-" + enterpriseSimpleVO.getId()); enterpriseSimpleVO.setParentId("A-" + enterpriseSimpleVO.getParentId()); } + temp2 = temp2.stream().distinct().collect(Collectors.toList()); enterpriseSimpleList.addAll(temp); + enterpriseSimpleList.addAll(temp2); return success(enterpriseSimpleList); } @@ -222,6 +226,7 @@ public class EnterpriseController { List enterpriseSimpleVOList = EnterpriseConvert.INSTANCE.convertList03(list); List enterpriseSimpleList = new ArrayList<>(enterpriseSimpleVOList); List temp = new ArrayList<>(); + List temp2 = new ArrayList<>(); for (EnterpriseSimpleVO enterpriseSimpleVO : enterpriseSimpleList) { //查询出部门List @@ -238,14 +243,16 @@ public class EnterpriseController { for (EnterpriseSimpleVO entity2 : deptChildList){ entity2.setId("C-" + entity2.getId()); entity2.setParentId("B-" + entity2.getParentId()); - temp.add(entity2); + temp2.add(entity2); } temp.add(entity); } enterpriseSimpleVO.setId("A-" + enterpriseSimpleVO.getId()); enterpriseSimpleVO.setParentId("A-" + enterpriseSimpleVO.getParentId()); } + temp2 = temp2.stream().distinct().collect(Collectors.toList()); enterpriseSimpleList.addAll(temp); + enterpriseSimpleList.addAll(temp2); return success(enterpriseSimpleList); } @@ -273,4 +280,51 @@ public class EnterpriseController { return success(pageResult); } + @GetMapping("/simpleEnterprise") + @Operation(summary = "获得企业-业务线精简信息") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('system:enterprise:simpleEnterprise')") + public CommonResult> getEnterpriseBusinessSimple() { + EnterprisePageReqVO pageVO = new EnterprisePageReqVO(); + //只查询企业状态为开启的 + pageVO.setEnterpriseStatus("0"); + PageResult pageResult = enterpriseService.getEnterprisePage(pageVO); + List list = pageResult.getList(); + //查询出企业List + List enterpriseSimpleVOList = EnterpriseConvert.INSTANCE.convertList03(list); + List enterpriseSimpleList = new ArrayList<>(enterpriseSimpleVOList); + List temp = new ArrayList<>(); + + for (EnterpriseSimpleVO enterpriseSimpleVO : enterpriseSimpleList) { + //查询出业务线List + List businessWarehouseDOList = enterpriseService.queryBusinessList(Long.parseLong(enterpriseSimpleVO.getId())); + List businessLineList = EnterpriseConvert.INSTANCE.convertList04(businessWarehouseDOList); + + for (EnterpriseSimpleVO entity : businessLineList){ + entity.setId("B-" + entity.getId()); + entity.setParentId("A-" + enterpriseSimpleVO.getId()); + temp.add(entity); + } + enterpriseSimpleVO.setId("A-" + enterpriseSimpleVO.getId()); + enterpriseSimpleVO.setParentId("A-" + enterpriseSimpleVO.getParentId()); + } + enterpriseSimpleList.addAll(temp); + return success(enterpriseSimpleList); + } + + @GetMapping("/enterprise") + @Operation(summary = "获得企业精简信息") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('system:enterprise:enterprise')") + public CommonResult> getEnterprise() { + EnterprisePageReqVO pageVO = new EnterprisePageReqVO(); + //只查询企业状态为开启的 + pageVO.setEnterpriseStatus("0"); + PageResult pageResult = enterpriseService.getEnterprisePage(pageVO); + List list = pageResult.getList(); + //查询出企业List + return success(EnterpriseConvert.INSTANCE.convertList03(list)); + + } + } 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 109e9b5b..0a6f9fc4 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 @@ -151,4 +151,7 @@ public class AdminUserDO extends TenantBaseDO { @TableField(exist = false) private TenantDO tenantDO; + + private String creator; + private String updater; } 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 51f04b98..78226c3b 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 @@ -144,7 +144,7 @@ public interface BusinessWarehouseMapper extends BaseMapperX getBusinessList(Long id); List getWarehouseList(Long id); - IPage queryUserList(@Param("page") Page page,@Param("ids") String ids, @Param("req") BusinessUserVO req); + IPage queryUserList(@Param("page") Page page, @Param("req") BusinessUserVO req); IPage queryUserList2(@Param("page") Page page, @Param("req") BusinessUserVO req); 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 c0436ba9..e720061a 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 @@ -127,7 +127,7 @@ public interface BusinessWarehouseService { List getBusinessList (Long id); List getWarehouseList (Long id); - PageResult queryUserList(String ids, BusinessUserVO reqVO); + PageResult queryUserList( BusinessUserVO reqVO); List getWarehouseList2(Long id); PageResult queryUserList2( 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 a310c16e..be3124bd 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 @@ -159,9 +159,9 @@ public class BusinessWarehouseServiceImpl implements BusinessWarehouseService { } @Override - public PageResult queryUserList(String ids, BusinessUserVO reqVO) { + public PageResult queryUserList( BusinessUserVO reqVO) { Page page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize()); - IPage result = businessWarehouseMapper.queryUserList(page,ids,reqVO); + IPage result = businessWarehouseMapper.queryUserList(page,reqVO); return new PageResult<>(result.getRecords(), result.getTotal()); } 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 index 173647fb..4f1d5ada 100644 --- 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 @@ -38,8 +38,8 @@ AND t2.id = #{req.businessId} - AND t.nickname LIKE concat('%',#{req.nickname},'%') OR t.job_number LIKE concat('%',#{req.nickname},'%') - OR t.mobile LIKE concat('%',#{req.nickname},'%') OR t.email LIKE concat('%',#{req.nickname},'%') + AND (t.nickname LIKE concat('%',#{req.nickname},'%') OR t.job_number LIKE concat('%',#{req.nickname},'%') + OR t.mobile LIKE concat('%',#{req.nickname},'%') OR t.email LIKE concat('%',#{req.nickname},'%')) AND t.dept_id = #{req.deptId} @@ -129,37 +129,40 @@ SELECT - b.* + a.* FROM - system_user_enterprise_relational a - LEFT JOIN system_dept b ON a.dept_id = b.id + system_dept a + LEFT JOIN system_user_enterprise_relational b ON b.dept_id = a.id WHERE a.deleted = 0 AND b.deleted = 0 - AND a.enterprise_id = #{id} + AND b.enterprise_id = #{id} 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 index 9dd5c9e9..0eda24d7 100644 --- 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 @@ -1,5 +1,6 @@ package com.yunxi.scm.module.xxjj.controller.admin.subjectbasic; +import com.yunxi.scm.module.system.dal.dataobject.dept.DeptDO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -99,4 +100,19 @@ public class SubjectBasicController { ExcelUtils.write(response, "基础业务信息表(客户，供应商，服务商主体).xls", "数据", SubjectBasicExcelVO.class, datas); } + @GetMapping("/enterperise-custom") + @Operation(summary = "根据公司获得客户") + @PreAuthorize("@ss.hasPermission('xxjj:subject-basic:enterperise-custom')") + public CommonResult> getEnterperiseCustom(@Valid SubjectBasicPageReqVO reqVO) { + PageResult pageResult = subjectBasicService.querySubjectByEnterprise(reqVO); + return success(SubjectBasicConvert.INSTANCE.convertPage(pageResult)); + } + + @GetMapping("/business-custom") + @Operation(summary = "根据业务线获得客户") + @PreAuthorize("@ss.hasPermission('xxjj:subject-basic:business-custom')") + public CommonResult> getBusinessCustom(@Valid SubjectBasicPageReqVO reqVO) { + PageResult pageResult = subjectBasicService.querySubjectByBusiness(reqVO); + return success(SubjectBasicConvert.INSTANCE.convertPage(pageResult)); + } } 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 index c9fa9b00..87f9aea5 100644 --- 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 @@ -35,6 +35,9 @@ public class SubjectBasicBaseVO { @NotNull(message = "分类(0：一级 1：二级 2：三级)不能为空") private String calssify; + @Schema(description = "客户编码", example = "赵六") + private String code; + @Schema(description = "客户名称", example = "赵六") private String name; @@ -268,4 +271,22 @@ public class SubjectBasicBaseVO { @Schema(description = "完税证明超时限制") private Long taxPaymentCertificate; + @Schema(description = "客户类型") + private String customType; + + @Schema(description = "资金款项") + private String fundsType; + + @Schema(description = "合作模式") + private String cooperateType; + + @Schema(description = "公司名称") + private String companyName; + + @Schema(description = "业务线名称") + private String businessName; + + @Schema(description = "人员名称") + private String nickname; + } 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 index 8e019cec..528dea42 100644 --- 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 @@ -35,6 +35,8 @@ public class SubjectBasicExcelVO { @ExcelProperty("分类(0：一级 1：二级 2：三级)") private String calssify; + @ExcelProperty("客户编码") + private String code; @ExcelProperty("客户名称") private String name; 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 index 03ce3938..271582bb 100644 --- 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 @@ -19,6 +19,9 @@ public class SubjectBasicExportReqVO { @Schema(description = "分类(0：一级 1：二级 2：三级)") private String calssify; + @Schema(description = "客户编码", example = "赵六") + private String code; + @Schema(description = "客户名称", example = "赵六") private String name; 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 index 3bf94be5..430e16d2 100644 --- 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 @@ -15,12 +15,18 @@ import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MON @ToString(callSuper = true) public class SubjectBasicPageReqVO extends PageParam { + @Schema(description = "id") + private Long id; + @Schema(description = "业务类型(0：客户 1：供应商 2：服务商)", example = "2") private String businessType; @Schema(description = "分类(0：一级 1：二级 2：三级)") private String calssify; + @Schema(description = "客户编码", example = "赵六") + private String code; + @Schema(description = "客户名称", example = "赵六") private String name; @@ -247,4 +253,25 @@ public class SubjectBasicPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] updateTime; + + @Schema(description = "客户类型") + private String customType; + + @Schema(description = "资金款项") + private String fundsType; + + @Schema(description = "合作模式") + private String cooperateType; + @Schema(description = "公司名称") + private String companyName; + + @Schema(description = "业务线名称") + private String businessName; + + @Schema(description = "人员名称") + private String nickname; + } 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 index 05157c0a..e180f61c 100644 --- 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 @@ -46,6 +46,10 @@ public class SubjectBasicDO extends BaseDO { * 分类(0：一级 1：二级 2：三级) */ private String calssify; + /** + * 客户名称 + */ + private String code; /** * 客户名称 */ @@ -343,6 +347,19 @@ public class SubjectBasicDO extends BaseDO { */ private Long taxPaymentCertificate; + /** + * 客户类型 + */ + private String customType; + /** + * 资金款项 + */ + private String fundsType; + /** + * 合作模式 + */ + private String cooperateType; + @TableField(exist = false) private String creatorName; /** @@ -352,4 +369,15 @@ public class SubjectBasicDO extends BaseDO { */ @TableField(exist = false) private String updaterName; + /** 公司名称*/ + @TableField(exist = false) + private String companyName; + + /** 业务线名称*/ + @TableField(exist = false) + private String businessName; + + /** 人员名称*/ + @TableField(exist = false) + private String nickname; } 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 index 392e076f..07a6cdeb 100644 --- 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 @@ -2,13 +2,17 @@ package com.yunxi.scm.module.xxjj.dal.mysql.subjectbasic; import java.util.*; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.businesswarehouse.vo.BusinessUserVO; import com.yunxi.scm.module.xxjj.dal.dataobject.subjectbasic.SubjectBasicDO; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Mapper; import com.yunxi.scm.module.xxjj.controller.admin.subjectbasic.vo.*; +import org.apache.ibatis.annotations.Param; /** * 基础业务信息表(客户，供应商，服务商主体) Mapper @@ -186,4 +190,7 @@ public interface SubjectBasicMapper extends BaseMapperX { .orderByDesc(SubjectBasicDO::getId)); } + IPage querySubjectByEnterprise(@Param("page") Page page, @Param("req") SubjectBasicPageReqVO req); + IPage querySubjectByBusiness(@Param("page") Page page, @Param("req") SubjectBasicPageReqVO req); + } 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 index 0c4650d1..38736d5d 100644 --- 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 @@ -67,4 +67,7 @@ public interface SubjectBasicService { */ List getSubjectBasicList(SubjectBasicExportReqVO exportReqVO); + PageResult querySubjectByEnterprise(SubjectBasicPageReqVO reqVO); + PageResult querySubjectByBusiness(SubjectBasicPageReqVO reqVO); + } 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 index 4321f9d6..bf226c52 100644 --- 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 @@ -1,5 +1,8 @@ package com.yunxi.scm.module.xxjj.service.subjectbasic; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.BusinessUserVO; import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO; import com.yunxi.scm.module.system.service.user.AdminUserService; import org.apache.commons.lang3.StringUtils; @@ -97,4 +100,18 @@ public class SubjectBasicServiceImpl implements SubjectBasicService { return subjectBasicMapper.selectList(exportReqVO); } + @Override + public PageResult querySubjectByEnterprise(SubjectBasicPageReqVO reqVO) { + Page page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize()); + IPage result = subjectBasicMapper.querySubjectByEnterprise(page,reqVO); + return new PageResult<>(result.getRecords(), result.getTotal()); + } + + @Override + public PageResult querySubjectByBusiness(SubjectBasicPageReqVO reqVO) { + Page page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize()); + IPage result = subjectBasicMapper.querySubjectByBusiness(page,reqVO); + return new PageResult<>(result.getRecords(), result.getTotal()); + } + } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/subjectbasic/SubjectBasicMapper.xml b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/subjectbasic/SubjectBasicMapper.xml index 81ef639c..1b68d168 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/subjectbasic/SubjectBasicMapper.xml +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/subjectbasic/SubjectBasicMapper.xml @@ -9,4 +9,47 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> + + + + diff --git a/yunxi-ui-admin-vue3/src/api/system/enterprise/index.ts b/yunxi-ui-admin-vue3/src/api/system/enterprise/index.ts index 5ed0374c..17ced97a 100644 --- a/yunxi-ui-admin-vue3/src/api/system/enterprise/index.ts +++ b/yunxi-ui-admin-vue3/src/api/system/enterprise/index.ts @@ -111,3 +111,13 @@ export const getFirstDeptPage = async (params) => { export const getSecondDeptByFirstPage = async (params) => { return await request.get({ url: `/system/enterprise/secondDept2`, params }) } + +// 企业详情客户信息树列表 +export const getEnterpriseBusinessSimple = async () => { + return await request.get({ url: `/system/enterprise/simpleEnterprise` }) +} + +// 企业详情员工信息树列表 +export const getSimpleEnterprise = async () => { + return await request.get({ url: `/system/enterprise/enterprise` }) +} \ No newline at end of file diff --git a/yunxi-ui-admin-vue3/src/api/xxjj/businessWarehouse/index.ts b/yunxi-ui-admin-vue3/src/api/xxjj/businessWarehouse/index.ts index e0b1ca0b..0e72cdc2 100644 --- a/yunxi-ui-admin-vue3/src/api/xxjj/businessWarehouse/index.ts +++ b/yunxi-ui-admin-vue3/src/api/xxjj/businessWarehouse/index.ts @@ -67,3 +67,10 @@ export const getBusinessUserPage = async (params) => { export const getBusinessLinePage = async (params) => { return await request.get({ url: `/system/business-warehouse/enterprise-business`, params }) } + +//企业详情点击分支机构下的员工列表 +export const getUserPage = async (params) => { + return await request.get({ url: `/system/business-warehouse/enterprise-user`, params }) +} + + diff --git a/yunxi-ui-admin-vue3/src/api/xxjj/subjectBasic/index.ts b/yunxi-ui-admin-vue3/src/api/xxjj/subjectBasic/index.ts index 6ba34829..f10793af 100644 --- a/yunxi-ui-admin-vue3/src/api/xxjj/subjectBasic/index.ts +++ b/yunxi-ui-admin-vue3/src/api/xxjj/subjectBasic/index.ts @@ -109,3 +109,13 @@ export const deleteSubjectBasic = async (id: number) => { export const exportSubjectBasic = async (params) => { return await request.download({ url: `/xxjj/subject-basic/export-excel`, params }) } + +// 根据公司获得客户分页 +export const getEnterperiseCustom = async (params) => { + return await request.get({ url: `/xxjj/subject-basic/enterperise-custom`, params }) +} + +// 根据业务线获得客户分页 +export const getBusinessCustom = async (params) => { + return await request.get({ url: `/xxjj/subject-basic/business-custom`, params }) +} diff --git a/yunxi-ui-admin-vue3/src/utils/dict.ts b/yunxi-ui-admin-vue3/src/utils/dict.ts index 9bab1a7a..14d0bb07 100644 --- a/yunxi-ui-admin-vue3/src/utils/dict.ts +++ b/yunxi-ui-admin-vue3/src/utils/dict.ts @@ -209,6 +209,9 @@ export enum DICT_TYPE { urgent_level = 'urgent_level', //紧要程度 task_remind = 'task_remind', //紧要程度 remind_way = 'remind_way', //紧要程度 + CUSTOM_TYPE = 'custom_type', //客户类型 + FUNDS_TYPE = 'funds_type', //资金款项 + COOPERATE_TYPE = 'cooperate_type', //合作模式 // ============= PRODUCT 模块================= PRODUCT_STATUS = 'product_status', //商品状态 diff --git a/yunxi-ui-admin-vue3/src/views/xxjj/enterpriseDetails/src/Branch.vue b/yunxi-ui-admin-vue3/src/views/xxjj/enterpriseDetails/src/Branch.vue index 394e932e..2bd6e6d3 100644 --- a/yunxi-ui-admin-vue3/src/views/xxjj/enterpriseDetails/src/Branch.vue +++ b/yunxi-ui-admin-vue3/src/views/xxjj/enterpriseDetails/src/Branch.vue @@ -37,7 +37,7 @@ @@ -175,13 +175,13 @@ import * as BusinessWarehouseApi from '@/api/xxjj/businessWarehouse' const deptName = ref('') const deptList = ref([]) // 树形结构 const treeRef = ref>() +let titleLable = ref('')//标题 /** 获得部门树 */ const getTree = async () => { const res = await EnterpriseApi.getEnterpriseSimple() deptList.value = [] deptList.value.push(...handleTree(res)) - debugger } /** 基于名字过滤 */ @@ -260,7 +260,6 @@ const getList = async () => { try { const data = await EnterpriseApi.getEnterprisePage(queryParams) list.value = data.list - debugger total.value = data.total } finally { loading.value = false @@ -314,6 +313,7 @@ const resetQuery = () => { /** 处理部门被点击 */ const handleDeptNodeClick = async (row) => { + titleLable = row.name if(row.parentId == 'A-0'){ const id = row.id.slice(2) queryParams.parentId = parseInt(id) diff --git a/yunxi-ui-admin-vue3/src/views/xxjj/enterpriseDetails/src/CustomerInfo.vue b/yunxi-ui-admin-vue3/src/views/xxjj/enterpriseDetails/src/CustomerInfo.vue index 7425a5f0..3fb4e013 100644 --- a/yunxi-ui-admin-vue3/src/views/xxjj/enterpriseDetails/src/CustomerInfo.vue +++ b/yunxi-ui-admin-vue3/src/views/xxjj/enterpriseDetails/src/CustomerInfo.vue @@ -38,7 +38,7 @@ @@ -101,92 +101,67 @@ - - + + + - -
-

一级

-
+ + -

vip大客户

+ + - - - - - -
-

联营

- 业绩返点 -
+ + -
-

济钢城市矿产

- 废钢 + - + - + - -

狂徒张三

+ - -
-

康宁

- 2023-09-09 23:26:08 -
- - -
-

康宁

- 2023-09-09 23:26:08 -
- + + + + + +