Merge remote-tracking branch 'origin/feature/0406-degree' into feature/0406-degree

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeNews.java

@@ -46,7 +46,7 @@ public class DegreeNews implements Serializable {
 
     @ApiModelProperty("状态（1-可见 0-不可见）")
     @TableField(value = "status_")
-    private String status;
+    private Boolean status;
 
     @ApiModelProperty("上线时间")
     @TableField(value = "online_time_")
@@ -99,4 +99,4 @@ public class DegreeNews implements Serializable {
     public Integer getTenantId() {
         return Optional.ofNullable(tenantId).orElse(TenantContextHolder.getTenantId());
     }
-}
+}

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.wrapper;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,7 +35,18 @@ public class DegreeNewsWrapper {
         
         @ApiModelProperty("关键字匹配")
 		private String keyword;
-        
+
+        private String organId;
+
+        @ApiModelProperty("用户所在分部")
+        private String defaultOrganId;
+
+        @ApiModelProperty("是否启用")
+        private Boolean status;
+
+        @ApiModelProperty("咨询类型")
+        private String type;
+
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
         }
@@ -60,4 +72,4 @@ public class DegreeNewsWrapper {
         }
 	}
 
-}
+}

mec-biz/src/main/resources/config/mybatis/DegreeNewsMapper.xml

@@ -3,9 +3,22 @@
 <mapper namespace="com.ym.mec.biz.dal.mapper.DegreeNewsMapper">
     
     <select id="selectPage" resultType="com.ym.mec.biz.dal.entity.DegreeNews">
-		SELECT         
-        	t.*
-		FROM degree_news t
+		select * from degree_news
+		<where>
+			<if test="param.type != null">
+				AND type_ = #{param.type}
+			</if>
+			<if test="param.status != null">
+				AND status_ = #{param.status}
+			</if>
+			<if test="param.organId != null">
+				AND FIND_IN_SET(param.organId,organ_ids_)
+			</if>
+			<if test="param.organId == null and param.defaultOrganId != null and param.defaultOrganId != ''">
+				AND (INTE_ARRAY(param.defaultOrganId,organ_ids_) OR organ_ids_ IS NULL OR organ_ids_ = '')
+			</if>
+		</where>
+		ORDER BY id_ DESC
 	</select>
     
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeNewsController.java

@@ -52,7 +52,7 @@ public class DegreeNewsController extends BaseController {
     public HttpResponseResult<PageInfo<DegreeNews>> page(@RequestBody DegreeNewsWrapper.DegreeNewsQuery query) {
         
         IPage<DegreeNews> pages = degreeNewsService.selectPage(QueryInfo.getPage(query), query);
-        
+
         return succeed(QueryInfo.pageInfo(pages));
 	}
     
@@ -78,6 +78,16 @@ public class DegreeNewsController extends BaseController {
         return succeed();
 	}
 
+    @ApiOperation(value = "启用、停用")
+    @PreAuthorize("@pcs.hasPermissions('degreeNews/enable')")
+	@PostMapping("/enable")
+	public HttpResponseResult<JSONObject> enable(Long newsId) {
+        DegreeNews degreeNews = degreeNewsService.getById(newsId);
+        degreeNews.setStatus(!degreeNews.getStatus());
+        degreeNewsService.updateById(degreeNews);
+        return succeed();
+	}
+
 	@ApiOperation(value = "删除", notes = "考级资讯表- 传入id")
     @PreAuthorize("@pcs.hasPermissions('degreeNews/remove')")
 	@PostMapping("/remove")