Merge remote-tracking branch 'origin/dev_1.1.0' into dev_1.1.0

sop-api/src/main/java/com/qmth/sop/server/api/TBUserArchivesAllocationLogController.java

@@ -0,0 +1,22 @@
+package com.qmth.sop.server.api;
+
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.sop.common.contant.SystemConstant;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 人员调配历史记录 前端控制器
+ * </p>
+ *
+ * @author CaoZixuan
+ * @since 2024-05-15
+ */
+@Api(tags = "人员调配Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_USER_ARCHIVES_ALLOCATION_LOG)
+public class TBUserArchivesAllocationLogController {
+
+}

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

@@ -0,0 +1,96 @@
+package com.qmth.sop.business.entity;
+
+import com.qmth.sop.common.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 人员调配历史记录
+ * </p>
+ *
+ * @author CaoZixuan
+ * @since 2024-05-15
+ */
+@ApiModel(value="TBUserArchivesAllocationLog对象", description="人员调配历史记录")
+public class TBUserArchivesAllocationLog extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "派单详情表id")
+    private Long crmDetailId;
+
+    @ApiModelProperty(value = "sop角色类型")
+    private String sopRoleType;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "人员档案id")
+    private Long archivesId;
+
+    @ApiModelProperty(value = "档案名称")
+    private String archivesName;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
+
+    @ApiModelProperty(value = "城市")
+    private String city;
+
+    public Long getCrmDetailId() {
+        return crmDetailId;
+    }
+
+    public void setCrmDetailId(Long crmDetailId) {
+        this.crmDetailId = crmDetailId;
+    }
+
+    public String getSopRoleType() {
+        return sopRoleType;
+    }
+
+    public void setSopRoleType(String sopRoleType) {
+        this.sopRoleType = sopRoleType;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getArchivesId() {
+        return archivesId;
+    }
+
+    public void setArchivesId(Long archivesId) {
+        this.archivesId = archivesId;
+    }
+
+    public String getArchivesName() {
+        return archivesName;
+    }
+
+    public void setArchivesName(String archivesName) {
+        this.archivesName = archivesName;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+}

sop-business/src/main/java/com/qmth/sop/business/mapper/TBUserArchivesAllocationLogMapper.java

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.mapper;
+
+import com.qmth.sop.business.entity.TBUserArchivesAllocationLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 人员调配历史记录 Mapper 接口
+ * </p>
+ *
+ * @author CaoZixuan
+ * @since 2024-05-15
+ */
+public interface TBUserArchivesAllocationLogMapper extends BaseMapper<TBUserArchivesAllocationLog> {
+
+}

sop-business/src/main/java/com/qmth/sop/business/service/TBUserArchivesAllocationLogService.java

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.service;
+
+import com.qmth.sop.business.entity.TBUserArchivesAllocationLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 人员调配历史记录 服务类
+ * </p>
+ *
+ * @author CaoZixuan
+ * @since 2024-05-15
+ */
+public interface TBUserArchivesAllocationLogService extends IService<TBUserArchivesAllocationLog> {
+
+}

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBUserArchivesAllocationLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qmth.sop.business.service.impl;
+
+import com.qmth.sop.business.entity.TBUserArchivesAllocationLog;
+import com.qmth.sop.business.mapper.TBUserArchivesAllocationLogMapper;
+import com.qmth.sop.business.service.TBUserArchivesAllocationLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 人员调配历史记录 服务实现类
+ * </p>
+ *
+ * @author CaoZixuan
+ * @since 2024-05-15
+ */
+@Service
+public class TBUserArchivesAllocationLogServiceImpl extends ServiceImpl<TBUserArchivesAllocationLogMapper, TBUserArchivesAllocationLog> implements TBUserArchivesAllocationLogService {
+
+}

sop-business/src/main/resources/mapper/TBUserArchivesAllocationLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qmth.sop.business.mapper.TBUserArchivesAllocationLogMapper">
+
+</mapper>

sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -232,6 +232,7 @@ public class SystemConstant {
     public static final String PREFIX_URL_USER = "/admin/user";
     public static final String PREFIX_URL_USER_ARCHIVES = "/admin/user/archives";
     public static final String PREFIX_URL_USER_ARCHIVES_ALLOCATION = "/admin/user/archives/allocation";
+    public static final String PREFIX_URL_USER_ARCHIVES_ALLOCATION_LOG = "/admin/user/archives/allocation/log";
     public static final String PREFIX_URL_TASK = "/admin/task";
     public static final String PREFIX_URL_SYS = "/admin/sys";
     public static final String PREFIX_URL_ORG = "/admin/org";