--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/animation/QueryAnimationLibraryForm.java

@@ -26,9 +26,5 @@ public class QueryAnimationLibraryForm {
 	private Integer dataSources;
 	@ApiModelProperty("所属图书")
 	private String bookName;
-	@ApiModelProperty("售价 降序 desc 升序asc")
-	private String price;
-	@ApiModelProperty("上传时间  降序 desc 升序asc")
-	private String uploadTime;
 	
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/articlelibrary/QueryArticleLibraryForm.java

@@ -26,6 +26,4 @@ public class QueryArticleLibraryForm {
 	private String diyTypeCode;
 	@ApiModelProperty("数据来源 1:本版 2外版")
 	private Integer dataSources;
-	@ApiModelProperty("上传时间  降序 desc 升序asc")
-	private String uploadTime;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/audiolibrary/QueryAudioLibraryForm.java

@@ -26,8 +26,4 @@ public class QueryAudioLibraryForm {
 	private Integer dataSources;
 	@ApiModelProperty("所属图书")
 	private String bookName;
-	@ApiModelProperty("售价 降序 desc 升序asc")
-	private String price;
-	@ApiModelProperty("上传时间  降序 desc 升序asc")
-	private String uploadTime;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/authorLibrary/QueryAuthorLibraryForm.java

@@ -22,6 +22,4 @@ public class QueryAuthorLibraryForm {
 	private String endTime;
 	@ApiModelProperty("状态 0已录入 1审核通过 2审核未通过 ")
 	private Integer status;
-	@ApiModelProperty("上传时间  降序 desc 升序asc")
-	private String createTime;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/clauseLibrary/QueryClauseLibraryForm.java

@@ -39,6 +39,4 @@ public class QueryClauseLibraryForm {
 	private List<String> diyTypeId;
 	@ApiModelProperty("自定义分类code")
 	private String diyTypeCode;
-	@ApiModelProperty("上传时间  降序 desc 升序asc")
-	private String uploadTime;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/ebook/UpdateEbookForm.java

@@ -12,7 +12,7 @@ import lombok.Data;
 public class UpdateEbookForm {
 	@ApiModelProperty("ids")
 	private List<String> ids;
-	@ApiModelProperty("审核状态  0：录入中  1：待审核  2：审核中 3：审核通过  4：审核未通过")
+	@ApiModelProperty("审核状态 0录入中  3待审核  2审核中 1审核通过 4审核不通过")
 	private Integer status;
 	@ApiModelProperty("销售状态  1:可售  2:不可售")
 	private Integer salesStatus;

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/clauseLibrary/ClauseLibrary.java

@@ -67,5 +67,11 @@ public class ClauseLibrary {
 	private Integer resourceType = 14;
 	@ApiModelProperty("附件列表 用逗号分隔")
 	private String attachmentList;
+	@ApiModelProperty("判断pdf,资源来自新上传资源（值为1）还是已有资源绑定（值为2）")
+	private Integer pdfResourceType;
+	@ApiModelProperty("判断视频,资源来自新上传资源（值为1）还是已有资源绑定（值为2）")
+	private Integer videoResourceType;
+	@ApiModelProperty("判断音频,资源来自新上传资源（值为1）还是已有资源绑定（值为2）")
+	private Integer audioResourceType;
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/diytype/DiyTypeResource.java

@@ -27,4 +27,7 @@ public class DiyTypeResource {
 	
 	@ApiModelProperty("数据类型排序")
 	private Integer resourceTypeSort;
+	
+	@ApiModelProperty(value = "分类编号", required = true)
+	private String code;
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/Book.java

@@ -68,7 +68,7 @@ public class Book {
 	private Integer departmentId;
 	@ApiModelProperty("所属部门")
 	private String department;
-	@ApiModelProperty("审核状态  0：录入中  1：待审核  2：审核中 3：审核通过  4：审核未通过")
+	@ApiModelProperty("审核状态  0：录入中  3：待审核  2：审核中 1：审核通过  4：审核未通过")
 	private Integer status;
 	@ApiModelProperty(value = "创建时间")
 	private Date uploadTime;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/diytype/DiyTypeController.java

@@ -108,6 +108,7 @@ public class DiyTypeController {
 						resource.setDiyTypeId(type.getId());
 						resource.setResourceType(sub);
 						resource.setResourceTypeSort(tsf.getResourceTypeSort());
+						resource.setCode(type.getCode());
 						diyTypeResourceService.insert(resource);
 					}
 					return CallBack.success(true);

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/diytype/DiyTypeResourceMapper.java

@@ -17,12 +17,11 @@ public interface  DiyTypeResourceMapper extends BaseMapper<DiyTypeResource> {
 
 	@Select("<script>" 
 			+ "select * from  res_Diy_Type a,res_diy_type_resource t where a.id=t.diyTypeId"
-			+ "where 1=1 "
-			+ "<if test='form.resourceType != null'>"  
-		    + "and t.resourceType = #{form.resourceType} "
+			+ "<if test='resourceType != null'>"  
+		    + " and t.resourceType = #{resourceType}"
 			+ "</if>" 
 			+ "<if test='name != null and name != \"\"'>"  
-		    + "and name like concat('%',#{name},'%') "
+		    + " and a.typeName like concat('%',#{name},'%') "
 		    + "</if>" 
 		    + "</script>")
 	List<DiyTypeResource> queryByTypeName(@Param("resourceType") String resourceType,@Param("name")String name);

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/clauseLibrary/ClauseLibraryServiceImpl.java

@@ -470,17 +470,45 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
 		}
 		List<ClauseLibrary> list = new ArrayList<ClauseLibrary>();
 		for (int i = 0; i < form.getToken().size(); i++) {
-			ClauseLibrary obj = new ClauseLibrary();
 			Integer countName = mapper.isRepeat(form.getNames().get(i),"");
 			if(countName==0){
-				obj.setContent(form.getNames().get(i));
-				obj.setPdf(form.getToken().get(i));
+				String name=form.getNames().get(i).substring(0, form.getNames().get(i).indexOf("."));
+				//先添加PDF
+				PdfLibrary pdf=new PdfLibrary();
+				pdf.setPdf(form.getToken().get(i));
+				pdf.setName(name);
+				pdf.setUploadTime(new Date());
+				pdf.setStatus(0);
+				pdf.setResourceType(15);
+				pdf.setIsDelete(0);
+				pdfLibraryMapper.insert(pdf);
+				//添加关联表资源
+				diyTypeService.createCriteria().andEqualTo("typeName", "其他");
+				DiyType diyType = diyTypeService.selectOneByCriteria();
+				if(diyType!=null){
+					ClassifyRelation type = new ClassifyRelation();
+					type.setId(UUIDUtil.getUUID());
+					type.setObjectId(pdf.getId());
+					type.setDtId(diyType.getId());
+					type.setCode(diyType.getCode());
+					type.setResourceType(15);
+					diyTypeMapper.insertSelective(type);
+				}
+				//商品信息
+				PdfGoods goods = new PdfGoods();
+				goods.setObjectId(pdf.getId());
+				pdfGoodsMapper.insertSelective(goods);
+				//添加条文
+				ClauseLibrary obj = new ClauseLibrary();
+				obj.setContent(name);
+				obj.setPdf(pdf.getId());
 				obj.setUploadTime(new Date());
 				obj.setKeyword(form.getKeyword());
 				obj.setSource(form.getSource());
 				obj.setIsDelete(0);
 				obj.setStatus(0);
 				obj.setResourceType(14);
+				obj.setPdfResourceType(1); 
 				mapper.insert(obj);
 				list.add(obj);
 			}else{

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

@@ -116,6 +116,7 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 		Book book = new Book();
 		BeanUtils.copyProperties(form, book);
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM");
 		if (form.getDiyTypeId() == null || form.getDiyTypeId().size() == 0) {
 			throw new BaseException("参数验证失败。");
 		} else {
@@ -124,7 +125,7 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 				Ebook ebook = new Ebook();
 				BeanUtils.copyProperties(form, ebook);
 				if (form.getPublishTime() != null) {
-					book.setPublishTime(sdf.parse(form.getPublishTime()));
+					book.setPublishTime(sdf1.parse(form.getPublishTime()));
 				}
 				book.setStatus(0);
 				book.setIsDelete(0);

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/statuteLibrary/StatuteLibraryServiceImpl.java

@@ -492,6 +492,33 @@ public class StatuteLibraryServiceImpl extends BaseServiceImpl<StatuteLibrary, I
 		for (int i = 0; i < form.getToken().size(); i++) {
 			Integer countName = mapper.isRepeat(form.getNames().get(i),"");
 			if(countName==0){
+				String name=form.getNames().get(i).substring(0, form.getNames().get(i).indexOf("."));
+				//先添加PDF
+				PdfLibrary pdf=new PdfLibrary();
+				pdf.setPdf(form.getToken().get(i));
+				pdf.setName(name);
+				pdf.setUploadTime(new Date());
+				pdf.setStatus(0);
+				pdf.setResourceType(15);
+				pdf.setIsDelete(0);
+				pdfLibraryMapper.insert(pdf);
+				//添加关联表资源
+				diyTypeService.createCriteria().andEqualTo("typeName", "其他");
+				DiyType diyType = diyTypeService.selectOneByCriteria();
+				if(diyType!=null){
+					ClassifyRelation type = new ClassifyRelation();
+					type.setId(UUIDUtil.getUUID());
+					type.setObjectId(pdf.getId());
+					type.setDtId(diyType.getId());
+					type.setCode(diyType.getCode());
+					type.setResourceType(15);
+					diyTypeMapper.insertSelective(type);
+				}
+				//商品信息
+				PdfGoods goods = new PdfGoods();
+				goods.setObjectId(pdf.getId());
+				pdfGoodsMapper.insertSelective(goods);
+				//添加法规信息
 				StatuteLibrary obj = new StatuteLibrary();
 				BeanUtils.copyProperties(form, obj);
 				obj.setName(form.getNames().get(i));