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

version

dev
luotaiqian 2026-07-14 11:29:08 +08:00
parent 7e7c063b94
commit 91d4b1753a
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java
View File

@ -1,5 +1,6 @@
package org.qinan.safetyeval.app.executor; package org.qinan.safetyeval.app.executor;
import com.alibaba.fastjson.JSON;
import org.qinan.safetyeval.client.api.OrgInfoApi; import org.qinan.safetyeval.client.api.OrgInfoApi;
import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.PageResponse;
import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.SingleResponse;

3
safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java
View File

@ -8,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
/** /**
* 机构信息CO（Client Object） * 机构信息CO（Client Object）
@ -27,7 +28,7 @@ public class OrgInfoCO {
private String creditCode; private String creditCode;
@ApiModelProperty(value = "安全行业类别编码") @ApiModelProperty(value = "安全行业类别编码")
private String safetyIndustryCategoryCode; private List<String> safetyIndustryCategoryCode;
@ApiModelProperty(value = "安全行业类别名称") @ApiModelProperty(value = "安全行业类别名称")
private String safetyIndustryCategoryName; private String safetyIndustryCategoryName;

3
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoAddCmd.java
View File

@ -5,6 +5,7 @@ import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List;
/** /**
* 机构信息新增命令 * 机构信息新增命令
@ -24,7 +25,7 @@ public class OrgInfoAddCmd {
private String creditCode; private String creditCode;
@ApiModelProperty(value = "安全生产监管行业类别编码") @ApiModelProperty(value = "安全生产监管行业类别编码")
private String safetyIndustryCategoryCode; private List<String> safetyIndustryCategoryCode;
@ApiModelProperty(value = "安全生产监管行业类别名称") @ApiModelProperty(value = "安全生产监管行业类别名称")
private String safetyIndustryCategoryName; private String safetyIndustryCategoryName;

3
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoModifyCmd.java
View File

@ -3,6 +3,7 @@ package org.qinan.safetyeval.client.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List;
import lombok.Data; import lombok.Data;
/** /**
@ -23,7 +24,7 @@ public class OrgInfoModifyCmd {
private String creditCode; private String creditCode;
@ApiModelProperty(value = "安全生产监管行业类别编码") @ApiModelProperty(value = "安全生产监管行业类别编码")
private String safetyIndustryCategoryCode; private List<String> safetyIndustryCategoryCode;
@ApiModelProperty(value = "安全生产监管行业类别名称") @ApiModelProperty(value = "安全生产监管行业类别名称")
private String safetyIndustryCategoryName; private String safetyIndustryCategoryName;

3
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgInfoEntity.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
/** /**
* 机构信息领域实体 * 机构信息领域实体
@ -25,7 +26,7 @@ public class OrgInfoEntity {
private String creditCode; private String creditCode;
/** 安全生产监管行业类别编码 */ /** 安全生产监管行业类别编码 */
private String safetyIndustryCategoryCode; private List<String> safetyIndustryCategoryCode;
/** 安全生产监管行业类别名称 */ /** 安全生产监管行业类别名称 */
private String safetyIndustryCategoryName; private String safetyIndustryCategoryName;

7
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java
View File

@ -1,5 +1,6 @@
package org.qinan.safetyeval.infrastructure.gatewayimpl; package org.qinan.safetyeval.infrastructure.gatewayimpl;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -132,7 +133,7 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
.select(OrgInfoDO::getCreateId) .select(OrgInfoDO::getCreateId)
.eq(OrgInfoDO::getId, id)).stream() .eq(OrgInfoDO::getId, id)).stream()
.map(OrgInfoDO::getCreateId).collect(Collectors.toList()); .map(OrgInfoDO::getCreateId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(departUserId)){ if (CollectionUtils.isEmpty(departUserId)) {
throw new BizException(ErrorCode.ORG_DEPARTMENT_NOT_FOUND); throw new BizException(ErrorCode.ORG_DEPARTMENT_NOT_FOUND);
} }
gbsUserFacadeClient.delete(departUserId.get(0)); gbsUserFacadeClient.delete(departUserId.get(0));
@ -308,7 +309,7 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
dataObject.setId(entity.getId()); dataObject.setId(entity.getId());
dataObject.setUnitName(entity.getUnitName()); dataObject.setUnitName(entity.getUnitName());
dataObject.setCreditCode(entity.getCreditCode()); dataObject.setCreditCode(entity.getCreditCode());
dataObject.setSafetyIndustryCategoryCode(entity.getSafetyIndustryCategoryCode()); dataObject.setSafetyIndustryCategoryCode(JSONUtil.toJsonStr(entity.getSafetyIndustryCategoryCode()));
dataObject.setSafetyIndustryCategoryName(entity.getSafetyIndustryCategoryName()); dataObject.setSafetyIndustryCategoryName(entity.getSafetyIndustryCategoryName());
dataObject.setDistrictCode(entity.getDistrictCode()); dataObject.setDistrictCode(entity.getDistrictCode());
dataObject.setDistrictName(entity.getDistrictName()); dataObject.setDistrictName(entity.getDistrictName());
@ -361,7 +362,7 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
entity.setId(dataObject.getId()); entity.setId(dataObject.getId());
entity.setUnitName(dataObject.getUnitName()); entity.setUnitName(dataObject.getUnitName());
entity.setCreditCode(dataObject.getCreditCode()); entity.setCreditCode(dataObject.getCreditCode());
entity.setSafetyIndustryCategoryCode(dataObject.getSafetyIndustryCategoryCode()); entity.setSafetyIndustryCategoryCode(JSONUtil.toList(dataObject.getSafetyIndustryCategoryCode(), String.class));
entity.setSafetyIndustryCategoryName(dataObject.getSafetyIndustryCategoryName()); entity.setSafetyIndustryCategoryName(dataObject.getSafetyIndustryCategoryName());
entity.setDistrictCode(dataObject.getDistrictCode()); entity.setDistrictCode(dataObject.getDistrictCode());
entity.setDistrictName(dataObject.getDistrictName()); entity.setDistrictName(dataObject.getDistrictName());