From 591884f6ec697a58bf7c3ee48c9fae9ac4c18b98 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Fri, 31 Jul 2026 16:55:12 +0800 Subject: [PATCH] fix bug --- .../convertor/QualFilingPersonnelChangeCmdConvertor.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelChangeCmdConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelChangeCmdConvertor.java index 59a2943..2988bfe 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelChangeCmdConvertor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelChangeCmdConvertor.java @@ -1,13 +1,16 @@ package org.qinan.safetyeval.app.change.convertor; +import cn.hutool.json.JSONUtil; import org.mapstruct.Mapper; import org.mapstruct.Mapping; +import org.mapstruct.Named; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeAddCmd; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeUpdateCmd; import org.qinan.safetyeval.client.co.QualFilingPersonnelCO; import org.qinan.safetyeval.client.dto.QualFilingPersonnelAddCmd; import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelChangeE; import org.qinan.safetyeval.domain.entity.QualFilingPersonnelEntity; +import org.qinan.safetyeval.domain.entity.TitleCodeCo; import org.qinan.safetyeval.infrastructure.dataobject.QualFilingPersonnelDO; import java.time.LocalDate; @@ -90,6 +93,7 @@ public interface QualFilingPersonnelChangeCmdConvertor { * birthDate / joinWorkDate 由 LocalDate 转为 LocalDateTime */ @Mapping(target = "filingChangeId", ignore = true) + @Mapping(target = "titleCodeArr", source = "titleCodeArr", qualifiedByName = "jsonToTitleCodeList") QualFilingPersonnelChangeAddCmd convertDOToCmd(QualFilingPersonnelDO qualFilingPersonnelDO); /** @@ -104,4 +108,9 @@ public interface QualFilingPersonnelChangeCmdConvertor { default LocalDateTime map(LocalDate date) { return date == null ? null : date.atStartOfDay(); } + + @Named("jsonToTitleCodeList") + default List jsonToTitleCodeList(String json) { + return json == null || json.isEmpty() ? null : JSONUtil.toList(json, TitleCodeCo.class); + } }