1.资质存量数据刷库维保人员处理

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/HistoryDataDealController.java

@@ -27,7 +27,7 @@ public class HistoryDataDealController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/user-permission/update")
-    @ApiOperation(httpMethod = "PUT", value = "人员需求2970新增资质后, 资质存量数据刷库")
+    @ApiOperation(httpMethod = "PUT", value = "人员需求2970新增资质后, 检验检测资质存量数据刷库")
     public ResponseModel<Integer> userPermissionUpdate() {
         return ResponseHelper.buildResponse(historyDataDealService.userPermissionUpdate());
     }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/HistoryDataDealServiceImpl.java

@@ -67,7 +67,7 @@ public class HistoryDataDealServiceImpl {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
         LambdaQueryWrapper<TzsUserInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.select(BaseEntity::getSequenceNbr,TzsUserInfo::getPost);
+        wrapper.select(BaseEntity::getSequenceNbr,TzsUserInfo::getPost,TzsUserInfo::getPostName);
         wrapper.isNotNull(TzsUserInfo::getPost);
         List<TzsUserInfo> users = userInfoService.list(wrapper);
         users.parallelStream().forEach(u->{
@@ -76,7 +76,7 @@ public class HistoryDataDealServiceImpl {
             updateWrapper.set(TzsUserInfo::getNewPost, u.getPost().replace("6618","6552"));
             // 由于目前系统作业人员为新增的资质，还没维护资质信息，故与测试沟通去掉post里面的6618维保人员，人员维护后程序会把6618重新冗余到post字段
             updateWrapper.set(TzsUserInfo::getPost, u.getPost().replace("6618",""));
-            // 维保人员人员类型去掉，数据归并到作业人员-名称处理
+            // 维保人员人员类型去掉，数据归并到作业人员-名称处理保持与new_post一致
             updateWrapper.set(u.getPostName() != null, TzsUserInfo::getPostName, u.getPostName().replace("维保人员","作业人员"));
             updateWrapper.eq(BaseEntity::getSequenceNbr, u.getSequenceNbr());
             userInfoService.update(updateWrapper);