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 e604d301..90915608 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 @@ -2,7 +2,9 @@ package com.yunxi.scm.module.xxjj.controller.admin.subjectbasic; 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.user.AdminUserDO; import com.yunxi.scm.module.system.service.businesswarehouse.BusinessWarehouseService; +import com.yunxi.scm.module.system.service.user.AdminUserService; import com.yunxi.scm.module.xxjj.controller.admin.subjectbusiness.vo.SubjectBusinessExportReqVO; import com.yunxi.scm.module.xxjj.controller.admin.subjectcontacts.vo.SubjectContactsExportReqVO; import com.yunxi.scm.module.xxjj.controller.admin.subjectrepresentative.vo.SubjectRepresentativeExportReqVO; @@ -14,6 +16,8 @@ import com.yunxi.scm.module.xxjj.service.subjectbusiness.SubjectBusinessService; import com.yunxi.scm.module.xxjj.service.subjectcontacts.SubjectContactsService; import com.yunxi.scm.module.xxjj.service.subjectrepresentative.SubjectRepresentativeService; import io.swagger.v3.oas.annotations.media.Schema; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -60,6 +64,9 @@ public class SubjectBasicController { private BusinessWarehouseService businessWarehouseService; @Resource private SubjectBasicMapper subjectBasicMapper; + @Resource + private AdminUserService adminUserService; + @PostMapping("/create") @@ -92,10 +99,20 @@ public class SubjectBasicController { @PreAuthorize("@ss.hasPermission('xxjj:subject-basic:query')") public CommonResult getSubjectBasic(@RequestParam("id") Long id) { SubjectBasicDO subjectBasic = subjectBasicService.getSubjectBasic(id); + if(StringUtils.isNoneBlank(subjectBasic.getBelongingPeople())){ + AdminUserDO adminUserDO = adminUserService.getUser(Long.parseLong(subjectBasic.getBelongingPeople())); + subjectBasic.setBelongingPeopleName(adminUserDO.getNickname()); + } SubjectContactsExportReqVO exportReqVO = new SubjectContactsExportReqVO(); exportReqVO.setBusinessId(id); List subjectContactsDOList = subjectContactsService.getSubjectContactsList(exportReqVO); subjectBasic.setSubjectContactsDOList(subjectContactsDOList); + for (SubjectContactsDO subjectContactsDO :subjectContactsDOList ) { + if(ObjectUtils.equals(subjectContactsDO.getContactsType(), "1")){ + subjectBasic.setDefaultContacts(subjectContactsDO.getName() + "(" + subjectContactsDO.getMobile() + ")"); + } + break; + } SubjectRepresentativeExportReqVO subjectRepresentativeExportReqVO = new SubjectRepresentativeExportReqVO(); subjectRepresentativeExportReqVO.setBusinessId(id); List subjectRepresentativeDOList = subjectRepresentativeService.getSubjectRepresentativeList(subjectRepresentativeExportReqVO); @@ -104,10 +121,16 @@ public class SubjectBasicController { subjectBusinessExportReqVO.setBusinessId(id); List subjectBusinessDOList = subjectBusinessService.getSubjectBusinessList(subjectBusinessExportReqVO); List businessWarehouseDOList = new ArrayList<>(); + String businessWarehouseName = ""; for (SubjectBusinessDO subjectBusinessDO : subjectBusinessDOList) { BusinessWarehouseDO businessWarehouseDO = businessWarehouseService.getBusinessWarehouse(subjectBusinessDO.getBusinessLineId()); + businessWarehouseName = businessWarehouseName + businessWarehouseDO.getName() + ","; businessWarehouseDOList.add(businessWarehouseDO); } + if(businessWarehouseName.length() > 0){ + businessWarehouseName = businessWarehouseName.substring(0, businessWarehouseName.length() - 1); + } + subjectBasic.setBusinessWarehouseName(businessWarehouseName); subjectBasic.setBusinessWarehouseDOList(businessWarehouseDOList); return success(SubjectBasicConvert.INSTANCE.convert(subjectBasic)); } 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 39c71a4e..f90a18d9 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 @@ -309,4 +309,13 @@ public class SubjectBasicBaseVO { @Schema(description = "人员名称") private String nickname; + @Schema(description = "归属人员姓名") + private String belongingPeopleName; + + @Schema(description = "默认联系人 姓名(电话)") + private String defaultContacts; + + @Schema(description = "业务线名字逗号拼接") + private String businessWarehouseName; + } 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 49982f51..bb7380c0 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 @@ -413,4 +413,16 @@ public class SubjectBasicDO extends BaseDO { @TableField(exist = false) private List businessWarehouseDOList; + + /** + * 归属人员 + */ + @TableField(exist = false) + private String belongingPeopleName; + + @TableField(exist = false) + private String defaultContacts; + + @TableField(exist = false) + private String businessWarehouseName; } diff --git a/yunxi-ui-admin-vue3/src/utils/dict.ts b/yunxi-ui-admin-vue3/src/utils/dict.ts index deb935b0..bf58c258 100644 --- a/yunxi-ui-admin-vue3/src/utils/dict.ts +++ b/yunxi-ui-admin-vue3/src/utils/dict.ts @@ -212,7 +212,9 @@ export enum DICT_TYPE { CUSTOM_TYPE = 'custom_type', //客户类型 FUNDS_TYPE = 'funds_type', //资金款项 COOPERATE_TYPE = 'cooperate_type', //合作模式 - +contacts_type = 'contacts_type', //合作模式 +collaboration_method = 'collaboration_method', //合作模式 +settlement_method = 'settlement_method', //合作模式 // ============= PRODUCT 模块================= PRODUCT_STATUS = 'product_status', //商品状态 PRODUCT_TYPE = 'product_type', //商品类型 diff --git a/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/CustomerDetails.vue b/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/CustomerDetails.vue index 7380b73c..b53b2724 100644 --- a/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/CustomerDetails.vue +++ b/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/CustomerDetails.vue @@ -9,8 +9,8 @@ -
-
江阴华润制钢有限公司（一级客户）
+
+
{{formData.name}}
@@ -41,13 +41,13 @@ 企业性质： - 外资企业 + {{getDictLabel('enterprise_nature' ,formData.enterpriseNature)}} 行业分类： - 行业分类 + {{getDictLabel('industry_classify' ,formData.industryClassify)}} @@ -62,26 +62,26 @@ 创建时间： - 2023-08-23 23:26:08 + {{ dayjs(formData.createTime).format('YYYY-MM-DD HH:mm:ss') }} 默认联系人： - 李总（13112345678） + {{formData.defaultContacts}} 归属人员： - 张总 (已锁定，到期时间10/30) + {{formData.belongingPeopleName}} - 已启用 - 正在跟进 - + {{getDictLabel('customer_status' ,formData.customerStatus)}} + {{getDictLabel('industry_schedule' ,formData.industrySchedule)}} + @@ -92,17 +92,17 @@ @@ -135,6 +135,8 @@ diff --git a/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/src/InfoQualification.vue b/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/src/InfoQualification.vue index ebb456f6..9aff07db 100644 --- a/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/src/InfoQualification.vue +++ b/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/src/InfoQualification.vue @@ -20,13 +20,13 @@ 企业名称： - 江阴华润制钢有限公司 + {{props.formData.name}} 企业性质： - 外资企业 + {{getDictLabel('enterprise_nature' ,props.formData.enterpriseNature)}} @@ -34,19 +34,19 @@ 注册地址： - 江苏省江阴市月城镇北环路58号 + {{props.formData.registerAddress}} 社会统一信息代码： - 9132028160798507XE + {{props.formData.informationCode}} 经营期限： - 1994-05-25 至 2044-05-24 + {{ dayjs(props.formData.operateStart).format('YYYY-MM-DD') }} 至 {{ dayjs(props.formData.operateEnd).format('YYYY-MM-DD') }} @@ -54,7 +54,7 @@ 注册资金： - 155,535万(元) + {{props.formData.registerCapital}}万(元) 证件照片： @@ -65,12 +65,10 @@ - 注册资金： + 经营范围： - 生产钢坯，钢材及其制品；不锈钢制品的生产、加工、销售。（依法须经批准的项目，经相关部门批准后方可开展经营活动） - 许可项目：港口经营；港口货物装卸搬运活动（依法须经批准的项目，经相关部门批准后方可开展经营活动，具体经营项目以审批结果为准） - 一般项目：装卸搬运；普通货物仓储服务（不含危险化学品等需许可审批的项目）（除依法须经批准的项目外，凭营业执照依法自主开展经营活动） + {{props.formData.businessScope}} @@ -82,15 +80,36 @@