--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookController.java

@@ -140,7 +140,7 @@ public class EbookController {
 			CreatreQRCodeForm qrFrom = new CreatreQRCodeForm();
 			qrFrom.setContent("http://test16.zhongdianyun.com:8708/wap/index.html#/pages/details/index?id="+book2.getId());
 			Calendar now = Calendar.getInstance();
-			qrFrom.setFileName(book2.getName() + now.get(Calendar.YEAR) + "年" + (now.get(Calendar.MONTH) + 1) + "月");
+			qrFrom.setFileName(book2.getName() + now.get(Calendar.YEAR) + "年" + (now.get(Calendar.MONTH) + 1) + "期");
 			book2.setResourceQr(client.createImg(qrFrom));
 			bookservice.updateByPrimaryKeySelective(book2);
 		}
@@ -542,6 +542,7 @@ public class EbookController {
 					article.setUploadTime(new Date());
 					article.setUpdateTime(new Date());
 					article.setStatus(0);
+					article.setSource(book.getName());
 					article.setBrowseNum(50);
 					// article.setNationsType(book.getNationsType());
 					article.setResourceType(AllResourceTypeEnum.ARTICLE.getCode());
@@ -658,7 +659,7 @@ public class EbookController {
 		try {
 			CreatreQRCodeForm qrFrom = new CreatreQRCodeForm();
 			qrFrom.setContent("http://test16.zhongdianyun.com:8708/wap/index.html#/pages/details/index?id="+ev.getBook().getId());
-			qrFrom.setFileName(ev.getBook().getName()+ev.getBook().getYear()+"年"+ev.getBook().getPeriods()+"月");
+			qrFrom.setFileName(ev.getBook().getName()+ev.getBook().getYear()+"年"+ev.getBook().getPeriods()+"期");
 			ev.getBook().setResourceQr(client.createImg(qrFrom));
 			bookservice.insert(ev.getBook());
 			
@@ -685,6 +686,7 @@ public class EbookController {
 			article.setAuthor(ev.getBook().getAuthor());
 			article.setBookId(ev.getEbook().getId());
 			article.setBookName(ev.getBook().getName());
+			article.setSource(ev.getBook().getName());
 			article.setUploadTime(new Date());
 			article.setUpdateTime(new Date());
 			article.setStatus(0);

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ResourceRelationMapper.java

@@ -22,7 +22,8 @@ public interface ResourceRelationMapper  extends BaseMapper<ResourceRelation> {
 			+ "<if test='resourceType != null'> "
 			+ " and resourceType = #{resourceType} "
 			+ "</if>"
-			+ " order by sort asc"
+			+ " order by sort "
+
 			+ "</script>")
 	List<ResourceRelationVo> queryByIdAndResourceType(QueryResourceRelationForm entity);
 	

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/articlelibrary/ArticleLibraryMapper.java

@@ -78,6 +78,7 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 			+ "#{id}" 
 			+ "</foreach>" 
 			+ "</if>"
+			+ " ORDER BY uploadTime desc"
 		    + "</script>")
 	List<ResourceRelationListVo> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
 	/**

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/audiolibrary/AudioLibraryMapper.java

@@ -47,7 +47,7 @@ public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
 	List<AudioLibraryListVO> query(@Param("form")QueryAudioLibraryForm form);
 	
 	@Select("<script>" 
-			+ "select DISTINCT a.id,a.name,a.author,a.source,a.realprice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.timeLength,a.size,a.status,a.cover "
+			+ "select DISTINCT a.id,a.resourceType,a.name,a.author,a.source,a.realprice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.timeLength,a.size,a.status,a.cover "
 			+ "from res_Audio_Library a left join res_Audio_Library_Diy_Type ad "
 			+ " on a.id = ad.audioid "
 			+ "where 1=1 and a.status = 1 "

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/videolibrary/VideoLibraryMapper.java

@@ -46,7 +46,7 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	List<VideoLibraryListVO> query(@Param("form")QueryVideoLibraryForm form);
 	
 	@Select("<script>" 
-			+ "select DISTINCT a.id,a.name,adSlogan source,a.author,a.realprice,a.timeLength,a.size,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status,a.img,a.defaultImg "
+			+ "select DISTINCT a.id,a.resourceType ,a.name,adSlogan source,a.author,a.realprice,a.timeLength,a.size,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status,a.img,a.defaultImg "
 			+ "from res_Video_Library a left join res_Video_Library_Diy_Type ad "
 			+ "on a.id = ad.vlid "
 			+ "where 1=1 and a.status = 1  "

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java

@@ -118,7 +118,7 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 			bookMapper.insertSelective(book);
 			CreatreQRCodeForm qrFrom = new CreatreQRCodeForm();
 			qrFrom.setContent("http://test16.zhongdianyun.com:8708/wap/index.html#/pages/details/index?id="+book.getId());
-			qrFrom.setFileName(book.getName()+book.getYear()+"年"+book.getPeriods()+"月");
+			qrFrom.setFileName(book.getName()+book.getYear()+"年"+book.getPeriods()+"期");
 			book.setResourceQr(client.createImg(qrFrom));
 			bookMapper.updateByPrimaryKeySelective(book);
 			

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookController.java

@@ -87,7 +87,7 @@ public class FgEbookController {
 	@GetMapping(ResourceRequestPath.PAGE_BOOK)
 	public CallBack<PageInfo<FgArticleLibraryListVO>> getBookOrArticleList(FgQueryArticleLibraryForm form, PageParam pageParam) {
 		if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
-			pageParam.setOrderBy("year desc,periods desc");
+			pageParam.setOrderBy("year desc,CAST(TRIM('中文bai' FROM periods) AS SIGNED) desc");
 		}
 		List<FgArticleLibraryListVO> list=null;
 		if(form.getType().equals("1")) {

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/projectlibrary/FgProjectLibraryMapper.java

@@ -32,23 +32,24 @@ public interface FgProjectLibraryMapper extends BaseMapper<ProjectLibrary> {
 	
 	
 	@Select("<script>" 
-			+" select a.id,name,img,a.resourceType,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,source from  res_Article_Library a  inner JOIN res_resource_relation b on b.resourceId = a.id "
+			+" select a.id,b.sort,name,img,a.resourceType,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,source from  res_Article_Library a  inner JOIN res_resource_relation b on b.resourceId = a.id "
 			+ " where 1 = 1 "
 			+ "<if test = '" + NOTBLANK + "(id)'>"  
 			+ " and objectId = #{id} "
 			+ "</if>" 
 			+" UNION"  
-			+" select a.id,name,img,a.resourceType,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,adSlogan source from res_video_library a  inner JOIN res_resource_relation b on b.resourceId = a.id "
+			+" select a.id,b.sort,name,img,a.resourceType,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,adSlogan source from res_video_library a  inner JOIN res_resource_relation b on b.resourceId = a.id "
 			+ " where 1 = 1 "  
 			+ "<if test = '" + NOTBLANK + "(id)'>"  
 			+ " and objectId = #{id} "
 			+ "</if>" 
 			+" UNION" 
-			+" select a.id,name,cover img,a.resourceType,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,source from res_audio_library a  inner JOIN res_resource_relation b on b.resourceId = a.id "
+			+" select a.id,b.sort,name,cover img,a.resourceType,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,source from res_audio_library a  inner JOIN res_resource_relation b on b.resourceId = a.id "
 			+ " where 1 = 1  "
 			+ "<if test = '" + NOTBLANK + "(id)'>"  
 			+ " and objectId = #{id} "
 			+ "</if>" 
+			+ " order by sort desc"
 		    + "</script>")
 	List<FgRecommendVo> queryResource(@Param("id")String id);
 	

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/mapper/WapBookMapper.java

@@ -71,7 +71,7 @@ public interface WapBookMapper extends BaseMapper<Book> {
 			+ "select bb.id,bb.name, bb.year,bb.yearId, bb.periods, bb.bookCover,bb.status,bb.summary,bb.pdf,"
 			+ "bb.mainBody,bb.mainBodyId,DATE_FORMAT(bb.uploadTime,'%Y-%m-%d %H:%m:%s') uploadTime "
 			+ "FROM res_book bb WHERE bb.status = 1  "
-			+ " order by year desc,periods desc LIMIT 0,6"
+			+ " order by year desc,CAST(TRIM('中文bai' FROM bb.periods) AS SIGNED) desc LIMIT 0,6"
 			+ "</script>")
 	List<WapIndexEbookListVO> newQueryMainBody();
 	
@@ -86,7 +86,7 @@ public interface WapBookMapper extends BaseMapper<Book> {
 			+ "select bb.id,bb.name, bb.year,bb.yearId, bb.periods, bb.bookCover,bb.status,bb.summary,bb.pdf,"
 			+ "bb.mainBody,bb.mainBodyId,DATE_FORMAT(bb.uploadTime,'%Y-%m-%d %H:%m:%s') uploadTime "
 			+ "FROM res_book bb WHERE bb.status = 1 and bb.mainBodyId = #{oid} "
-			+ " order by year desc,periods desc LIMIT 0,4"
+			+ " order by year desc,CAST(TRIM('中文bai' FROM bb.periods) AS SIGNED) desc LIMIT 0,4"
 			+ "</script>")
 	List<WapIndexEbookListVO> queryMainBody(@Param("oid") String oid);
 	@Select("<script>"