fix(tcm):人员添加，修改，详情接口修改

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/TzsUserPermissionDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.alibaba.fastjson.JSONArray;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -54,6 +56,9 @@ public class TzsUserPermissionDto  extends BaseDto {
     @ApiModelProperty(value = "作业项目")
     private String jobItem;
 
+    @ApiModelProperty("项目代号")
+    private JSONArray itemCode;
+
     @ApiModelProperty(value = "其他作业项目")
     private String otherItem;
 

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/TzsUserPermission.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.BaseRelationEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -30,13 +30,13 @@ public class TzsUserPermission extends BaseRelationEntity {
     private Long userSeq;
 
     /**
-     * 检验专用-级别
+     * 检验检测专用-级别
      */
 	@TableField("permission_level")
     private String permissionLevel;
 
     /**
-     * 检验专用-资质项目
+     * 检验检测专用-资质项目
      */
 	@TableField("permission_item")
     private String permissionItem;
@@ -90,6 +90,12 @@ public class TzsUserPermission extends BaseRelationEntity {
     private String jobItem;
 
     /**
+     * 项目代号,多个用逗号分割
+     */
+    @TableField("item_code")
+    private String itemCode;
+
+    /**
      * 其他作业项目
      */
 	@TableField("other_item")

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzsUserInfoDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,6 +33,9 @@ public class TzsUserInfoDto extends BaseDto {
     @ApiModelProperty(value = "岗位")
     private String post;
 
+    @ApiModelProperty("新岗位（后期post迁移数组至此）")
+    private String newPost;
+
     @ApiModelProperty(value = "岗位名称")
     private String postName;
 
@@ -102,4 +104,10 @@ public class TzsUserInfoDto extends BaseDto {
 
     @ApiModelProperty(value = "检测资质json,固定前缀permissionData,入库时数据存放到permissionData")
     private JSONArray permissionData66152;
+
+    @ApiModelProperty(value = "作业人员资质信息json,固定前缀permissionData,入库时数据存放到permissionData")
+    private JSONArray permissionData6552;
+
+    @ApiModelProperty(value = "职称")
+    private String jobTitle;
 }

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

@@ -53,6 +53,12 @@ public class TzsUserInfo extends BaseEntity {
     private String post;
 
     /**
+     * 新岗位（后期post迁移数组至此）
+     */
+    @TableField("new_post")
+    private String newPost;
+
+    /**
      * 岗位名称
      */
     @TableField("post_name")
@@ -183,4 +189,10 @@ public class TzsUserInfo extends BaseEntity {
     @TableField(value = "permission_data")
     private String permissionData;
 
+    /**
+     * 职称
+     */
+    @TableField(value = "job_title")
+    private String jobTitle;
+
 }

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

@@ -145,4 +145,9 @@ public class TzsUserInfoVo {
     * */
     private String companyType;
 
+    /**
+     * 职称
+     */
+    private String jobTitle;
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -214,15 +214,15 @@
 
     <select id="getUserTypeList" resultType="java.util.Map">
         SELECT
-            *
+        *
         FROM
-            "cb_data_dictionary"
+        "cb_data_dictionary"
         WHERE
-            type in
+        is_delete = false
+        and type in
         <foreach collection="typeList" separator="," item="type" open="(" close=")">
             #{type}
         </foreach>
-
     </select>
 
     <select id="selectCompanyTypeById" resultType="java.lang.String">