BJ_ZTEITS-Developers / parking-cloud-yudao

Commit d1978d318bed325332ca65d0ced2b008a0fee58d

Authored by YunaiV
1 parent 67ac11b5

code review：crm 合同

Inline Side-by-side
Showing 3 changed files with 6 additions and 109 deletions
sql/mysql/crm.sql
  View file @d1978d3
1 SET NAMES utf8mb4; 1 SET NAMES utf8mb4;
2 2
3 --- ----------------------------  
4 --- 合同表  
5 --- ----------------------------  
6 -DROP TABLE IF EXISTS `crm_contract`;  
7 -CREATE TABLE `crm_contract`  
8 -(  
9 - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号，主键自增',  
10 - `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '合同名称',  
11 - `customer_id` bigint DEFAULT NULL COMMENT '客户编号',  
12 - `business_id` bigint DEFAULT NULL COMMENT '商机编号',  
13 - `process_instance_id` bigint DEFAULT NULL COMMENT '工作流编号',  
14 - `order_date` datetime DEFAULT NULL COMMENT '下单日期',  
15 - `owner_user_id` bigint DEFAULT NULL COMMENT '负责人的用户编号',  
16 - `no` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '合同编号',  
17 - `start_time` datetime DEFAULT NULL COMMENT '开始时间',  
18 - `end_time` datetime DEFAULT NULL COMMENT '结束时间',  
19 - `price` int DEFAULT NULL COMMENT '合同金额',  
20 - `discount_percent` int DEFAULT NULL COMMENT '整单折扣',  
21 - `product_price` int DEFAULT NULL COMMENT '产品总金额',  
22 - `ro_user_ids` varchar(4096) DEFAULT NULL COMMENT '只读权限的用户编号数组',  
23 - `rw_user_ids` varchar(4096) DEFAULT NULL COMMENT '读写权限的用户编号数组',  
24 - `contact_id` bigint DEFAULT NULL COMMENT '联系人编号',  
25 - `sign_user_id` bigint DEFAULT NULL COMMENT '公司签约人',  
26 - `contact_last_time` datetime DEFAULT NULL COMMENT '最后跟进时间',  
27 -  
28 - -- 通用字段  
29 - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',  
30 - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',  
31 - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',  
32 - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',  
33 - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',  
34 - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',  
35 - `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',  
36 - PRIMARY KEY (`id`) USING BTREE  
37 -) ENGINE = InnoDB  
38 - CHARACTER SET = utf8mb4  
39 - COLLATE = utf8mb4_unicode_ci COMMENT ='合同表';  
40 3
41 4
42 DROP TABLE IF EXISTS `crm_clue`; 5 DROP TABLE IF EXISTS `crm_clue`;
sql/mysql/crm_menu.sql
  View file @d1978d3
1 --- ----------------------------  
2 --- 合同菜单  
3 --- ----------------------------  
4 -  
5 --- 菜单 SQL  
6 -INSERT INTO system_menu(  
7 - name, permission, type, sort, parent_id,  
8 - path, icon, component, status, component_name  
9 -)  
10 -VALUES (  
11 - '合同管理', '', 2, 0, 2375,  
12 - 'contract', '', 'crm/contract/index', 0, 'Contract'  
13 -);  
14 -  
15 --- 按钮父菜单ID  
16 --- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码  
17 -SELECT @parentId := LAST_INSERT_ID();  
18 -  
19 --- 按钮 SQL  
20 -INSERT INTO system_menu(  
21 - name, permission, type, sort, parent_id,  
22 - path, icon, component, status  
23 -)  
24 -VALUES (  
25 - '合同查询', 'crm:contract:query', 3, 1, @parentId,  
26 - '', '', '', 0  
27 -);  
28 -INSERT INTO system_menu(  
29 - name, permission, type, sort, parent_id,  
30 - path, icon, component, status  
31 -)  
32 -VALUES (  
33 - '合同创建', 'crm:contract:create', 3, 2, @parentId,  
34 - '', '', '', 0  
35 -);  
36 -INSERT INTO system_menu(  
37 - name, permission, type, sort, parent_id,  
38 - path, icon, component, status  
39 -)  
40 -VALUES (  
41 - '合同更新', 'crm:contract:update', 3, 3, @parentId,  
42 - '', '', '', 0  
43 -);  
44 -INSERT INTO system_menu(  
45 - name, permission, type, sort, parent_id,  
46 - path, icon, component, status  
47 -)  
48 -VALUES (  
49 - '合同删除', 'crm:contract:delete', 3, 4, @parentId,  
50 - '', '', '', 0  
51 -);  
52 -INSERT INTO system_menu(  
53 - name, permission, type, sort, parent_id,  
54 - path, icon, component, status  
55 -)  
56 -VALUES (  
57 - '合同导出', 'crm:contract:export', 3, 5, @parentId,  
58 - '', '', '', 0  
59 -);  
60 1
61 -- ---------------------------- 2 -- ----------------------------
62 -- 线索菜单 3 -- 线索菜单
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessExcelVO.java
  View file @d1978d3
1 package cn.iocoder.yudao.module.crm.controller.admin.business.vo; 1 package cn.iocoder.yudao.module.crm.controller.admin.business.vo;
2 2
3 -import io.swagger.v3.oas.annotations.media.Schema;  
4 -import lombok.*;  
5 -import java.util.*;  
6 -import java.time.LocalDateTime;  
7 -import java.time.LocalDateTime;  
8 -import java.math.BigDecimal;  
9 -import java.math.BigDecimal; 3 +import com.alibaba.excel.annotation.ExcelProperty;
  4 +import lombok.Data;
  5 +
10 import java.math.BigDecimal; 6 import java.math.BigDecimal;
11 import java.time.LocalDateTime; 7 import java.time.LocalDateTime;
12 -import java.time.LocalDateTime;  
13 -import java.time.LocalDateTime;  
14 -  
15 -import com.alibaba.excel.annotation.ExcelProperty; 8 +import java.util.Set;
16 9
17 /** 10 /**
18 * 商机 Excel VO 11 * 商机 Excel VO
@@ -62,10 +55,10 @@ public class CrmBusinessExcelVO { @@ -62,10 +55,10 @@ public class CrmBusinessExcelVO {
62 private LocalDateTime createTime; 55 private LocalDateTime createTime;
63 56
64 @ExcelProperty("只读权限的用户编号数组") 57 @ExcelProperty("只读权限的用户编号数组")
65 - private String roUserIds; 58 + private Set<Long> roUserIds;
66 59
67 @ExcelProperty("读写权限的用户编号数组") 60 @ExcelProperty("读写权限的用户编号数组")
68 - private String rwUserIds; 61 + private Set<Long> rwUserIds;
69 62
70 @ExcelProperty("1赢单2输单3无效") 63 @ExcelProperty("1赢单2输单3无效")
71 private Integer endStatus; 64 private Integer endStatus;