version
parent
7e7c063b94
commit
91d4b1753a
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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<String> safetyIndustryCategoryCode;
|
||||
|
||||
@ApiModelProperty(value = "安全行业类别名称")
|
||||
private String safetyIndustryCategoryName;
|
||||
|
|
|
|||
|
|
@ -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<String> safetyIndustryCategoryCode;
|
||||
|
||||
@ApiModelProperty(value = "安全生产监管行业类别名称")
|
||||
private String safetyIndustryCategoryName;
|
||||
|
|
|
|||
|
|
@ -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<String> safetyIndustryCategoryCode;
|
||||
|
||||
@ApiModelProperty(value = "安全生产监管行业类别名称")
|
||||
private String safetyIndustryCategoryName;
|
||||
|
|
|
|||
|
|
@ -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<String> safetyIndustryCategoryCode;
|
||||
|
||||
/** 安全生产监管行业类别名称 */
|
||||
private String safetyIndustryCategoryName;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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());
|
||||
|
|
|
|||
Loading…
Reference in New Issue