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

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

@@ -110,7 +110,7 @@ public class TBUserArchivesController {
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
     @OperationLog
-    public Result editUserArchives(@Valid @RequestBody UserArchivesParam userArchivesParam, BindingResult bindingResult) {
+    public Result editUserArchives(@Valid @RequestBody UserArchivesParam userArchivesParam, BindingResult bindingResult) throws InterruptedException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }

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

@@ -11,7 +11,6 @@ import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBUserArchives;
 import com.qmth.sop.common.enums.RoleTypeEnum;
 
-import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -50,7 +49,7 @@ public interface TBUserArchivesService extends IService<TBUserArchives> {
      * @param requestUser       请求的用户
      * @return 档案id
      */
-    Long editUserArchives(UserArchivesParam userArchivesParam, SysUser requestUser);
+    Long editUserArchives(UserArchivesParam userArchivesParam, SysUser requestUser) throws InterruptedException;
 
     /**
      * 查询人员档案小计

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

@@ -51,6 +51,8 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
     private BasicAttachmentService basicAttachmentService;
     @Resource
     private TBUserArchivesService tbUserArchivesService;
+    @Resource
+    private SequenceService sequenceService;
 
     @Override
     public IPage<UserArchivesResult> findUserArchivesPage(String city, Long supplierId, String archivesName, RoleTypeEnum roleType, Boolean authenticationStatus, Long archivesTimeStart, Long archivesTimeEnd, Integer remainValidDay, Integer pageNumber, Integer pageSize) throws Exception {
@@ -118,19 +120,8 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
 
     @Transactional
     @Override
-    public Long editUserArchives(UserArchivesParam userArchivesParam, SysUser requestUser) {
+    public Long editUserArchives(UserArchivesParam userArchivesParam, SysUser requestUser) throws InterruptedException {
         Long id = userArchivesParam.getId();
-        String code = userArchivesParam.getCode();
-        // 校验档案编号唯一
-        List<TBUserArchives> codeCheckList = this.list(new QueryWrapper<TBUserArchives>().lambda().eq(TBUserArchives::getCode, code));
-        if (codeCheckList.size() > 1) {
-            throw ExceptionResultEnum.ERROR.exception("系统中存在多个相同的档案编号异常[" + code + "]");
-        } else if (codeCheckList.size() == 1) {
-            TBUserArchives codeCheck = codeCheckList.get(0);
-            if (!Objects.equals(codeCheck.getId(), id)) {
-                throw ExceptionResultEnum.ERROR.exception("系统中已经存在档案编号[" + code + "]");
-            }
-        }
         // 校验身份证号唯一
         String identify = userArchivesParam.getIdentity();
         List<TBUserArchives> identifyCheckList = this.list(new QueryWrapper<TBUserArchives>().lambda().eq(TBUserArchives::getIdentity, identify));
@@ -179,7 +170,6 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
         String remark = userArchivesParam.getRemark();
 
         TBUserArchives tbUserArchives = new TBUserArchives();
-        tbUserArchives.setCode(code);
         tbUserArchives.setName(name);
         tbUserArchives.setCountry(country);
         tbUserArchives.setProvince(province);
@@ -196,8 +186,10 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
         Long userId = null;
         if (id == null || id == 0) {
             // 新增
+            String code = sequenceService.createSerialNo(SequenceEnum.USER_ARCHIVES_CODE);
             tbUserArchives.setStatus(UserArchivesStatusEnum.FREE);
             tbUserArchives.setCreateId(requestUser.getId());
+            tbUserArchives.setCode(code);
             this.save(tbUserArchives);
             id = tbUserArchives.getId();
             List<SysUser> userList = sysUserService.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getMobileNumber, mobileNumber));
@@ -409,9 +401,8 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
         if (!RoleTypeEnum.EFFECT_ENGINEER.equals(roleType) && !RoleTypeEnum.ASSISTANT_ENGINEER.equals(roleType)) {
             throw ExceptionResultEnum.ERROR.exception("该方法只支持查询实施工程师和助理工程师");
         }
-        List<ArchivesSourceResult> list = new ArrayList<>();
 
-        list.addAll(this.baseMapper.findArchivesSourceByType(roleType));
+        List<ArchivesSourceResult> list = new ArrayList<>(this.baseMapper.findArchivesSourceByType(roleType));
 
         Long currentTime = System.currentTimeMillis();
         list = list.stream()