결재 추가 수정정
This commit is contained in:
@@ -2696,8 +2696,6 @@ public class ApprovalService {
|
||||
String actionContent = CommonUtils.checkNull(ecrInfo.get("ACTION_CONTENT"));
|
||||
String completeDate = CommonUtils.checkNull(ecrInfo.get("COMPLETE_DATE"));
|
||||
String changeTypeName = CommonUtils.checkNull(ecrInfo.get("CHANGE_TYPE_NAME"));
|
||||
String ecrDocSummary = CommonUtils.checkNull(ecrInfo.get("ECR_DOC_SUMMARY"));
|
||||
String ecrDocReason = CommonUtils.checkNull(ecrInfo.get("ECR_DOC_REASON"));
|
||||
|
||||
html.append("<div style='font-family:맑은 고딕,Malgun Gothic,sans-serif; padding:10px;'>");
|
||||
html.append("<h2 style='text-align:center; margin-bottom:15px;'>ECR (Engineering Change Request)</h2>");
|
||||
@@ -2751,20 +2749,6 @@ public class ApprovalService {
|
||||
}
|
||||
html.append("</table>");
|
||||
|
||||
if(!ecrDocSummary.isEmpty() || !ecrDocReason.isEmpty()){
|
||||
html.append("<h3 style='margin:15px 0 8px;'>설계변경요청서</h3>");
|
||||
html.append("<table style='width:100%; border-collapse:collapse; border:1px solid #333;'>");
|
||||
if(!ecrDocSummary.isEmpty()){
|
||||
html.append("<tr><td style='border:1px solid #333; padding:6px; background:#f0f0f0; font-weight:bold; width:15%;'>요약</td>");
|
||||
html.append("<td style='border:1px solid #333; padding:8px; white-space:pre-wrap;'>").append(ecrDocSummary).append("</td></tr>");
|
||||
}
|
||||
if(!ecrDocReason.isEmpty()){
|
||||
html.append("<tr><td style='border:1px solid #333; padding:6px; background:#f0f0f0; font-weight:bold;'>변경사유</td>");
|
||||
html.append("<td style='border:1px solid #333; padding:8px; white-space:pre-wrap;'>").append(ecrDocReason).append("</td></tr>");
|
||||
}
|
||||
html.append("</table>");
|
||||
}
|
||||
|
||||
html.append("</div>");
|
||||
return html.toString();
|
||||
}
|
||||
@@ -2791,9 +2775,6 @@ public class ApprovalService {
|
||||
String ecrRevNo = CommonUtils.checkNull(ecrInfo.get("ECR_REV_NO"));
|
||||
String ecrRevDate = CommonUtils.checkNull(ecrInfo.get("ECR_REV_DATE"));
|
||||
String ecrDocAuthor = CommonUtils.checkNull(ecrInfo.get("ECR_DOC_AUTHOR"));
|
||||
String ecrDocSummary = CommonUtils.checkNull(ecrInfo.get("ECR_DOC_SUMMARY"));
|
||||
String ecrDocReason = CommonUtils.checkNull(ecrInfo.get("ECR_DOC_REASON"));
|
||||
|
||||
html.append("<!DOCTYPE html><html><head><meta charset='UTF-8'>");
|
||||
html.append("<title>ECR - ").append(ecrNo).append("</title>");
|
||||
html.append("<style>");
|
||||
@@ -2811,8 +2792,6 @@ public class ApprovalService {
|
||||
html.append("table.info{width:100%;border-collapse:collapse;margin-bottom:15px;}");
|
||||
html.append("table.info td,table.info th{border:1px solid #333;padding:8px;}");
|
||||
html.append(".lbl{background:#f0f0f0;font-weight:bold;width:15%;}");
|
||||
html.append(".section_title{font-weight:bold;font-size:13px;text-decoration:underline;margin:15px 0 5px;}");
|
||||
html.append(".content_box{border:1px solid #ccc;padding:10px;min-height:100px;white-space:pre-wrap;font-size:13px;}");
|
||||
html.append(".ecr_footer{padding:10px 15px;font-size:11px;border-top:1px solid #ccc;}");
|
||||
html.append("</style></head><body>");
|
||||
|
||||
@@ -2846,15 +2825,6 @@ public class ApprovalService {
|
||||
}
|
||||
html.append("</table>");
|
||||
|
||||
if(!ecrDocSummary.isEmpty()){
|
||||
html.append("<div class='section_title'>요약 (Summary)</div>");
|
||||
html.append("<div class='content_box'>").append(ecrDocSummary).append("</div>");
|
||||
}
|
||||
if(!ecrDocReason.isEmpty()){
|
||||
html.append("<div class='section_title'>변경사항 설명 (이유 / 배경)</div>");
|
||||
html.append("<div class='content_box'>").append(ecrDocReason).append("</div>");
|
||||
}
|
||||
|
||||
html.append("</div>");
|
||||
|
||||
html.append("<div class='ecr_footer'>");
|
||||
|
||||
Reference in New Issue
Block a user