电力结果公告增加附件、探矿权修改字段类型

src/main/java/com/trs/ggzyexchange/entity/ZrzyTkqNotice.java

@@ -107,13 +107,13 @@ public class ZrzyTkqNotice extends BaseEntity {
      * 出让年限
      */
     @TableField("QT_PLAN_YEARS")
-    private BigDecimal qtPlanYears;
+    private String qtPlanYears;
 
     /**
      * 面积
      */
     @TableField("QT_TOTAL_AREA")
-    private BigDecimal qtTotalArea;
+    private String qtTotalArea;
 
     /**
      * 地理位置

src/main/java/com/trs/ggzyexchange/schedul/NmResultNoticeSchedul.java

@@ -139,6 +139,20 @@ public class NmResultNoticeSchedul implements Job {
                     }
                 }
             }
+            String noticeContent = record.getNoticeContent();
+            String fileUrl = record.getFile();
+            String file = "";
+            if(!ObjectUtils.isEmpty(fileUrl)){
+                file = "<br>附件：<br>";
+                file += "<a  target='_blank' style='color: blue' href='"+ fileUrl +"'>附件</a><br/>";
+            }
+            //招标文件拼接地址
+            if(!ObjectUtils.isEmpty(noticeContent) && noticeContent != ""){
+                file = noticeContent + file;
+            }
+            record.setNoticeContent(file);
+
+
             TenderDetailsVoUtils.isNull(record);
         }
         return tenderDetailsVoIPage.getRecords();

src/main/resources/mapper/NmResultNoticeMapper.xml

@@ -21,7 +21,8 @@
             nrn.BULLETIN_TYPE bulletinTypeCode,
             nrn.BULLETIN_DUTY bulletinDuty,
             nrn.BID_SECTION_CODE bidSectionCodes,
-            nrn.PSP_BID_OPEN_TIME bidOpenTime
+            nrn.PSP_BID_OPEN_TIME bidOpenTime,
+            nrn.URL file
         from
             nm_result_notice nrn
                 left join nm_project np