--no commit message

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

 package com.zrqx.core.form.resource.bg.audiolibrary;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.List;
+
 import lombok.Data;
 @Data
 @ApiModel(value="BatchUpdateAudioLibraryForm",description="批量修改音频")
@@ -17,7 +19,7 @@ public class BatchUpdateAudioLibraryForm {
 	@ApiModelProperty(value = "自定义分类code")
 	private List<String> diyTypeCode;
 	@ApiModelProperty("售价 ")
-	private String sellingPrice;
+	private BigDecimal sellingPrice;
 	@ApiModelProperty("价格状态 1:付费  2:免费")
 	private Integer priceType;
 }

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

@@ -38,7 +38,7 @@ public class SaveUpdateClauseLibraryForm {
 	@ApiModelProperty("所属部门")
 	private String department;
 	@ApiModelProperty("所属部门")
-	private String departmentId;
+	private Integer departmentId;
 	@ApiModelProperty("关键词")
 	private String keyword;
 	@ApiModelProperty("PDF")

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/coursewarelibrary/BatchUpdateCoursewareLibraryForm.java

 package com.zrqx.core.form.resource.bg.coursewarelibrary;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.List;
+
 import lombok.Data;
 @Data
 @ApiModel(value="BatchUpdateCoursewareLibraryForm",description="批量修改课件")
@@ -17,7 +19,7 @@ public class BatchUpdateCoursewareLibraryForm {
 	@ApiModelProperty("自定义分类code")
 	private List<String> diyTypeCode;
 	@ApiModelProperty("售价 ")
-	private String sellingPrice;
+	private BigDecimal sellingPrice;
 	@ApiModelProperty("价格状态 1:付费  2:免费")
 	private Integer priceType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/imagelibrary/BatchUpdateImageLibraryForm.java

 package com.zrqx.core.form.resource.bg.imagelibrary;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.List;
+
 import lombok.Data;
 @Data
 @ApiModel(value="BatchUpdateImageLibraryForm",description="批量修改图片")
@@ -17,7 +19,7 @@ public class BatchUpdateImageLibraryForm {
 	@ApiModelProperty("自定义分类code")
 	private List<String> diyTypeCode;
 	@ApiModelProperty("售价 ")
-	private String sellingPrice;
+	private BigDecimal sellingPrice;
 	@ApiModelProperty("价格状态 1:付费  2:免费")
 	private Integer priceType;
 	

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/pdflibrary/BatchUpdatePdfLibraryForm.java

 package com.zrqx.core.form.resource.bg.pdflibrary;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.List;
+
 import lombok.Data;
 @Data
 @ApiModel(value="BatchUpdatePdfLibraryForm",description="批量修改pdf")
@@ -17,7 +19,7 @@ public class BatchUpdatePdfLibraryForm {
 	@ApiModelProperty(value = "自定义分类code")
 	private List<String> diyTypeCode;
 	@ApiModelProperty("售价 ")
-	private String sellingPrice;
+	private BigDecimal sellingPrice;
 	@ApiModelProperty("价格状态 1:付费  2:免费")
 	private Integer priceType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/videolibrary/BatchUpdateVideoLibraryForm.java

@@ -3,6 +3,7 @@ package com.zrqx.core.form.resource.bg.videolibrary;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import lombok.Data;
@@ -19,7 +20,7 @@ public class BatchUpdateVideoLibraryForm {
 	@ApiModelProperty(value = "自定义分类code")
 	private List<String> diyTypeCode;
 	@ApiModelProperty("售价 ")
-	private String sellingPrice;
+	private BigDecimal sellingPrice;
 	@ApiModelProperty("价格状态 1:付费  2:免费")
 	private Integer priceType;
 

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

@@ -46,7 +46,7 @@ public class ClauseLibrary {
 	@ApiModelProperty("所属部门")
 	private String department;
 	@ApiModelProperty("所属部门")
-	private String departmentId;
+	private Integer departmentId;
 	@ApiModelProperty("关键词")
 	private String keyword;
 	@ApiModelProperty("PDF")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/audiolibrary/AudioLibraryController.java

@@ -103,7 +103,7 @@ public class AudioLibraryController {
 			cr.andEqualTo("objectId", str);
 			AudioGoods entity = audioGoodsService.selectOneByCriteria();
 			if(entity!=null){
-				entity.setSellingPrice(new BigDecimal(form.getSellingPrice()));
+				entity.setSellingPrice(form.getSellingPrice());
 				entity.setPriceType(form.getPriceType());
 				audioGoodsService.updateByCriteria(entity);
 			}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/coursewarelibrary/CoursewareLibraryController.java

@@ -102,7 +102,7 @@ public class CoursewareLibraryController {
 			cr.andEqualTo("objectId", str);
 			CoursewareGoods entity = goodsService.selectOneByCriteria();
 			if(entity!=null){
-				entity.setSellingPrice(new BigDecimal(form.getSellingPrice()));
+				entity.setSellingPrice(form.getSellingPrice());
 				entity.setPriceType(form.getPriceType());
 				goodsService.updateByCriteria(entity);
 			}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/imagelibrary/ImageLibraryController.java

@@ -108,7 +108,7 @@ public class ImageLibraryController {
 			cr.andEqualTo("objectId" , str);
 			ImageGoods entity = goodsService.selectOneByCriteria();
 			if(entity!=null){
-				entity.setSellingPrice(new BigDecimal(form.getSellingPrice()));
+				entity.setSellingPrice(form.getSellingPrice());
 				entity.setPriceType(form.getPriceType());
 				goodsService.updateByCriteria(entity);
 			}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/pdflibrary/PdfLibraryController.java

@@ -102,7 +102,7 @@ public class PdfLibraryController {
 			cr.andEqualTo("objectId",str);
 			PdfGoods entity = goodsService.selectOneByCriteria();
 			if(entity!=null){
-				entity.setSellingPrice(new BigDecimal(form.getSellingPrice()));
+				entity.setSellingPrice(form.getSellingPrice());
 				entity.setPriceType(form.getPriceType());
 				goodsService.updateByCriteria(entity);
 			}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/series/SeriesController.java

@@ -119,17 +119,6 @@ public class SeriesController {
 		return CallBack.success(service.selectAll());
 	}
 
-	@ApiOperation(value = "名字是否已存在", notes = "名字是否已存在")
-	@GetMapping(value = ResourceRequestPath.ISEXIST)
-	public CallBack<Boolean> isExist(String name) {
-		service.createCriteria().andEqualTo("seriesName", name);
-		Series series = service.selectOneByCriteria();
-		if(series!=null){
-			throw new BaseException(ResponseCodeEnum.REPEST);
-		}
-		return CallBack.success();
-	}
-
 	@ApiOperation(value = "批量导入丛书", notes = "批量导入丛书")
 	@PostMapping(value = ResourceRequestPath.IMPORT, produces = "application/json;charset=UTF-8")
 	public CallBack<String> importSeries(@RequestParam("file") MultipartFile file) throws Exception {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/videolibrary/VideoLibraryController.java

@@ -105,7 +105,7 @@ public class VideoLibraryController {
 			cr.andEqualTo("objectId", str);
 			VideoGoods entity = goodsService.selectOneByCriteria();
 			if(entity!=null){
-				entity.setSellingPrice(new BigDecimal(form.getSellingPrice()));
+				entity.setSellingPrice(form.getSellingPrice());
 				entity.setPriceType(form.getPriceType());
 				goodsService.updateByCriteria(entity);
 			}