liujunchi преди 3 години
родител
ревизия
b5f6e4b5fd

+ 1 - 1
cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -224,7 +224,7 @@ public class NewsController extends BaseController {
 		}
 
 		AppHomeDto appHomeDto = new AppHomeDto();
-		queryInfo.setStatus(NewsStatusEnum.SHOW);
+		queryInfo.setStatus(NewsStatusEnum.SHOW.getCode().toString());
 		queryInfo.setPlatformType("STUDENT");
 		// 1热门资讯
 		queryInfo.setType(1);

+ 3 - 3
cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/queryinfo/NewsInformationQueryInfo.java

@@ -25,7 +25,7 @@ public class NewsInformationQueryInfo extends QueryInfo {
 	private String subType;
 
 	@ApiModelProperty(value = "资讯状态(0:禁用,1:启用)", required = false)
-	private NewsStatusEnum status;
+	private String status;
 
 	@ApiModelProperty(value = "编号/标题", required = false)
 	private String title;
@@ -72,11 +72,11 @@ public class NewsInformationQueryInfo extends QueryInfo {
 		this.subType = subType;
 	}
 
-	public NewsStatusEnum getStatus() {
+	public String getStatus() {
 		return status;
 	}
 
-	public void setStatus(NewsStatusEnum status) {
+	public void setStatus(String status) {
 		this.status = status;
 	}
 

+ 1 - 1
cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -46,7 +46,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 	public Map<String,PageInfo<SysNewsInformation>> getHomeList(SysUser user, NewsInformationQueryInfo queryInfo) {
 		//1精彩活动,2热门资讯,3banner类型
 		Map<String,PageInfo<SysNewsInformation>> homeList = new HashMap<>();
-		queryInfo.setStatus(NewsStatusEnum.SHOW);
+		queryInfo.setStatus(NewsStatusEnum.SHOW.getCode().toString());
 		
 		String memo = queryInfo.getMemo();
 		

+ 1 - 1
cooleshow-cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -47,7 +47,7 @@
 				and sni.sub_type_ = #{subType}
 			</if>
 			<if test="status != null">
-				and sni.status_ = #{status, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}
+				and sni.status_ = #{status}
 			</if>
 			<if test="title != null">
 				and (sni.title_ like '%' #{title} '%'

+ 2 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -547,8 +547,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
     public HomeMusicSheetVo getMusicSheetHome() {
 
         HomeMusicSheetVo homeMusicSheetVo = baseMapper.selectMusicNum();
-        homeMusicSheetVo.
+        // homeMusicSheetVo.
 
+        return homeMusicSheetVo;
     }
 
     private SysUser getSysUser(Long userId) {