Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/java/com/qmth/sop/business/entity/TBCrm.java

@@ -64,6 +64,10 @@ public class TBCrm extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long leadId;
 
+    @ApiModelProperty(value = "区域协调人id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long regionCoordinatorId;
+
     @ApiModelProperty(value = "是否crm同步，false：否，true：是")
     @NotNull(message = "是否crm同步不能为空")
     private Boolean sync;
@@ -167,4 +171,12 @@ public class TBCrm extends BaseEntity implements Serializable {
     public void setEnable(Boolean enable) {
         this.enable = enable;
     }
+
+    public Long getRegionCoordinatorId() {
+        return regionCoordinatorId;
+    }
+
+    public void setRegionCoordinatorId(Long regionCoordinatorId) {
+        this.regionCoordinatorId = regionCoordinatorId;
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/entity/TBUserArchives.java

@@ -3,6 +3,7 @@ package com.qmth.sop.business.entity;
 import com.qmth.sop.common.base.BaseEntity;
 import com.qmth.sop.common.enums.EducationEnum;
 import com.qmth.sop.common.enums.GenderEnum;
+import com.qmth.sop.common.enums.UserArchivesStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -60,6 +61,9 @@ public class TBUserArchives extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "底照保存地址")
     private String basePhotoPath;
 
+    @ApiModelProperty(value = "人力资源状态")
+    private UserArchivesStatusEnum status;
+
     public String getCode() {
         return code;
     }
@@ -163,4 +167,12 @@ public class TBUserArchives extends BaseEntity implements Serializable {
     public void setBasePhotoPath(String basePhotoPath) {
         this.basePhotoPath = basePhotoPath;
     }
+
+    public UserArchivesStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(UserArchivesStatusEnum status) {
+        this.status = status;
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/entity/TBUserArchivesAllocation.java

@@ -46,6 +46,10 @@ public class TBUserArchivesAllocation implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
+    @ApiModelProperty(value = "人员档案id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long archivesId;
+
     public Long getId() {
         return id;
     }
@@ -101,4 +105,12 @@ public class TBUserArchivesAllocation implements Serializable {
     public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
+
+    public Long getArchivesId() {
+        return archivesId;
+    }
+
+    public void setArchivesId(Long archivesId) {
+        this.archivesId = archivesId;
+    }
 }

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -74,3 +74,11 @@ ALTER TABLE `t_b_user_archives_allocation`
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2015', '公共接口-查询服务单元列表', '/api/admin/common/query_service_unit', 'URL', '64', '25', 'SYS', '1', '1', '0');
 ALTER TABLE `t_b_user_archives_allocation`
     CHANGE COLUMN `region_user_id` `region_user_id` BIGINT NULL COMMENT '区域协调人id' ;
+
+-- 2023/08/18
+ALTER TABLE t_b_crm
+    ADD COLUMN region_coordinator_id BIGINT NULL COMMENT '区域协调人id' AFTER lead_id;
+ALTER TABLE t_b_user_archives
+    ADD COLUMN status VARCHAR(20) NOT NULL COMMENT '人力资源状态（FREE(\"空闲\"),NON_EXECUTION_SOP(\"未执行SOP\"),EXECUTION_SOP(\"执行SOP\");）' AFTER base_photo_path;
+ALTER TABLE t_b_user_archives_allocation
+    ADD COLUMN archives_id BIGINT NOT NULL COMMENT '人员档案id' AFTER role_id;

sop-common/src/main/java/com/qmth/sop/common/enums/UserArchivesStatusEnum.java

@@ -0,0 +1,22 @@
+package com.qmth.sop.common.enums;
+
+/**
+ * @Description: 人力资源状态
+ * @Author: CaoZixuan
+ * @Date: 2023-08-18
+ */
+public enum UserArchivesStatusEnum {
+    FREE("空闲"),
+    NON_EXECUTION_SOP("未执行SOP"),
+    EXECUTION_SOP("执行SOP"),
+    ;
+    private final String title;
+
+    UserArchivesStatusEnum(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+}