Skip to content

Z
zhichan
Commit dc428cc6 by 兰国旗
Options

laolanyouhua

parent 6a1147e8
Showing with 36 additions and 17 deletions
center-order/app/base/service/impl/qcutils/baseqcSve.js
...@@ -549,13 +549,13 @@ class BaseQcService { ...@@ -549,13 +549,13 @@ class BaseQcService {
ab["OfficialFileURL"] = ab.officialFileURL; ab["OfficialFileURL"] = ab.officialFileURL;
} }
//2021-3-18 addNew //2021-3-18 addNew
if (ab.officialFileURL) { if (ab.certificateNumber) {
ab["CertificateNumber"] = ab.certificateNumber; ab["CertificateNumber"] = ab.certificateNumber;
} }
if (ab.officialFileURL) { if (ab.certificateStartTime) {
ab["CertificateStartTime"] = ab.certificateStartTime; ab["CertificateStartTime"] = ab.certificateStartTime;
} }
if (ab.officialFileURL) { if (ab.certificateEndTime) {
ab["CertificateEndTime"] = ab.certificateEndTime; ab["CertificateEndTime"] = ab.certificateEndTime;
} }
...@@ -697,10 +697,20 @@ class BaseQcService { ...@@ -697,10 +697,20 @@ class BaseQcService {
if (solutionContent.status != "GXB_ACCEPT") { if (solutionContent.status != "GXB_ACCEPT") {
return system.getResultFail(-511, "交付流程错误，⼯信部已受理后才能执行此操作"); return system.getResultFail(-511, "交付流程错误，⼯信部已受理后才能执行此操作");
} }
solutionFlowList.push({ if(uappId == "18"){
file: ab.OfficialFileURL || "", solutionFlowList.push({
status: "GXB_SUCCESS", statusName: this.icpSolutionStatusReference.GXB_SUCCESS, updated_at: new Date() file: ab.OfficialFileURL || "", status: "GXB_SUCCESS",
}); statusName: this.icpSolutionStatusReference.GXB_SUCCESS, updated_at: new Date(),
CertificateNumber:ab.CertificateNumber,
CertificateStartTime:ab.CertificateStartTime,
CertificateEndTime:ab.CertificateEndTime
});
}else{
solutionFlowList.push({
file: ab.OfficialFileURL || "",
status: "GXB_SUCCESS", statusName: this.icpSolutionStatusReference.GXB_SUCCESS, updated_at: new Date()
});
}
needsolutioninfo.status = "ywc"; needsolutioninfo.status = "ywc";
solutionContent.status = "GXB_SUCCESS"; solutionContent.status = "GXB_SUCCESS";
solutionContent.statusName = this.icpSolutionStatusReference.GXB_SUCCESS; solutionContent.statusName = this.icpSolutionStatusReference.GXB_SUCCESS;
...@@ -719,16 +729,25 @@ class BaseQcService { ...@@ -719,16 +729,25 @@ class BaseQcService {
} }
solutionContent.solutionFlowList = solutionFlowList; solutionContent.solutionFlowList = solutionFlowList;
var applicationStatusList = solutionContent.applicationStatusList || []; var applicationStatusList = solutionContent.applicationStatusList || [];
var statusObj = { if(uappId == "18"){
"OfficialFileURL": ab.OfficialFileURL || "", var statusObj = {
"ApplicationStatus": ab.ApplicationStatus, "OfficialFileURL": ab.OfficialFileURL || "",
"ApplicationStatusName": this.icpApplicationStatusReference[ab.ApplicationStatus], "ApplicationStatus": ab.ApplicationStatus,
"created_at": new Date(), "ApplicationStatusName": this.icpApplicationStatusReference[ab.ApplicationStatus],
//2021-3-18 addNew "created_at": new Date(),
"CertificateNumber":ab.CertificateNumber || "",//证书编号 //2021-3-18 addNew
"CertificateStartTime":ab.CertificateStartTime || "",//证书有效期 开始时间 "CertificateNumber":ab.CertificateNumber || "",//证书编号
"CertificateEndTime":ab.CertificateEndTime || ""//证书有效期 结束时间 "CertificateStartTime":ab.CertificateStartTime || "",//证书有效期 开始时间
}; "CertificateEndTime":ab.CertificateEndTime || ""//证书有效期 结束时间
};
}else{
var statusObj = {
"OfficialFileURL": ab.OfficialFileURL || "",
"ApplicationStatus": ab.ApplicationStatus,
"ApplicationStatusName": this.icpApplicationStatusReference[ab.ApplicationStatus],
"created_at": new Date()
};
}
applicationStatusList.push(statusObj); applicationStatusList.push(statusObj);
solutionContent.applicationStatusList = applicationStatusList; solutionContent.applicationStatusList = applicationStatusList;
solutionContent.applicationStatus = ab.ApplicationStatus; solutionContent.applicationStatus = ab.ApplicationStatus;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment