--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgArticleLibraryMapper.java

@@ -20,7 +20,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.id,a.name,a.source,a.keywords,a.synopsis,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime"
+			+ "select distinct a.id,a.name,a.source,a.keywords,a.synopsis,DATE_FORMAT(a.uploadTime,'%Y-%m-%d %H:%m') uploadTime"
 			+ " from res_Article_Library a "
 			+ "where 1=1 and a.status = 1 "
 			+ "<if test = 'form.keywords != null' >"  

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgBookServiceImpl.java

@@ -10,6 +10,7 @@ import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryArticleLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.Book;
+import com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary;
 import com.zrqx.core.model.resource.year.YearLibrary;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.datatype.ArrayUtils;
@@ -17,6 +18,8 @@ import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookVO;
+import com.zrqx.resource.bg.mapper.pdffilelibrary.PdfLibraryMapper;
+import com.zrqx.resource.bg.service.pdffilelibrary.PdfLibraryService;
 import com.zrqx.resource.fg.mapper.ebook.FgBookMapper;
 import com.zrqx.resource.fg.mapper.year.FgYearLibraryMapper;
 
@@ -31,6 +34,8 @@ public class FgBookServiceImpl extends BaseServiceImpl<Book, String> implements
 	private FgBookMapper bookMapper;
 	@Autowired
 	private FgYearLibraryMapper fgYearLibraryMapper;
+	@Autowired
+	private PdfLibraryMapper pdfLibraryMapper;
 	@Override
 	public BaseMapper<Book> getMapper() {
 		return bookMapper;
@@ -53,6 +58,8 @@ public class FgBookServiceImpl extends BaseServiceImpl<Book, String> implements
 		for (FgEbookVO vo : list) {
 			YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(vo.getYearId());
 			vo.setName(vo.getName()+"["+library.getName()+"年第"+vo.getPeriods()+"期]");
+			PdfLibrary pdfLibrary = pdfLibraryMapper.selectByPrimaryKey(vo.getPdf());
+			vo.setPdf(pdfLibrary.getPdf());
 		}
 		return list;
 	}