fix bug

safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingComplianceCmdConvertor.java

@@ -10,6 +10,7 @@ import org.qinan.safetyeval.client.dto.QualFilingCommitmentAddCmd;
 import org.qinan.safetyeval.client.dto.QualFilingEquipmentAddCmd;
 import org.qinan.safetyeval.client.dto.QualFilingMaterialAddCmd;
 import org.qinan.safetyeval.client.dto.QualFilingPersonnelAddCmd;
+import org.qinan.safetyeval.domain.entity.TitleCodeCo;
 import org.qinan.safetyeval.infrastructure.dataobject.QualFilingCommitmentDO;
 import org.qinan.safetyeval.infrastructure.dataobject.QualFilingDO;
 import org.qinan.safetyeval.infrastructure.dataobject.QualFilingEquipmentDO;
@@ -66,10 +67,16 @@ public interface QualFilingComplianceCmdConvertor {
     /**
      * 备案人员DO转Cmd
      */
+    @Mapping(target = "titleCodeArr", source = "titleCodeArr", qualifiedByName = "jsonToTitleCodeList")
     QualFilingPersonnelAddCmd convertPersonnelDOToCmd(QualFilingPersonnelDO qualFilingPersonnelDO);
 
     @Named("jsonStringToList")
     default List<String> jsonStringToList(String json) {
         return json == null ? null : JSON.parseArray(json, String.class);
     }
+
+    @Named("jsonToTitleCodeList")
+    default List<TitleCodeCo> jsonToTitleCodeList(String json) {
+        return json == null || json.isEmpty() ? null : JSON.parseArray(json, TitleCodeCo.class);
+    }
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java

@@ -3,8 +3,10 @@ package org.qinan.safetyeval.client.change.request;
 import com.alibaba.cola.dto.PageQuery;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.qinan.safetyeval.domain.entity.TitleCodeCo;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 备案申请人员-变更分页查询Qry

safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java

@@ -5,11 +5,13 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.qinan.safetyeval.client.common.jackson.DateToLocalDateTimeDeserializer;
+import org.qinan.safetyeval.domain.entity.TitleCodeCo;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 备案申请人员-变更修改Cmd

safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java

@@ -4,8 +4,10 @@ import com.alibaba.cola.dto.ClientObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.qinan.safetyeval.domain.entity.TitleCodeCo;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 备案申请人员-变更Co

safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java

@@ -2,7 +2,10 @@ package org.qinan.safetyeval.client.co;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.time.LocalDate;
+import java.util.List;
+
 import lombok.Data;
+import org.qinan.safetyeval.domain.entity.TitleCodeCo;
 
 /**
  * 人员信息CO（Client Object）

safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java

@@ -34,7 +34,7 @@ public class QualFilingPersonnelCO {
     private String positionName;
 
     @ApiModelProperty(value = "职称(多个逗号分隔)")
-    private String titleCodeArr;
+    private List<TitleCodeCo> titleCodeArr;
 
     @ApiModelProperty(value = "性别编码(1男2女)")
     private Integer genderCode;

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java

@@ -2,9 +2,11 @@ package org.qinan.safetyeval.client.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.time.LocalDate;
+import java.util.List;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import lombok.Data;
+import org.qinan.safetyeval.domain.entity.TitleCodeCo;
 
 /**
  * 人员信息新增命令

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java

@@ -109,7 +109,7 @@ public class OrgPersonnelModifyCmd {
     private String educationLevelName;
 
     @ApiModelProperty(value = "职称(多个逗号分隔)")
-    private String titleCodeArr;
+    private List<TitleCodeCo> titleCodeArr;
 
     @ApiModelProperty(value = "是否注册安全工程师(1是2否)")
     private Integer registerEngineerFlag;

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java

@@ -2,7 +2,10 @@ package org.qinan.safetyeval.client.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.time.LocalDate;
+import java.util.List;
+
 import lombok.Data;
+import org.qinan.safetyeval.domain.entity.TitleCodeCo;
 
 /**
  * 备案申请人员新增命令

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java

@@ -2,7 +2,10 @@ package org.qinan.safetyeval.client.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.time.LocalDate;
+import java.util.List;
+
 import lombok.Data;
+import org.qinan.safetyeval.domain.entity.TitleCodeCo;
 
 /**
  * 备案申请人员修改命令

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java

@@ -7,8 +7,10 @@ import com.jjb.saas.framework.domain.model.BaseE;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.qinan.safetyeval.domain.change.gateway.QualFilingPersonnelChangeGateway;
+import org.qinan.safetyeval.domain.entity.TitleCodeCo;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 备案申请人员-变更领域模型

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 备案申请人员领域实体

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/OrgPersonnelDoConvertor.java

@@ -46,11 +46,11 @@ public interface OrgPersonnelDoConvertor {
 
     @Named("jsonToTitleCodeList")
     default List<TitleCodeCo> jsonToTitleCodeList(String json) {
-        return json == null || json.isEmpty() ? null : JSON.parseArray(json, TitleCodeCo.class);
+        return json == null || json.isEmpty() ? null : JSONUtil.toList(json, TitleCodeCo.class);
     }
 
     @Named("titleCodeListToJson")
     default String titleCodeListToJson(List<TitleCodeCo> list) {
-        return list == null || list.isEmpty() ? null : JSON.toJSONString(list);
+        return list == null || list.isEmpty() ? null : JSONUtil.toJsonStr(list);
     }
 }

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/QualFilingPersonnelChangeDoConvertor.java

@@ -1,5 +1,6 @@
 package org.qinan.safetyeval.infrastructure.convertor;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;