报告签发单下载模板修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/ProjectListService.java

@@ -981,30 +981,24 @@ public class ProjectListService {
             }else{
                 data.put("sealType","");
             }
-            //评估报告
-            if(StringUtils.isNotBlank(issuedById.getAssessmentReport())){
-                data.put("assessmentReport",issuedById.getAssessmentReport());
-            }else{
-                data.put("assessmentReport","");
-            }
-            //评估说明
-            if(StringUtils.isNotBlank(issuedById.getAssessmentExplain())){
-                data.put("assessmentExplain",issuedById.getAssessmentExplain());
-            }else{
-                data.put("assessmentExplain","");
-            }
-            //评估明细表
-            if(StringUtils.isNotBlank(issuedById.getAssessmentDetail())){
-                data.put("assessmentDetail",issuedById.getAssessmentDetail());
-            }else{
-                data.put("assessmentDetail","");
-            }
-            //咨询报告
-            if(StringUtils.isNotBlank(issuedById.getConsultingReport())){
-                data.put("consultingReport",issuedById.getConsultingReport());
-            }else{
-                data.put("consultingReport","");
-            }
+            String reportCopiesDetail = "";
+                // 咨询报告 份
+                if(StringUtils.isNotBlank(issuedById.getConsultingReport())){
+                    reportCopiesDetail = reportCopiesDetail + "咨询报告" + issuedById.getConsultingReport() + "份; ";
+                }
+                // 评估报告 份
+                if(StringUtils.isNotBlank(issuedById.getAssessmentReport())){
+                    reportCopiesDetail = reportCopiesDetail + "评估报告" + issuedById.getAssessmentReport() + "份; ";
+                }
+                // 评估说明 份
+                if(StringUtils.isNotBlank(issuedById.getAssessmentExplain())){
+                    reportCopiesDetail = reportCopiesDetail + "评估说明" + issuedById.getAssessmentExplain() + "份; ";
+                }
+                // 评估明细表 份
+                if(StringUtils.isNotBlank(issuedById.getAssessmentDetail())){
+                    reportCopiesDetail = reportCopiesDetail + "评估明细表" + issuedById.getAssessmentDetail() + "份; ";
+                }
+            data.put("reportCopiesDetail",reportCopiesDetail);
         }else{
             data.put("standingBook","");
             data.put("electronicsArchive","");

jeeplus-web/src/main/resources/freemarker/reportAusstellung.ftl

@@ -2148,48 +2148,7 @@
 											<w:sz w:val="20"/>
 											<w:szCs w:val="20"/>
 										</w:rPr>
-										<w:t>出具报告份数：评估报告 ${assessmentReport}  评估说明 ${assessmentExplain} 份  评估明细表 ${assessmentDetail}份</w:t>
-									</w:r>
-								</w:p>
-							</w:tc>
-						</w:tr>
-						<w:tr w:rsidR="000F1DF1" w14:paraId="18B9979D" w14:textId="77777777">
-							<w:trPr>
-								<w:trHeight w:val="23"/>
-							</w:trPr>
-							<w:tc>
-								<w:tcPr>
-									<w:tcW w:w="8790" w:type="dxa"/>
-									<w:gridSpan w:val="6"/>
-									<w:tcBorders>
-										<w:top w:val="single" w:sz="4" w:space="0" w:color="auto"/>
-										<w:left w:val="single" w:sz="4" w:space="0" w:color="auto"/>
-										<w:bottom w:val="single" w:sz="4" w:space="0" w:color="auto"/>
-										<w:right w:val="single" w:sz="4" w:space="0" w:color="auto"/>
-									</w:tcBorders>
-									<w:vAlign w:val="center"/>
-								</w:tcPr>
-								<w:p w14:paraId="4BC326F0" w14:textId="77777777" w:rsidR="000F1DF1" w:rsidRDefault="00000000">
-									<w:pPr>
-										<w:widowControl/>
-										<w:jc w:val="left"/>
-										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:eastAsia="宋体" w:hAnsi="宋体" w:cs="宋体"/>
-											<w:color w:val="000000"/>
-											<w:kern w:val="0"/>
-											<w:sz w:val="20"/>
-											<w:szCs w:val="20"/>
-										</w:rPr>
-									</w:pPr>
-									<w:r>
-										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:eastAsia="宋体" w:hAnsi="宋体" w:cs="宋体" w:hint="eastAsia"/>
-											<w:color w:val="000000"/>
-											<w:kern w:val="0"/>
-											<w:sz w:val="20"/>
-											<w:szCs w:val="20"/>
-										</w:rPr>
-										<w:t xml:space="preserve">　　　　　　　咨询报告  ${consultingReport} 份  </w:t>
+										<w:t>出具报告份数：${reportCopiesDetail}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>