Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/common/infrastructure/aspect/ServiceAspect.java

@@ -95,7 +95,7 @@ public class ServiceAspect implements HandlerInterceptor {
             }else{
                 // 设置企业Id
                 String cpId = JwtUtil.getCpId(decrypt);
-                if (cpId != null) {
+                if (cpId != null && joinPoint.getSignature().getName() != "getFeignExperience") {
                     MybatisSqlIntercept.cpId = Integer.parseInt(cpId);
                 }
             }

src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -915,10 +915,10 @@ public class Constant {
     public static final String USER_PREFIX = "user";
     public static final String USER = "/core/user";
     public static final String ORGANIZATION = "/core/organization";
-    public static final String COMPANY = "/core/company";
+    public static final String COMPANY = "/company";
     public static final String MDM_PREFIX = "mdm";
     public static final String PDM_PREFIX = "pdm";
-    public static final String MST_CUSTOM = "/mst/custom_tag";
+    public static final String MST_STAFF = "/mst/staff";
     public static final String MST_PRODUCE_ORDER = "/mst/produce_order";
     public static final String POST = "/core/post";
     public static final String JOB = "/core/job";
@@ -1491,6 +1491,101 @@ public class Constant {
         }
     }
 
+    /**
+     * @author : 于继渤
+     * @desc : 客户成交状态
+     * @date : 2022-06-11 15:25
+     */
+    public enum saleCustomerStatusConstant {
+        SALE_STATUS_POTE("销售状态-潜客"),
+        SALE_STATUS_INTE("销售状态-公海"),
+        SALE_STATUS_DEAL("销售状态-成交"),
+        SALE_STATUS_LOST("销售状态-流失");
+
+        private String name;
+
+        // get set 方法
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        // 构造方法
+        saleCustomerStatusConstant(String name) {
+            this.name = name;
+        }
+    }
+
+    /**
+     * @author : 洪旭东
+     * @desc : 客户意向
+     * @date : 2022-06-11 15:25
+     */
+    public enum IntentionConstant {
+        SEA("客户意向-放入公海"),
+        LOST("客户意向-已流失")
+        ;
+
+        private String value;
+
+        // get set 方法
+        public String getValue() {
+            return value;
+        }
+
+        public void setName(String value) {
+            this.value = value;
+        }
+
+        // 构造方法
+        IntentionConstant(String value) {
+            this.value = value;
+        }
+    }
+
+    /**
+     * @author : 洪旭东
+     * @desc : 系统字典
+     * @date : 2022-06-14 18:38
+     */
+    public enum BasicDataConstant {
+        FOLLOW_STATUS_1("跟进状态-跟进"),
+        FOLLOW_STATUS_2("跟进状态-邀约"),
+        FOLLOW_STATUS_3("跟进状态-约尺"),
+        FOLLOW_STATUS_4("跟进状态-接待"),
+        FOLLOW_STATUS_5("跟进状态-报备"),
+        FOLLOW_STATUS_6("跟进状态-量尺"),
+
+        FOLLOW_TYPE_1("跟进方式-上门"),
+
+        MEASURE_STATUS_1("量尺状态-已量尺"),
+        MEASURE_STATUS_2("量尺状态-待量尺"),
+
+        CUSTOMER_INTENTION1("客意品类-智能"),
+        CUSTOMER_INTENTION2("客意品类-定制"),
+
+        FOLLOW_INVITE_RESULT("邀约结果-接受")
+
 
+        ;
+
+        private String value;
+
+        // get set 方法
+        public String getValue() {
+            return value;
+        }
+
+        public void setName(String value) {
+            this.value = value;
+        }
+
+        BasicDataConstant(String value) {
+            this.value = value;
+        }
+    }
 
 }

src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -51,7 +51,7 @@ public enum ErrorCodeEnum {
     INBOUND_ITEM_NOT_EXIST(11081,"入库明细不可为空，请重新操作"),
     ORIGINAL_DOCUMENT_ABSENT(11082,"单据所对应的原始单据不存在,不允许该操作！"),
     DATASOURCECODE_NOT(11083,"请输入数据源编码！"),
-
+    CUSTOMER_SAME_COMPANY_TELEPHONE(8001, "当前电话号码已存在"),
     ;
 
     private int code;

src/main/java/com/dk/common/model/response/mst/StaffResponse.java

@@ -0,0 +1,245 @@
+package com.dk.common.model.response.mst;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidListTypeHandler;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ *  员工
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("员工")
+@TableName(value = "t_mst_staff", autoResultMap = true)
+@ApiModel(value="实体类：员工", description="表名：t_mst_staff")
+public class StaffResponse extends PageInfo<StaffResponse> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 员工ID
+     */
+    @TableId(value = "staff_id")
+    @ApiModelProperty(value = "员工ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String staffId;
+
+
+    /**
+     * 员工编码
+     */
+    @Excel(name = "员工编码")
+    @ApiModelProperty(value = "员工编码")
+    private String staffCode;
+
+
+    /**
+     * 员工名称
+     */
+    @Excel(name = "员工名称")
+    @ApiModelProperty(value = "员工名称")
+    private String staffName;
+
+    /**
+     * 员工电话
+     */
+    @Excel(name = "员工电话")
+    @ApiModelProperty(value = "员工电话")
+    private String staffPhone;
+
+    /**
+     * 员工工种
+     */
+    @Excel(name = "微信用户")
+    @ApiModelProperty(value = "微信用户")
+    private String wxUserId;
+
+
+    /**
+     * 组织部门
+     */
+    @Excel(name = "组织部门")
+    @ApiModelProperty(value = "组织部门")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orgId;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    /**
+     * 登录标识
+     */
+    @ApiModelProperty(value = "登录标识")
+    private Boolean flgCanLogin;
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+    /**
+     * @desc   : 角色list
+     */
+    @ApiModelProperty(value = "角色list")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> roleIds;
+
+    /**
+     * @desc   : 角色
+     */
+    @ApiModelProperty(value = "员工角色名称")
+    private String roleNames;
+
+
+    /**
+     * 企业ID
+     */
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    private Integer cpId;
+
+    /**
+     * 企业编码
+     */
+    @Excel(name = "企业编码")
+    @ApiModelProperty(value = "企业编码")
+    private String cpCode;
+
+    /**
+     * 登录标识1能登录 0不能登录
+     */
+    @Excel(name = "登录标识")
+    @ApiModelProperty(value = "登录标识")
+    private Integer hrStatus;
+
+    /**
+     * @desc   : 登录标识
+     */
+    @ApiModelProperty(value = "登录标识")
+    private String hrStatusName;
+
+    /**
+     * 创建时间 (触发器自动处理)
+     */
+    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opCreateTime;
+
+
+    /**
+     * 创建用户 (触发器自动处理)
+     */
+    @Excel(name = "创建用户 (触发器自动处理)")
+    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
+
+
+    /**
+     * 修改时间 (触发器自动处理)
+     */
+    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opUpdateTime;
+
+
+    /**
+     * 修改用户 (触发器自动处理)
+     */
+    @Excel(name = "修改用户 (触发器自动处理)")
+    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
+
+
+    /**
+     * 数据操作应用 (触发器自动处理)
+     */
+    @Excel(name = "数据操作应用 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
+    private String opAppCode;
+
+
+    /**
+     * 数据时间戳 (触发器自动处理)
+     */
+    @Excel(name = "数据时间戳 (触发器自动处理)")
+    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opTimestamp;
+
+
+    /**
+     * 数据操作数据库用户 (触发器自动处理)
+     */
+    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
+    private String opDbUser;
+
+
+    /*
+     * 相关属性
+     * @TableField(exist = false)
+     */
+
+    @ApiModelProperty(value = "关联工号ID")
+    private List<Integer> userIds;
+
+    /**
+     * 组织部门名称
+     */
+    @Excel(name = "组织部门名称")
+    @ApiModelProperty(value = "组织部门名称")
+    private String orgName;
+
+    /**
+     * 员工状态名称
+     */
+    @Excel(name = "员工状态名称")
+    @ApiModelProperty(value = "员工状态名称")
+    private String staffStatusName;
+
+    /**
+     * 部门全称
+     */
+    @Excel(name = "部门全称")
+    @ApiModelProperty(value = "部门全称")
+    private String orgLevelName;
+    private static final long serialVersionUID = 1L;
+
+}