fix

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

@@ -235,21 +235,27 @@ public class DegreeWrapper {
         @ApiModelProperty("考级简章ID")
         private Long examinationBriefId;
 
+        @ApiModelProperty("链接地址")
+        private String examinationBriefLinkUrl;
+
+        @ApiModelProperty("跳转类型_bank,_slef")
+        private String examinationBriefHrefTarget;
+
         @ApiModelProperty("考级通知ID")
         private Long gradingNoticeId;
 
+        @ApiModelProperty("链接地址")
+        private String gradingNoticeLinkUrl;
+
+        @ApiModelProperty("跳转类型_bank,_slef")
+        private String gradingNoticeHrefTarget;
+
         @ApiModelProperty("考级城市分部")
         private List<DegreeCity> degreeCities;
 
         @ApiModelProperty("倒计时开始天数")
         private Integer startDays;
 
-        @ApiModelProperty("链接地址")
-        private String linkUrl;
-
-        @ApiModelProperty("跳转类型_bank,_slef")
-        private String hrefTarget;
-
         public String jsonString() {
             return JSON.toJSONString(this);
         }
@@ -268,14 +274,23 @@ public class DegreeWrapper {
             return Optional.ofNullable(startDays).orElse(0);
         }
 
+        public StudentDegreeInfo examinationBriefLinkUrl(String examinationBriefLinkUrl) {
+            this.examinationBriefLinkUrl = examinationBriefLinkUrl;
+            return this;
+        }
+
+        public StudentDegreeInfo examinationBriefHrefTarget(String examinationBriefHrefTarget) {
+            this.examinationBriefHrefTarget = examinationBriefHrefTarget;
+            return this;
+        }
 
-        public StudentDegreeInfo linkUrl(String linkUrl) {
-            this.linkUrl = linkUrl;
+        public StudentDegreeInfo gradingNoticeLinkUrl(String gradingNoticeLinkUrl) {
+            this.gradingNoticeLinkUrl = gradingNoticeLinkUrl;
             return this;
         }
 
-        public StudentDegreeInfo hrefTarget(String hrefTarget) {
-            this.hrefTarget = hrefTarget;
+        public StudentDegreeInfo gradingNoticeHrefTarget(String gradingNoticeHrefTarget) {
+            this.gradingNoticeHrefTarget = gradingNoticeHrefTarget;
             return this;
         }
     }

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

@@ -296,7 +296,11 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
                 .build();
         List<DegreeNewsVo> records = degreeNewsService.selectPage(QueryInfo.getPage(newsQuery), newsQuery).getRecords();
         if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {
-            wrapper.setExaminationBriefId(records.get(0).getId());
+
+            DegreeNewsVo newsVo = records.get(0);
+            wrapper.examinationBriefLinkUrl(newsVo.getLinkUrl())
+                    .examinationBriefHrefTarget(newsVo.getHrefTarget())
+                    .setExaminationBriefId(newsVo.getId());
         }
 
         // 考级须知ID
@@ -307,8 +311,8 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
             if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {
 
                 DegreeNewsVo newsVo = records.get(0);
-                wrapper.linkUrl(newsVo.getLinkUrl())
-                        .hrefTarget(newsVo.getHrefTarget())
+                wrapper.gradingNoticeLinkUrl(newsVo.getLinkUrl())
+                        .gradingNoticeHrefTarget(newsVo.getHrefTarget())
                         .setGradingNoticeId(newsVo.getId());
             }
         }