From db5d94bf552c7e86fa21505c25f8002d8d9b4852 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Mon, 19 Aug 2024 09:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=BB=93=E6=9E=9C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/checkresult/checkresultprint.html  | 95 ++++++++-----------
 1 file changed, 37 insertions(+), 58 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html
index bdcf57f..c86bedb 100644
--- a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html
+++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html
@@ -10,15 +10,15 @@
     <meta http-equiv=Content-Type content="text/html; charset=utf-8">
     <meta name=ProgId content=Excel.Sheet>
     <meta name=Generator content="Aspose.Cell ">
-    <link rel=File-List href="asfrt-egho3_files/filelist.xml">
-    <link rel=Edit-Time-Data href="asfrt-egho3_files/editdata.mso">
-    <link rel=OLE-Object-Data href="asfrt-egho3_files/oledata.mso">
+    <link rel=File-List href="az03r-1p12c_files/filelist.xml">
+    <link rel=Edit-Time-Data href="az03r-1p12c_files/editdata.mso">
+    <link rel=OLE-Object-Data href="az03r-1p12c_files/oledata.mso">
     <!--[if gte mso 9]><xml>
     <o:DocumentProperties>
         <o:Author>波强 赵</o:Author>
         <o:LastPrinted>2024-08-16T01:08:00Z</o:LastPrinted>
         <o:Created>2024-08-16T01:05:00Z</o:Created>
-        <o:LastSaved>2024-08-16T01:18:00Z</o:LastSaved>
+        <o:LastSaved>2024-08-18T18:16:08Z</o:LastSaved>
     </o:DocumentProperties>
 </xml><![endif]-->
     <style>
@@ -1437,50 +1437,6 @@
             mso-protection:locked visible;
         }
         .x75
-        {
-            mso-style-parent:style0;
-            mso-number-format:General;
-            text-align:center;
-            vertical-align:middle;
-            white-space:nowrap;
-            background:auto;
-            mso-pattern:auto;
-            color:#000000;
-            font-size:12pt;
-            font-weight:700;
-            font-style:normal;
-            font-family:"等线","sans-serif";
-            border-top:1px solid windowtext;
-            border-right:1px solid windowtext;
-            border-bottom:1px solid windowtext;
-            border-left:1px solid windowtext;
-            mso-diagonal-down:none;
-            mso-diagonal-up:none;
-            mso-protection:locked visible;
-        }
-        .x76
-        {
-            mso-style-parent:style0;
-            mso-number-format:General;
-            text-align:center;
-            vertical-align:middle;
-            white-space:nowrap;
-            background:auto;
-            mso-pattern:auto;
-            color:#000000;
-            font-size:12pt;
-            font-weight:700;
-            font-style:normal;
-            font-family:"等线","sans-serif";
-            border-top:1px solid windowtext;
-            border-right:1px solid windowtext;
-            border-bottom:1px solid windowtext;
-            border-left:1px solid windowtext;
-            mso-diagonal-down:none;
-            mso-diagonal-up:none;
-            mso-protection:locked visible;
-        }
-        .x77
         {
             mso-style-parent:style0;
             mso-number-format:General;
@@ -1549,21 +1505,33 @@
     </tr>
     <tr height=37 style='mso-height-source:userset;height:28pt' id='r1'>
         <td colspan=2 height=36 class=x71 style='height:27.25pt;'>检查单位：[[${tdCheckReportDTO.depart}]]</td>
-        <td colspan=2 class=x72><span style='float:right' id="entryDate">[[${tdCheckReportDTO.checkEndTime}]]</span></td>
+        <td colspan=2 class=x72><span style='float:right' id="entryDate">检查开始日期：[[${tdCheckReportDTO.checkEndTime}]]</span></td>
     </tr>
     <tr height=37 style='mso-height-source:userset;height:28pt' id='r2'>
-        <td height=35 class=x74 style='height:26.5pt;'>检查项</td>
-        <td class=x75>检查内容</td>
-        <td class=x76>检查结果</td>
-        <td class=x76>备注</td>
+        <td height=35 class=x74 style='height:26.5pt;'>所属地市</td>
+        <td class='x75 framework'>[[${tdCheckReportDTO.framework}]]</td>
+        <td class=x74>所属区县</td>
+        <td class='x75 area'>[[${tdCheckReportDTO.area}]]</td>
     </tr>
-    <tr height=37 style='mso-height-source:userset;height:28pt' id='r3' th:each="checkResult : ${tdCheckReportDTO.checkTypeDTOS}">
-        <td height=35 class='x77 checkType overHidden' style='height:26.5pt;'>[[${checkResult.checkType}]]</td>
-        <td class='x77 overHidden'>[[${checkResult.typeContent}]]</td>
-        <td class='x77 resultStarts'>[[${checkResult.resultStarts}]]</td>
-        <td class='x77 overHidden'>[[${checkResult.remark}]]</td>
+    <tr height=37 style='mso-height-source:userset;height:28pt' id='r3'>
+        <td height=35 class=x74 style='height:26.5pt;'>检查类型</td>
+        <td style="font-weight: normal" class='x74 checkTypeO'>[[${tdCheckReportDTO.checkType}]]</td>
+        <td class=x74>报告人员</td>
+        <td style="font-weight: normal" class=x74>[[${tdCheckReportDTO.adduser}]]</td>
     </tr>
     <tr height=37 style='mso-height-source:userset;height:28pt' id='r4'>
+        <td height=35 class=x74 style='height:26.5pt;'>检查项</td>
+        <td class=x74>检查内容</td>
+        <td class=x74>检查结果</td>
+        <td class=x74>备注</td>
+    </tr>
+    <tr height=37 style='mso-height-source:userset;height:28pt' id='r5' th:each="checkResult : ${tdCheckReportDTO.checkTypeDTOS}">
+        <td height=35 class='x74 checkType overHidden' style='height:26.5pt;font-weight: normal'>[[${checkResult.checkType}]]</td>
+        <td style="font-weight: normal" class='x74 overHidden'>[[${checkResult.typeContent}]]</td>
+        <td style="font-weight: normal" class='x74 resultStarts'>[[${checkResult.resultStarts}]]</td>
+        <td style="font-weight: normal" class='x74 overHidden'>[[${checkResult.remark}]]</td>
+    </tr>
+    <tr height=37 style='mso-height-source:userset;height:28pt' id='r6'>
         <td colspan=4 height=36 class=x71 style='height:27.25pt;'>检查人员：[[${tdCheckReportDTO.checkName}]]</td>
     </tr>
     <tr>
@@ -1578,6 +1546,15 @@
     function printPage() {
         window.print();
     }
+    $.ajax({
+        url: ctx + "system/area/getAllList",
+        type: 'GET',
+        data:{parentId:''} ,
+        success:((res)=>{
+            document.querySelector('.framework').innerHTML = getCity(res.data,[[${tdCheckReportDTO.framework}]])
+            document.querySelector('.area').innerHTML = getCity(res.data,[[${tdCheckReportDTO.area}]])
+        }) ,
+    });
     function updateStatus(className, dictData) {
         var datas = dictData;
         var elementsToFind = [];
@@ -1605,6 +1582,8 @@
     updateStatus('checkType', checkTypeDatas);
     var resultStartsDatas = [[${@dict.getType('sys_check_state')}]];
     updateStatus('resultStarts', resultStartsDatas);
+    var checkTypeODatas = [[${@dict.getType('sys_check_type')}]];
+    updateStatus('checkTypeO', checkTypeODatas);
     function formatISO8601ToDateTime(isoString) {
         var date = new Date(isoString);
         var year = date.getFullYear();