shangke 2 gadi atpakaļ
vecāks
revīzija
03e2c82ef9

+ 16 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DegreeWrapper.java

@@ -244,6 +244,11 @@ public class DegreeWrapper {
         @ApiModelProperty("倒计时开始天数")
         private Integer startDays;
 
+        @ApiModelProperty("链接地址")
+        private String linkUrl;
+
+        @ApiModelProperty("跳转类型_bank,_slef")
+        private String hrefTarget;
 
         public String jsonString() {
             return JSON.toJSONString(this);
@@ -262,6 +267,17 @@ public class DegreeWrapper {
             }
             return Optional.ofNullable(startDays).orElse(0);
         }
+
+
+        public StudentDegreeInfo linkUrl(String linkUrl) {
+            this.linkUrl = linkUrl;
+            return this;
+        }
+
+        public StudentDegreeInfo hrefTarget(String hrefTarget) {
+            this.hrefTarget = hrefTarget;
+            return this;
+        }
     }
 
     @Data

+ 5 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeServiceImpl.java

@@ -305,7 +305,11 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
 
             records = degreeNewsService.selectPage(QueryInfo.getPage(newsQuery), newsQuery).getRecords();
             if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {
-                wrapper.setGradingNoticeId(records.get(0).getId());
+
+                DegreeNewsVo newsVo = records.get(0);
+                wrapper.linkUrl(newsVo.getLinkUrl())
+                        .hrefTarget(newsVo.getHrefTarget())
+                        .setGradingNoticeId(newsVo.getId());
             }
         }