elis 1 yıl önce
ebeveyn
işleme
ff1f9e3bdd

+ 2 - 0
nngkxxdp/src/main/java/com/example/nngkxxdp/program/controller/HLWIntefaceController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Comparator;
 import java.util.Map;
 
 
@@ -115,6 +116,7 @@ public class HLWIntefaceController {
             if (ObjectUtil.isEmpty(hlwArticleList)){
                 return SendUtil.send(false, "", "");
             }
+            hlwArticleList.getJSONArray("DATA").sort(Comparator.comparing(obj -> ((JSONObject) obj).getStr("DOCRELTIME")).reversed());
             return SendUtil.send(true, "", hlwArticleList);
         } catch (Exception e) {
             throw new RuntimeException(e);

+ 15 - 13
nnzwminiapp/pages/publics/index/index.js

@@ -330,18 +330,19 @@ Page({
 		})
 	},
 	goToGovernment(e) {
-    // console.log(e.currentTarget.dataset.index);
-    if (e.currentTarget.dataset.index == 2) {
-      wx.navigateTo({
+		// console.log(e.currentTarget.dataset.index);
+		if (e.currentTarget.dataset.index == 2) {
+			wx.navigateTo({
 				url: '/pages/web/web?url=https://www.cqna.gov.cn/zwgk_254/fdzdgknr/zcwj/xzgfxwj/',
-      })
-      
-    }
-    if (e.currentTarget.dataset.index == 3) {
-      wx.navigateTo({
+			})
+			return;
+		}
+		if (e.currentTarget.dataset.index == 3) {
+			wx.navigateTo({
 				url: '/pages/publics/government/government?index= 2',
 			})
-    }
+			return;
+		}
 		if (e.currentTarget.dataset.index) {
 			wx.navigateTo({
 				url: '/pages/publics/government/government?index=' + e.currentTarget.dataset.index,
@@ -350,8 +351,8 @@ Page({
 			wx.navigateTo({
 				url: '/pages/publics/government/government',
 			})
-    }
-    
+		}
+
 	},
 	// 切换政策文件类型
 	clickFileTab: function (e) {
@@ -459,9 +460,10 @@ Page({
 		})
 	},
 	goToBaseAffairs() {
+		// https://www.cqna.gov.cn/zwgk_254/jczwgk/
 		wx.navigateTo({
-			url: '/pages/publics/baseAffairs/baseAffairs',
-		})
+			url: `/pages/web/web?url=https://www.cqna.gov.cn/zwgk_254/jczwgk/`
+		  })
 	},
 	goToBaseAffairsDetail(e) {
     const index = e.currentTarget.dataset.item