cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug

dev
luotaiqian 2026-07-31 16:55:12 +08:00
parent 72831ef655
commit 591884f6ec
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelChangeCmdConvertor.java
View File

@ -1,13 +1,16 @@
package org.qinan.safetyeval.app.change.convertor; package org.qinan.safetyeval.app.change.convertor;
import cn.hutool.json.JSONUtil;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
import org.mapstruct.Named;
import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeAddCmd; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeAddCmd;
import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeUpdateCmd; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeUpdateCmd;
import org.qinan.safetyeval.client.co.QualFilingPersonnelCO; import org.qinan.safetyeval.client.co.QualFilingPersonnelCO;
import org.qinan.safetyeval.client.dto.QualFilingPersonnelAddCmd; import org.qinan.safetyeval.client.dto.QualFilingPersonnelAddCmd;
import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelChangeE; import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelChangeE;
import org.qinan.safetyeval.domain.entity.QualFilingPersonnelEntity; import org.qinan.safetyeval.domain.entity.QualFilingPersonnelEntity;
import org.qinan.safetyeval.domain.entity.TitleCodeCo;
import org.qinan.safetyeval.infrastructure.dataobject.QualFilingPersonnelDO; import org.qinan.safetyeval.infrastructure.dataobject.QualFilingPersonnelDO;
import java.time.LocalDate; import java.time.LocalDate;
@ -90,6 +93,7 @@ public interface QualFilingPersonnelChangeCmdConvertor {
* birthDate / joinWorkDate 由 LocalDate 转为 LocalDateTime * birthDate / joinWorkDate 由 LocalDate 转为 LocalDateTime
*/ */
@Mapping(target = "filingChangeId", ignore = true) @Mapping(target = "filingChangeId", ignore = true)
@Mapping(target = "titleCodeArr", source = "titleCodeArr", qualifiedByName = "jsonToTitleCodeList")
QualFilingPersonnelChangeAddCmd convertDOToCmd(QualFilingPersonnelDO qualFilingPersonnelDO); QualFilingPersonnelChangeAddCmd convertDOToCmd(QualFilingPersonnelDO qualFilingPersonnelDO);
/** /**
@ -104,4 +108,9 @@ public interface QualFilingPersonnelChangeCmdConvertor {
default LocalDateTime map(LocalDate date) { default LocalDateTime map(LocalDate date) {
return date == null ? null : date.atStartOfDay(); return date == null ? null : date.atStartOfDay();
} }
@Named("jsonToTitleCodeList")
default List<TitleCodeCo> jsonToTitleCodeList(String json) {
return json == null || json.isEmpty() ? null : JSONUtil.toList(json, TitleCodeCo.class);
}
} }