version
parent
3662b06137
commit
aee4735db7
|
|
@ -667,6 +667,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
|
|||
co.setAttachmentUrl(entity.getAttachmentUrl());
|
||||
co.setFilingStatusCode(entity.getFilingStatusCode());
|
||||
co.setFilingStatusName(entity.getFilingStatusName());
|
||||
co.setAlertStatus(entity.getAlertStatus());
|
||||
co.setTenantId(entity.getTenantId());
|
||||
return co;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import org.qinan.safetyeval.client.co.QualFilingCO;
|
|||
import org.qinan.safetyeval.client.co.QualFilingComplianceCheckResultCO;
|
||||
import org.qinan.safetyeval.client.co.QualFilingDetailCO;
|
||||
import org.qinan.safetyeval.client.dto.*;
|
||||
import org.qinan.safetyeval.domain.constant.AlertStatusEnum;
|
||||
import org.qinan.safetyeval.domain.constant.QualFilingApplyTypeEnum;
|
||||
import org.qinan.safetyeval.domain.constant.QualFilingReviewResultEnum;
|
||||
import org.qinan.safetyeval.domain.entity.*;
|
||||
|
|
@ -286,6 +287,7 @@ public class QualFilingExecutor implements QualFilingApi {
|
|||
co.setFilingStatusName(entity.getFilingStatusName());
|
||||
co.setApplyTypeCode(entity.getApplyTypeCode());
|
||||
co.setApplyTypeName(entity.getApplyTypeName());
|
||||
co.setAlertStatus(entity.getAlertStatus());
|
||||
co.setTenantId(entity.getTenantId());
|
||||
return co;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,6 +114,7 @@ public class QualFilingOrchestrator {
|
|||
entity.setApplyTypeName(applyType.getName());
|
||||
entity.setFilingStatusCode(QualFilingStatusEnum.DRAFT.getCode());
|
||||
entity.setFilingStatusName(QualFilingStatusEnum.DRAFT.getName());
|
||||
entity.setAlertStatus(AlertStatusEnum.NORMAL.getValue());
|
||||
entity.setOrgId(resolveOrgId());
|
||||
entity.setTenantId(resolveTenantId());
|
||||
prefillFromOrgInfo(entity);
|
||||
|
|
@ -708,6 +709,7 @@ public class QualFilingOrchestrator {
|
|||
co.setFilingStatusName(entity.getFilingStatusName());
|
||||
co.setApplyTypeCode(entity.getApplyTypeCode());
|
||||
co.setApplyTypeName(entity.getApplyTypeName());
|
||||
co.setAlertStatus(entity.getAlertStatus());
|
||||
co.setTenantId(entity.getTenantId());
|
||||
return co;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,6 +93,9 @@ public class QualFilingCO {
|
|||
@ApiModelProperty(value = "申请类型名称")
|
||||
private String applyTypeName;
|
||||
|
||||
@ApiModelProperty(value = "预警状态 normal:正常，person_rate:人员比例预警")
|
||||
private String alertStatus;
|
||||
|
||||
@ApiModelProperty(value = "变更次数（查询聚合，非表字段）")
|
||||
private Integer changeCount;
|
||||
|
||||
|
|
|
|||
|
|
@ -93,6 +93,9 @@ public class QualFilingChangeCO {
|
|||
@ApiModelProperty(value = "备案状态名称")
|
||||
private String filingStatusName;
|
||||
|
||||
@ApiModelProperty(value = "预警状态 normal:正常，person_rate:人员比例预警")
|
||||
private String alertStatus;
|
||||
|
||||
@ApiModelProperty(value = "租户ID")
|
||||
private Long tenantId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
package org.qinan.safetyeval.domain.constant;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
/**
|
||||
* 预警状态
|
||||
*/
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
public enum AlertStatusEnum {
|
||||
|
||||
NORMAL("normal", "正常"),
|
||||
PERSON_RATE("person_rate", "人员比例预警"),
|
||||
;
|
||||
|
||||
@JsonValue
|
||||
@EnumValue
|
||||
private final String value;
|
||||
private final String label;
|
||||
}
|
||||
|
|
@ -102,6 +102,9 @@ public class QualFilingChangeEntity {
|
|||
/** 备案状态名称 */
|
||||
private String filingStatusName;
|
||||
|
||||
/** 预警状态 normal:正常，person_rate:人员比例预警 */
|
||||
private String alertStatus;
|
||||
|
||||
/** 租户ID */
|
||||
private Long tenantId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,6 +109,9 @@ public class QualFilingEntity {
|
|||
/** 申请类型名称 */
|
||||
private String applyTypeName;
|
||||
|
||||
/** 预警状态 normal:正常，person_rate:人员比例预警 */
|
||||
private String alertStatus;
|
||||
|
||||
/** 租户ID */
|
||||
private Long tenantId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ public class QualFilingChangeDO {
|
|||
private String attachmentUrl;
|
||||
private Integer filingStatusCode;
|
||||
private String filingStatusName;
|
||||
private String alertStatus;
|
||||
|
||||
// ---- GBS默认字段 ----
|
||||
private String deleteEnum;
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ public class QualFilingDO extends BaseDO {
|
|||
private String filingStatusName;
|
||||
private Integer applyTypeCode;
|
||||
private String applyTypeName;
|
||||
private String alertStatus;
|
||||
|
||||
// ---- GBS默认字段 ----
|
||||
private String deleteEnum;
|
||||
|
|
|
|||
|
|
@ -304,6 +304,7 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway {
|
|||
entity.setAttachmentUrl(dataObject.getAttachmentUrl());
|
||||
entity.setFilingStatusCode(dataObject.getFilingStatusCode());
|
||||
entity.setFilingStatusName(dataObject.getFilingStatusName());
|
||||
entity.setAlertStatus(dataObject.getAlertStatus());
|
||||
entity.setTenantId(dataObject.getTenantId());
|
||||
return entity;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -355,6 +355,7 @@ public class QualFilingGatewayImpl implements QualFilingGateway {
|
|||
dataObject.setFilingStatusName(entity.getFilingStatusName());
|
||||
dataObject.setApplyTypeCode(entity.getApplyTypeCode());
|
||||
dataObject.setApplyTypeName(entity.getApplyTypeName());
|
||||
dataObject.setAlertStatus(entity.getAlertStatus());
|
||||
dataObject.setTenantId(entity.getTenantId());
|
||||
return dataObject;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue