人员资质超期问题页面调整

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/vo/TzsUserInfoVo.java

@@ -134,6 +134,8 @@ public class TzsUserInfoVo {
     @ApiModelProperty(value = "设备类型")
     private JSONArray equipType;
 
+    private String equipTypeName;
+
     /**
      * 内部人员编码
      */
@@ -155,5 +157,5 @@ public class TzsUserInfoVo {
      * 职称
      */
     private String jobTitle;
-
+    private String postName;
 }

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/TzsUserInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -279,7 +280,20 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             tzsUserInfoVo.setNewPost(JSON.parseArray(tzsUserInfo.getNewPost()));
         }
         if (!ObjectUtils.isEmpty(tzsUserInfo.getEquipType())) {
-            tzsUserInfoVo.setEquipType(JSON.parseArray(tzsUserInfo.getEquipType()));
+            JSONArray equipTypeJSONArray = JSON.parseArray(tzsUserInfo.getEquipType());
+            tzsUserInfoVo.setEquipType(equipTypeJSONArray);
+            if(CollUtil.isNotEmpty(equipTypeJSONArray)){
+                StringBuilder equipTypeName = new StringBuilder();
+                for (Object o : equipTypeJSONArray) {
+                    String s = EquipmentClassifityEnum.getName.get(o);
+                    if(StringUtils.isEmpty(s)){
+                        s = String.valueOf(o);
+                    }
+                    equipTypeName.append(s);
+                    equipTypeName.append(",");
+                }
+                tzsUserInfoVo.setEquipTypeName(equipTypeName.substring(0,equipTypeName.length()-1));
+            }
         }
         tzsUserInfoVo.setIdentification(ObjectUtils.isEmpty(tzsUserInfo.getIdentification()) ? null : JSON.parseArray(tzsUserInfo.getIdentification()));
         tzsUserInfoVo.setProfile(ObjectUtils.isEmpty(tzsUserInfo.getProfile()) ? null : JSON.parseArray(tzsUserInfo.getProfile()));

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/TzsUserInfo.java

@@ -148,4 +148,6 @@ public class TzsUserInfo extends BaseEntity {
     @TableField("qr_code_state")
     private String qrCodeState;
 
+    @TableField("post_name")
+    private String postName;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/vo/TzsUserInfoVo.java

@@ -123,4 +123,5 @@ public class TzsUserInfoVo {
      * 证件照片
      */
     private JSONArray appointDoc;
+    private String postName;
 }