Compare commits
No commits in common. "0758f78178bcbbaac0cd811141e24144cc48f530" and "bc9709ef61e9d857a3b905b8e6dfae85f296356c" have entirely different histories.
0758f78178
...
bc9709ef61
|
|
@ -14,8 +14,7 @@ SET NAMES utf8mb4;
|
||||||
ALTER TABLE `qual_filing`
|
ALTER TABLE `qual_filing`
|
||||||
ADD COLUMN `origin_filing_id` bigint DEFAULT NULL COMMENT '变更草稿关联的原备案id' AFTER `attachment_url`,
|
ADD COLUMN `origin_filing_id` bigint DEFAULT NULL COMMENT '变更草稿关联的原备案id' AFTER `attachment_url`,
|
||||||
ADD COLUMN `reject_reason` varchar(500) DEFAULT NULL COMMENT '打回原因' AFTER `origin_filing_id`,
|
ADD COLUMN `reject_reason` varchar(500) DEFAULT NULL COMMENT '打回原因' AFTER `origin_filing_id`,
|
||||||
ADD COLUMN `filing_review_id` bigint DEFAULT NULL COMMENT '审核id' AFTER `reject_reason`,
|
ADD COLUMN `submit_time` datetime DEFAULT NULL COMMENT '最近提交时间' AFTER `reject_reason`,
|
||||||
ADD COLUMN `submit_time` datetime DEFAULT NULL COMMENT '最近提交时间' AFTER `filing_review_id`,
|
|
||||||
ADD COLUMN `approve_time` datetime DEFAULT NULL COMMENT '最近审核通过时间' AFTER `submit_time`;
|
ADD COLUMN `approve_time` datetime DEFAULT NULL COMMENT '最近审核通过时间' AFTER `submit_time`;
|
||||||
|
|
||||||
ALTER TABLE `qual_filing`
|
ALTER TABLE `qual_filing`
|
||||||
|
|
|
||||||
|
|
@ -164,11 +164,6 @@ public class QualFilingExecutor implements QualFilingApi {
|
||||||
co.setWorkplaceArea(entity.getWorkplaceArea());
|
co.setWorkplaceArea(entity.getWorkplaceArea());
|
||||||
co.setUnitIntro(entity.getUnitIntro());
|
co.setUnitIntro(entity.getUnitIntro());
|
||||||
co.setAttachmentUrl(entity.getAttachmentUrl());
|
co.setAttachmentUrl(entity.getAttachmentUrl());
|
||||||
co.setOriginFilingId(entity.getOriginFilingId());
|
|
||||||
co.setRejectReason(entity.getRejectReason());
|
|
||||||
co.setFilingReviewId(entity.getFilingReviewId());
|
|
||||||
co.setSubmitTime(entity.getSubmitTime());
|
|
||||||
co.setApproveTime(entity.getApproveTime());
|
|
||||||
co.setFilingStatusCode(entity.getFilingStatusCode());
|
co.setFilingStatusCode(entity.getFilingStatusCode());
|
||||||
co.setFilingStatusName(entity.getFilingStatusName());
|
co.setFilingStatusName(entity.getFilingStatusName());
|
||||||
co.setApplyTypeCode(entity.getApplyTypeCode());
|
co.setApplyTypeCode(entity.getApplyTypeCode());
|
||||||
|
|
|
||||||
|
|
@ -503,7 +503,6 @@ public class QualFilingOrchestrator {
|
||||||
origin.setWorkplaceArea(draft.getWorkplaceArea());
|
origin.setWorkplaceArea(draft.getWorkplaceArea());
|
||||||
origin.setUnitIntro(draft.getUnitIntro());
|
origin.setUnitIntro(draft.getUnitIntro());
|
||||||
origin.setAttachmentUrl(draft.getAttachmentUrl());
|
origin.setAttachmentUrl(draft.getAttachmentUrl());
|
||||||
origin.setFilingReviewId(draft.getFilingReviewId());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private QualFilingChangeEntity copyToChangeHeader(QualFilingEntity origin, QualFilingEntity draft) {
|
private QualFilingChangeEntity copyToChangeHeader(QualFilingEntity origin, QualFilingEntity draft) {
|
||||||
|
|
@ -599,9 +598,6 @@ public class QualFilingOrchestrator {
|
||||||
if (cmd.getAttachmentUrl() != null) {
|
if (cmd.getAttachmentUrl() != null) {
|
||||||
entity.setAttachmentUrl(cmd.getAttachmentUrl());
|
entity.setAttachmentUrl(cmd.getAttachmentUrl());
|
||||||
}
|
}
|
||||||
if (cmd.getFilingReviewId() != null) {
|
|
||||||
entity.setFilingReviewId(cmd.getFilingReviewId());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private QualFilingChangeHistoryItemCO toHistoryItem(QualFilingChangeDetailEntity entity) {
|
private QualFilingChangeHistoryItemCO toHistoryItem(QualFilingChangeDetailEntity entity) {
|
||||||
|
|
@ -648,7 +644,6 @@ public class QualFilingOrchestrator {
|
||||||
co.setAttachmentUrl(entity.getAttachmentUrl());
|
co.setAttachmentUrl(entity.getAttachmentUrl());
|
||||||
co.setOriginFilingId(entity.getOriginFilingId());
|
co.setOriginFilingId(entity.getOriginFilingId());
|
||||||
co.setRejectReason(entity.getRejectReason());
|
co.setRejectReason(entity.getRejectReason());
|
||||||
co.setFilingReviewId(entity.getFilingReviewId());
|
|
||||||
co.setSubmitTime(entity.getSubmitTime());
|
co.setSubmitTime(entity.getSubmitTime());
|
||||||
co.setApproveTime(entity.getApproveTime());
|
co.setApproveTime(entity.getApproveTime());
|
||||||
co.setFilingStatusCode(entity.getFilingStatusCode());
|
co.setFilingStatusCode(entity.getFilingStatusCode());
|
||||||
|
|
|
||||||
|
|
@ -100,9 +100,6 @@ public class QualFilingCO {
|
||||||
@ApiModelProperty(value = "打回原因")
|
@ApiModelProperty(value = "打回原因")
|
||||||
private String rejectReason;
|
private String rejectReason;
|
||||||
|
|
||||||
@ApiModelProperty(value = "审核id")
|
|
||||||
private Long filingReviewId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "提交时间")
|
@ApiModelProperty(value = "提交时间")
|
||||||
private java.time.LocalDateTime submitTime;
|
private java.time.LocalDateTime submitTime;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -74,9 +74,6 @@ public class QualFilingAddCmd {
|
||||||
/** attachmentUrl */
|
/** attachmentUrl */
|
||||||
private String attachmentUrl;
|
private String attachmentUrl;
|
||||||
|
|
||||||
/** 审核id */
|
|
||||||
private Long filingReviewId;
|
|
||||||
|
|
||||||
/** filingStatusCode */
|
/** filingStatusCode */
|
||||||
private Integer filingStatusCode;
|
private Integer filingStatusCode;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,9 +77,6 @@ public class QualFilingModifyCmd {
|
||||||
/** attachmentUrl */
|
/** attachmentUrl */
|
||||||
private String attachmentUrl;
|
private String attachmentUrl;
|
||||||
|
|
||||||
/** 审核id */
|
|
||||||
private Long filingReviewId;
|
|
||||||
|
|
||||||
/** filingStatusCode */
|
/** filingStatusCode */
|
||||||
private Integer filingStatusCode;
|
private Integer filingStatusCode;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
package org.qinan.safetyeval.domain.constant;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 审核结果枚举
|
|
||||||
*
|
|
||||||
* @author safety-eval
|
|
||||||
*/
|
|
||||||
public enum QualFilingReviewResultEnum {
|
|
||||||
|
|
||||||
PASS(1, "通过"),
|
|
||||||
PENDING(2, "待定"),
|
|
||||||
REJECT(3, "不通过");
|
|
||||||
|
|
||||||
private final int code;
|
|
||||||
private final String name;
|
|
||||||
|
|
||||||
QualFilingReviewResultEnum(int code, String name) {
|
|
||||||
this.code = code;
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getCode() {
|
|
||||||
return code;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static QualFilingReviewResultEnum ofCode(Integer code) {
|
|
||||||
if (code == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
for (QualFilingReviewResultEnum item : values()) {
|
|
||||||
if (item.code == code) {
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -87,9 +87,6 @@ public class QualFilingEntity {
|
||||||
/** 打回原因 */
|
/** 打回原因 */
|
||||||
private String rejectReason;
|
private String rejectReason;
|
||||||
|
|
||||||
/** 审核id */
|
|
||||||
private Long filingReviewId;
|
|
||||||
|
|
||||||
/** 最近提交时间 */
|
/** 最近提交时间 */
|
||||||
private java.time.LocalDateTime submitTime;
|
private java.time.LocalDateTime submitTime;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,6 @@ public class QualFilingDO {
|
||||||
private String attachmentUrl;
|
private String attachmentUrl;
|
||||||
private Long originFilingId;
|
private Long originFilingId;
|
||||||
private String rejectReason;
|
private String rejectReason;
|
||||||
private Long filingReviewId;
|
|
||||||
private java.time.LocalDateTime submitTime;
|
private java.time.LocalDateTime submitTime;
|
||||||
private java.time.LocalDateTime approveTime;
|
private java.time.LocalDateTime approveTime;
|
||||||
private Integer filingStatusCode;
|
private Integer filingStatusCode;
|
||||||
|
|
|
||||||
|
|
@ -180,7 +180,6 @@ public class QualFilingGatewayImpl implements QualFilingGateway {
|
||||||
dataObject.setAttachmentUrl(entity.getAttachmentUrl());
|
dataObject.setAttachmentUrl(entity.getAttachmentUrl());
|
||||||
dataObject.setOriginFilingId(entity.getOriginFilingId());
|
dataObject.setOriginFilingId(entity.getOriginFilingId());
|
||||||
dataObject.setRejectReason(entity.getRejectReason());
|
dataObject.setRejectReason(entity.getRejectReason());
|
||||||
dataObject.setFilingReviewId(entity.getFilingReviewId());
|
|
||||||
dataObject.setSubmitTime(entity.getSubmitTime());
|
dataObject.setSubmitTime(entity.getSubmitTime());
|
||||||
dataObject.setApproveTime(entity.getApproveTime());
|
dataObject.setApproveTime(entity.getApproveTime());
|
||||||
dataObject.setFilingStatusCode(entity.getFilingStatusCode());
|
dataObject.setFilingStatusCode(entity.getFilingStatusCode());
|
||||||
|
|
@ -221,7 +220,6 @@ public class QualFilingGatewayImpl implements QualFilingGateway {
|
||||||
entity.setAttachmentUrl(dataObject.getAttachmentUrl());
|
entity.setAttachmentUrl(dataObject.getAttachmentUrl());
|
||||||
entity.setOriginFilingId(dataObject.getOriginFilingId());
|
entity.setOriginFilingId(dataObject.getOriginFilingId());
|
||||||
entity.setRejectReason(dataObject.getRejectReason());
|
entity.setRejectReason(dataObject.getRejectReason());
|
||||||
entity.setFilingReviewId(dataObject.getFilingReviewId());
|
|
||||||
entity.setSubmitTime(dataObject.getSubmitTime());
|
entity.setSubmitTime(dataObject.getSubmitTime());
|
||||||
entity.setApproveTime(dataObject.getApproveTime());
|
entity.setApproveTime(dataObject.getApproveTime());
|
||||||
entity.setFilingStatusCode(dataObject.getFilingStatusCode());
|
entity.setFilingStatusCode(dataObject.getFilingStatusCode());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue