Merge branch 'dev_1.1.1' into dev_1.1.2

merge

sop-api/install/mysql/upgrade/1.1.1.sql

@@ -802,3 +802,7 @@ WHERE id=3090;
 -- 2024-09-25
 INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2105', '工时统计-统计计算', '/api/admin/tb/ding/statistic/calculate', 'URL', '29', '3', 'AUTH', '1', '1', '0');
 INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES ('2106', '统计计算', 'calculate', 'BUTTON', '29', '6', 'AUTH', '2105', '1', '0', '1');
+
+-- 2024-09-26
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2107', '公共接口-查询档案信息', '/api/admin/common/get_archives_info', 'URL', '64', '10', 'SYS', '1', '1', '0');
+

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

@@ -676,4 +676,11 @@ public class SysController {
         TBSession tbSession = (TBSession) commonCacheService.getUserSession(cacheName);
         return ResultUtil.ok(Collections.singletonMap("tbsession", tbSession));
     }
+
+    @ApiOperation(value = "公共接口-查询档案信息")
+    @RequestMapping(value = "/get_archives_info", method = RequestMethod.POST)
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = UserArchivesResult.class) })
+    public Result findUserArchivesInfo(@ApiParam(value = "用户id", required = true) @RequestParam Long userId) {
+        return ResultUtil.ok(tbUserArchivesService.findArchivesInfoByUserId(userId));
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/bean/result/UserArchivesInfoResult.java

@@ -0,0 +1,57 @@
+package com.qmth.sop.business.bean.result;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 档案信息
+ * @Author: CaoZixuan
+ * @Date: 2024-09-26
+ */
+public class UserArchivesInfoResult {
+    @ApiModelProperty("用户id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("供应商")
+    private String supplierName;
+
+    @ApiModelProperty("手机号")
+    private String mobileNumber;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getMobileNumber() {
+        return mobileNumber;
+    }
+
+    public void setMobileNumber(String mobileNumber) {
+        this.mobileNumber = mobileNumber;
+    }
+}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.sop.business.bean.dto.UserArchivesImportDto;
 import com.qmth.sop.business.bean.result.ArchivesSourceResult;
+import com.qmth.sop.business.bean.result.UserArchivesInfoResult;
 import com.qmth.sop.business.bean.result.UserArchivesResult;
 import com.qmth.sop.business.entity.TBUserArchives;
 import com.qmth.sop.common.enums.RoleTypeEnum;
@@ -77,4 +78,6 @@ public interface TBUserArchivesMapper extends BaseMapper<TBUserArchives> {
     List<UserArchivesResult> findSubTotal();
 
     List<Map<String, Object>> findTempEmp();
+
+    List<UserArchivesInfoResult> findArchivesInfoByUserId(@Param("userId") Long userId);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.sop.business.bean.dto.UserArchivesImportDto;
 import com.qmth.sop.business.bean.params.UserArchivesParam;
 import com.qmth.sop.business.bean.result.ArchivesSourceResult;
+import com.qmth.sop.business.bean.result.UserArchivesInfoResult;
 import com.qmth.sop.business.bean.result.UserArchivesResult;
 import com.qmth.sop.business.bean.result.UserArchivesSubTotalResult;
 import com.qmth.sop.business.entity.SysUser;
@@ -143,4 +144,11 @@ public interface TBUserArchivesService extends IService<TBUserArchives> {
      * @return true是，false否
      */
     boolean containsRegionCoordinator(Long userId);
+
+    /**
+     * 查询档案信息
+     * @param userId 用户id
+     * @return 档案信息
+     */
+    UserArchivesInfoResult findArchivesInfoByUserId(Long userId);
 }

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

@@ -638,11 +638,24 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
     public boolean containsRegionCoordinator(Long userId) {
         UserArchivesResult userArchivesResult = tbUserArchivesService.findUserArchivesByArchivesIdORUserId(null,
                 userId);
-        if (Objects.isNull(userArchivesResult)){
+        if (Objects.isNull(userArchivesResult)) {
             return false;
         }
         List<RoleResult> roleInfoList = userArchivesResult.getRoleInfoList();
         // 判断是否包含区域协调人身份
         return roleInfoList.stream().anyMatch(e -> RoleTypeEnum.REGION_COORDINATOR.name().equals(e.getRoleType()));
     }
+
+    @Override
+    public UserArchivesInfoResult findArchivesInfoByUserId(Long userId) {
+        UserArchivesInfoResult result = new UserArchivesInfoResult();
+        List<UserArchivesInfoResult> list = this.baseMapper.findArchivesInfoByUserId(userId);
+        if (CollectionUtils.isNotEmpty(list)) {
+            if (list.size() > 1) {
+                throw ExceptionResultEnum.ERROR.exception("用户档案信息异常");
+            }
+            result = list.get(0);
+        }
+        return result;
+    }
 }

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

@@ -391,5 +391,26 @@
     <select id="findTempEmp" resultType="java.util.Map">
         SELECT * FROM temp_emp
     </select>
+    <select id="findArchivesInfoByUserId"
+            resultType="com.qmth.sop.business.bean.result.UserArchivesInfoResult">
+        SELECT
+            su.id AS userId,
+            tbua.name AS name,
+            ss.name AS supplierName,
+            su.mobile_number AS mobileNumber
+        FROM
+            t_b_user_archives tbua
+                LEFT JOIN
+            t_b_user_archives_supplier tbuas ON tbua.id = tbuas.user_archives_id
+                LEFT JOIN
+            sys_supplier ss ON tbuas.supplier_id = ss.id
+                LEFT JOIN
+            sys_user su ON tbua.mobile_number = su.mobile_number
+        <where>
+            <if test="userId != null">
+                AND su.id = #{userId}
+            </if>
+        </where>
+    </select>
 
 </mapper>