Merge remote-tracking branch 'origin/master'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/AppVersionInfoController.java

@@ -15,9 +15,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.yonge.cooleshow.biz.dal.entity.AppVersionInfo;
+import com.yonge.cooleshow.biz.dal.queryInfo.AppVersionInfoQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 
 @RequestMapping("appVersionInfo")
 @Api(tags = "APP版本信息服务")
@@ -30,14 +32,14 @@ public class AppVersionInfoController extends BaseController {
 	@ApiOperation("分页查询")
 	@GetMapping(value = "/list")
 	@PreAuthorize("@pcs.hasPermissions('appVersionInfo/list')")
-	public Object getList(QueryInfo queryInfo) {
+	public HttpResponseResult<PageInfo<AppVersionInfo>> getList(AppVersionInfoQueryInfo queryInfo) {
 		return succeed(appVersionInfoService.queryPage(queryInfo));
 	}
 
 	@ApiOperation("根据app客户端查询对象")
 	@ApiImplicitParam(name = "platform", value = "平台名称", required = true, dataType = "String", paramType = "path")
 	@GetMapping(value = "/queryByPlatform")
-	public Object queryByPlatform(String platform) {
+	public HttpResponseResult<AppVersionInfo> queryByPlatform(String platform) {
 		List<AppVersionInfo> list = appVersionInfoService.queryNewestByPlatform(platform);
 		if (list.size() > 0) {
 			return succeed(list.get(0));
@@ -49,7 +51,7 @@ public class AppVersionInfoController extends BaseController {
 	@ApiImplicitParam(name = "id", value = "ID编号", required = true, dataType = "Integer", paramType = "path")
 	@GetMapping(value = "/query")
 	@PreAuthorize("@pcs.hasPermissions('appVersionInfo/query')")
-	public Object query(Long id) {
+	public HttpResponseResult<AppVersionInfo> query(Long id) {
 		return succeed(appVersionInfoService.get(id));
 	}
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SubjectController.java

@@ -60,7 +60,7 @@ public class SubjectController extends BaseController {
 	public HttpResponseResult<PageInfo<Subject>> queryPage(SubjectQueryInfo queryInfo) {
 		PageInfo<Subject> pageInfo = subjectService.queryPage(queryInfo);
 
-		Map<Long, Subject> map = subjectService.findBySubjectByIdList(pageInfo.getRows().stream().map(t -> t.getId()).collect(Collectors.toList())).stream()
+		Map<Long, Subject> map = subjectService.findBySubjectByIdList(pageInfo.getRows().stream().map(t -> t.getParentSubjectId()).collect(Collectors.toList())).stream()
 				.collect(Collectors.toMap(Subject::getId, t -> t));
 
 		pageInfo.getRows().forEach(row -> {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/AppVersionInfoQueryInfo.java

@@ -0,0 +1,36 @@
+package com.yonge.cooleshow.biz.dal.queryInfo;
+
+import com.yonge.cooleshow.common.page.QueryInfo;
+
+public class AppVersionInfoQueryInfo extends QueryInfo {
+
+	private String version;
+	
+	private String platform;
+	
+	private String status;
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public String getPlatform() {
+		return platform;
+	}
+
+	public void setPlatform(String platform) {
+		this.platform = platform;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/AppVersionInfoMapper.xml

@@ -91,8 +91,14 @@
 	<select id="queryPage" resultMap="AppVersionInfo" parameterType="map">
 		SELECT * FROM app_version_info
 		<where>
-			<if test="search != null and search != ''">
-				platform_ LIKE CONCAT('%',#{search},'%')
+			<if test="version != null and version != ''">
+				and version_ = #{version}
+			</if>
+			<if test="platform != null and platform != ''">
+				and platform_ = #{platform}
+			</if>
+			<if test="status != null and status != ''">
+				and status_ = #{status}
 			</if>
 		</where>
 		ORDER BY status_ DESC
@@ -103,8 +109,14 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM app_version_info
 		<where>
-			<if test="search != null and search != ''">
-				platform_ LIKE CONCAT('%',#{search},'%')
+			<if test="version != null and version != ''">
+				and version_ = #{version}
+			</if>
+			<if test="platform != null and platform != ''">
+				and platform_ = #{platform}
+			</if>
+			<if test="status != null and status != ''">
+				and status_ = #{status}
 			</if>
 		</where>
 	</select>