fix(jyjc): 报检规则4.0开发

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -185,10 +185,11 @@
         where
             a.sequence_nbr = ae.application_seq
             and  a.status='6611'
-            and ae.equip_unicode in
-            <foreach collection="equips" item="equip" separator="," open="(" close=")">
-                #{equip.sequenceNbr}
-            </foreach>
+            and ae.equip_unicode = ANY(ARRAY[
+                <foreach collection="equips" item="equip" separator=",">
+                    #{equip.sequenceNbr}
+                </foreach>
+            ])
     </select>
 
     <update id="updatePromoter">
@@ -616,7 +617,7 @@
             ui."USE_UNIT_NAME" useUnitName,
             ui."USE_UNIT_CREDIT_CODE" useUnitCreditCode,
             ui."PROJECT_CONTRAPTION_ID" as projectContraptionId,
-            to_char(ui."USE_DATE", 'YYYY-MM') useDate,
+            ui."USE_DATE" as useDate,
             (SELECT DESIGN_UNIT_NAME from idx_biz_jg_design_info where "RECORD" = ui."RECORD") designUnitName,
             (SELECT USC_UNIT_NAME from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE DESC limit 1) uscUnitName,
             to_char((SELECT USC_DATE from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE DESC limit 1), 'YYYY-MM') uscDate,
@@ -713,19 +714,21 @@
     <select id="selectPieLineListOfInspect" resultType="java.util.Map">
         <include refid="page-list-pipeline"/>
         WHERE
-        ui.record in
-        <foreach collection="records" item="record" open="(" close=")" separator=",">
-            #{record}
-        </foreach>
+        ui.record = ANY(ARRAY[
+            <foreach collection="records" item="record" separator=",">
+                #{record}
+            </foreach>
+        ])
         ORDER BY ui.REC_DATE DESC
     </select>
     <select id="selectPieLineListOfNoInspectInfo" resultType="java.util.Map">
         <include refid="page-list-pipeline-no-inspect"/>
         WHERE
-        ui.record in
-        <foreach collection="records" item="record" open="(" close=")" separator=",">
-            #{record}
-        </foreach>
+        ui.record= ANY(ARRAY[
+            <foreach collection="records" item="record" separator=",">
+                #{record}
+            </foreach>
+        ])
         ORDER BY ui.REC_DATE DESC
     </select>
     <select id="selectEquipList" resultType="com.alibaba.fastjson.JSONObject">

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/templates/inspect-app-pipeline.ftl

@@ -3363,6 +3363,15 @@
                                     <w:sz-cs w:val="15"/>
                                 </w:rPr>
                             </w:pPr>
+                            <w:r>
+                                <w:rPr>
+                                    <w:rFonts w:hint="fareast"/>
+                                    <w:sz w:val="15"/>
+                                    <w:sz-cs w:val="15"/>
+                                    <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
+                                </w:rPr>
+                                <w:t>${item.useDate?has_content?then(item.useDate, "/")}</w:t>
+                            </w:r>
                         </w:p>
                     </w:tc>
                     <w:tc>