From 7b36eb888e84465147085b9e93b550ab358f39c9 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Wed, 17 Jan 2024 12:11:39 +0800 Subject: [PATCH] =?UTF-8?q?CRM-=E5=90=88=E5=90=8C=EF=BC=9ARespVO=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/contract/vo/CrmContractRespVO.java | 35 ++++++++++++++++++- .../crm/service/clue/CrmClueServiceImpl.java | 2 +- .../customer/CrmCustomerServiceImpl.java | 3 +- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractRespVO.java index 9a1ae58f3..1164f4a0c 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractRespVO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractRespVO.java @@ -1,83 +1,116 @@ package cn.iocoder.yudao.module.crm.controller.admin.contract.vo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -// TODO @puhui999：导出注解哈 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + @Schema(description = "管理后台 - CRM 合同 Response VO") @Data +@ExcelIgnoreUnannotated public class CrmContractRespVO { @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430") + @ExcelProperty("合同编号") private Long id; @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("合同名称") private String name; @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18336") + @ExcelProperty("客户编号") private Long customerId; @Schema(description = "商机编号", example = "10864") + @ExcelProperty("商机编号") private Long businessId; @Schema(description = "工作流编号", example = "1043") + @ExcelProperty("工作流编号") private Long processInstanceId; @Schema(description = "下单日期", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("下单日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime orderDate; @Schema(description = "负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "17144") + @ExcelProperty("负责人的用户编号") private Long ownerUserId; // TODO @芋艿：未来应该支持自动生成； @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230101") + @ExcelProperty("合同编号") private String no; @Schema(description = "开始时间") + @ExcelProperty("开始时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime startTime; @Schema(description = "结束时间") + @ExcelProperty("结束时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime endTime; @Schema(description = "合同金额", example = "5617") + @ExcelProperty("合同金额") private Integer price; @Schema(description = "整单折扣") + @ExcelProperty("整单折扣") private Integer discountPercent; @Schema(description = "产品总金额", example = "19510") + @ExcelProperty("产品总金额") private Integer productPrice; @Schema(description = "联系人编号", example = "18546") + @ExcelProperty("联系人编号") private Long contactId; @Schema(description = "公司签约人", example = "14036") + @ExcelProperty("公司签约人") private Long signUserId; @Schema(description = "最后跟进时间") + @ExcelProperty("最后跟进时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime contactLastTime; @Schema(description = "备注", example = "你猜") + @ExcelProperty("备注") private String remark; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime createTime; @Schema(description = "创建人", example = "25682") + @ExcelProperty("创建人") private String creator; @Schema(description = "创建人名字", example = "test") + @ExcelProperty("创建人名字") private String creatorName; @Schema(description = "客户名字", example = "test") + @ExcelProperty("客户名字") private String customerName; @Schema(description = "负责人", example = "test") + @ExcelProperty("负责人") private String ownerUserName; @Schema(description = "审批状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + @ExcelProperty("审批状态") private Integer auditStatus; } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java index 649914ed2..4a6ff9575 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java @@ -165,7 +165,7 @@ public class CrmClueServiceImpl implements CrmClueService { // 1. 创建客户 CrmCustomerSaveReqVO customerSaveReqVO = BeanUtils.toBean(clue, CrmCustomerSaveReqVO.class).setId(null); Long customerId = customerService.createCustomer(customerSaveReqVO, userId); - // TODO @puhui999：如果有跟进记录，需要一起转过去； + // TODO @puhui999：如果有跟进记录，需要一起转过去；提问：艿艿这里是复制线索所有的跟进吗？还是直接把线索相关的跟进 bizType、bizId 全改为关联客户？ // 2. 更新线索 clueMapper.updateById(new CrmClueDO().setId(clue.getId()) .setTransformStatus(Boolean.TRUE).setCustomerId(customerId)); diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java index 1a9f39bb5..a27a43e87 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java @@ -235,8 +235,7 @@ public class CrmCustomerServiceImpl implements CrmCustomerService { // 3. 删除负责人数据权限 permissionService.deletePermission(CrmBizTypeEnum.CRM_CUSTOMER.getType(), customer.getId(), CrmPermissionLevelEnum.OWNER.getLevel()); - // TODO @puhui999：联系人的负责人，也要设置为 null；这块和领取是对应的；因为领取后，负责人也要关联过来； - // 提问：那是不是可以这样理解客户所有联系人的负责人默认为客户的负责人，然后添加客户团队成员时才存在“同时分配给”的操作？ + // 联系人的负责人，也要设置为 null；这块和领取是对应的；因为领取后，负责人也要关联过来； contactService.updateOwnerUserIdByCustomerId(customer.getId(), null); // 记录操作日志上下文