diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java index 8ccf51f..29dcdbf 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.app.executor; +import com.alibaba.fastjson.JSON; import org.qinan.safetyeval.client.api.OrgInfoApi; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java index 86a5336..fd097c6 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java @@ -8,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.List; /** * 机构信息CO(Client Object) @@ -27,7 +28,7 @@ public class OrgInfoCO { private String creditCode; @ApiModelProperty(value = "安全行业类别编码") - private String safetyIndustryCategoryCode; + private List safetyIndustryCategoryCode; @ApiModelProperty(value = "安全行业类别名称") private String safetyIndustryCategoryName; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoAddCmd.java index e1dde4a..c92e040 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoAddCmd.java @@ -5,6 +5,7 @@ import lombok.Data; import java.math.BigDecimal; import java.time.LocalDate; +import java.util.List; /** * 机构信息新增命令 @@ -24,7 +25,7 @@ public class OrgInfoAddCmd { private String creditCode; @ApiModelProperty(value = "安全生产监管行业类别编码") - private String safetyIndustryCategoryCode; + private List safetyIndustryCategoryCode; @ApiModelProperty(value = "安全生产监管行业类别名称") private String safetyIndustryCategoryName; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoModifyCmd.java index 46ea9a8..4a7b28d 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoModifyCmd.java @@ -3,6 +3,7 @@ package org.qinan.safetyeval.client.dto; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; +import java.util.List; import lombok.Data; /** @@ -23,7 +24,7 @@ public class OrgInfoModifyCmd { private String creditCode; @ApiModelProperty(value = "安全生产监管行业类别编码") - private String safetyIndustryCategoryCode; + private List safetyIndustryCategoryCode; @ApiModelProperty(value = "安全生产监管行业类别名称") private String safetyIndustryCategoryName; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgInfoEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgInfoEntity.java index 035a640..eec7453 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgInfoEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgInfoEntity.java @@ -6,6 +6,7 @@ import lombok.Data; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.List; /** * 机构信息领域实体 @@ -25,7 +26,7 @@ public class OrgInfoEntity { private String creditCode; /** 安全生产监管行业类别编码 */ - private String safetyIndustryCategoryCode; + private List safetyIndustryCategoryCode; /** 安全生产监管行业类别名称 */ private String safetyIndustryCategoryName; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java index 5fd2902..2fcaf5f 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.infrastructure.gatewayimpl; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -132,7 +133,7 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway { .select(OrgInfoDO::getCreateId) .eq(OrgInfoDO::getId, id)).stream() .map(OrgInfoDO::getCreateId).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(departUserId)){ + if (CollectionUtils.isEmpty(departUserId)) { throw new BizException(ErrorCode.ORG_DEPARTMENT_NOT_FOUND); } gbsUserFacadeClient.delete(departUserId.get(0)); @@ -308,7 +309,7 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway { dataObject.setId(entity.getId()); dataObject.setUnitName(entity.getUnitName()); dataObject.setCreditCode(entity.getCreditCode()); - dataObject.setSafetyIndustryCategoryCode(entity.getSafetyIndustryCategoryCode()); + dataObject.setSafetyIndustryCategoryCode(JSONUtil.toJsonStr(entity.getSafetyIndustryCategoryCode())); dataObject.setSafetyIndustryCategoryName(entity.getSafetyIndustryCategoryName()); dataObject.setDistrictCode(entity.getDistrictCode()); dataObject.setDistrictName(entity.getDistrictName()); @@ -361,7 +362,7 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway { entity.setId(dataObject.getId()); entity.setUnitName(dataObject.getUnitName()); entity.setCreditCode(dataObject.getCreditCode()); - entity.setSafetyIndustryCategoryCode(dataObject.getSafetyIndustryCategoryCode()); + entity.setSafetyIndustryCategoryCode(JSONUtil.toList(dataObject.getSafetyIndustryCategoryCode(), String.class)); entity.setSafetyIndustryCategoryName(dataObject.getSafetyIndustryCategoryName()); entity.setDistrictCode(dataObject.getDistrictCode()); entity.setDistrictName(dataObject.getDistrictName());