--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/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/util/LogUtils.java

@@ -88,6 +88,7 @@ public class LogUtils {
 		log.setResourceId(resourceId.toString());
 		//针对资源id隐藏在form表单中的
 		if(resourceId.length()==0) {
+			if(args.length>0){
 			String[] fieldNames = getFiledName(args[0]);
 			for (int j = 0; j < fieldNames.length; j++) { // 遍历所有属性
 				String name = fieldNames[j]; // 获取属性的名字
@@ -106,8 +107,7 @@ public class LogUtils {
 				}
 			}
 		}
-	
-
+		}
 		return log;
 	}
 

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/achievementLibrary/AchievementLibraryController.java

@@ -53,7 +53,7 @@ import com.zrqx.core.util.UUIDUtil;
 import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.achievementLibrary.AchievementLibraryListVo;
 import com.zrqx.core.vo.resource.achievementLibrary.AchievementLibraryOneVo;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.achievementLibrary.AchievementGoodsService;
 import com.zrqx.resource.bg.service.achievementLibrary.AchievementLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.achievementLibrary.AchievementLibraryLabelService;
@@ -86,7 +86,7 @@ public class AchievementLibraryController {
 	@Autowired
 	private AchievementResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private VideoLibraryService videoLibraryService;
 	@Autowired

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/animationlibrary/AnimationLibraryController.java

@@ -49,7 +49,7 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.animationlibrary.AnimationLibraryListVO;
 import com.zrqx.core.vo.resource.animationlibrary.AnimationLibraryOneVO;
 import com.zrqx.core.vo.resource.label.LabelAndContentByDataTypeVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.animationlibrary.AnimationGoodsService;
 import com.zrqx.resource.bg.service.animationlibrary.AnimationLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.animationlibrary.AnimationLibraryLabelService;
@@ -72,7 +72,7 @@ public class AnimationLibraryController {
 	@Autowired
 	private AnimationResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private AnimationLibraryLabelService labelService;
 	@Autowired

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/articlelibrary/ArticleLibraryController.java

@@ -49,7 +49,7 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryOneVO;
 import com.zrqx.core.vo.resource.label.LabelAndContentByDataTypeVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleGoodsService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryLabelService;
@@ -75,7 +75,7 @@ public class ArticleLibraryController {
 	@Autowired
 	private ArticleResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private ArticleLibraryLabelService labelService;
 	@Autowired

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

@@ -47,7 +47,7 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.audiolibrary.AudioLibraryListVO;
 import com.zrqx.core.vo.resource.audiolibrary.AudioLibraryOneVO;
 import com.zrqx.core.vo.resource.label.LabelAndContentByDataTypeVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.audiolibrary.AudioGoodsService;
 import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryLabelService;
@@ -70,7 +70,7 @@ public class AudioLibraryController {
 	@Autowired
 	private AudioResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private AudioLibraryLabelService labelService;
 	@Autowired
@@ -124,7 +124,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/clauseLibrary/ClauseLibraryController.java

@@ -52,7 +52,7 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.clauseLibrary.ClauseLibraryListVo;
 import com.zrqx.core.vo.resource.clauseLibrary.ClauseLibraryOneVo;
 import com.zrqx.core.vo.resource.label.LabelAndContentByDataTypeVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryService;
 import com.zrqx.resource.bg.service.clauseLibrary.ClauseGoodsService;
 import com.zrqx.resource.bg.service.clauseLibrary.ClauseLibraryDiyTypeService;
@@ -85,7 +85,7 @@ public class ClauseLibraryController {
 	@Autowired
 	private ClauseResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private LabelContentDiyTypeService labelContentDiyTypeService;
 	@Autowired

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/criterionLibrary/CriterionLibraryController.java

@@ -50,7 +50,7 @@ import com.zrqx.core.util.UUIDUtil;
 import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.criterionLibrary.CriterionLibraryListVo;
 import com.zrqx.core.vo.resource.criterionLibrary.CriterionLibraryOneVo;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryService;
 import com.zrqx.resource.bg.service.criterionLibrary.CriterionLibraryService;
 import com.zrqx.resource.bg.service.criterionLibrary.CriterionGoodsService;
@@ -82,7 +82,7 @@ public class CriterionLibraryController {
 	@Autowired
 	private CriterionResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private VideoLibraryService videoLibraryService;
 	@Autowired

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebooklibrary/EbookLibraryController.java

@@ -71,7 +71,7 @@ import com.zrqx.core.vo.resource.ebook.EpubVo;
 import com.zrqx.core.vo.resource.ebook.ImportExcelBookVO;
 import com.zrqx.core.vo.resource.label.LabelAndContentByDataTypeVO;
 import com.zrqx.resource.bg.mapper.imagelibrary.ImageGoodsMapper;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.animationlibrary.AnimationLibraryService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryService;
@@ -138,7 +138,7 @@ public class EbookLibraryController {
 	@Autowired
 	private BookResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private VideoLibraryService videoLibraryService;
 	@Autowired

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

@@ -53,7 +53,7 @@ import com.zrqx.core.vo.resource.imagelibrary.ImageLibraryOneVO;
 import com.zrqx.core.vo.resource.label.LabelAndContentByDataTypeVO;
 import com.zrqx.core.vo.resource.label.LabelContentDiyTypeVO;
 import com.zrqx.resource.bg.mapper.label.LabelContentDiyTypeMapper;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.imagelibrary.ImageGoodsService;
 import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryDiyTypeRelationService;
 import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryLabelService;
@@ -79,7 +79,7 @@ public class ImageLibraryController {
 	@Autowired
 	private ImageResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired 
 	private ImageGoodsService goodsService;
 	@Autowired
@@ -128,7 +128,7 @@ public class ImageLibraryController {
 				if(form.getSellingPrice().equals("")){
 					entity.setSellingPrice(null);
 				}else{
-					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/paperLibrary/PaperLibraryController.java

@@ -42,7 +42,7 @@ import com.zrqx.core.util.PageParam;
 import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.paperLibrary.PaperLibraryListVo;
 import com.zrqx.core.vo.resource.paperLibrary.PaperLibraryOneVo;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.paperLibrary.PaperGoodsService;
 import com.zrqx.resource.bg.service.paperLibrary.PaperLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.paperLibrary.PaperLibraryLabelService;
@@ -68,7 +68,7 @@ public class PaperLibraryController {
 	@Autowired
 	private PaperResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 
 	@ApiOperation(value = "新增", notes = "新增一个")
 	@PostMapping(value = ResourceRequestPath.SAVE)

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/patentLibrary/PatentLibraryController.java

@@ -51,7 +51,7 @@ import com.zrqx.core.util.UUIDUtil;
 import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.patentLibrary.PatentLibraryListVo;
 import com.zrqx.core.vo.resource.patentLibrary.PatentLibraryOneVo;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryService;
 import com.zrqx.resource.bg.service.patentLibrary.PatentLibraryService;
 import com.zrqx.resource.bg.service.patentLibrary.PatentGoodsService;
@@ -83,7 +83,7 @@ public class PatentLibraryController {
 	@Autowired
 	private PatentResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private VideoLibraryService videoLibraryService;
 	@Autowired

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

@@ -45,7 +45,7 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.label.LabelAndContentByDataTypeVO;
 import com.zrqx.core.vo.resource.pdflibrary.PdfLibraryListVO;
 import com.zrqx.core.vo.resource.pdflibrary.PdfLibraryOneVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.label.LabelContentDiyTypeService;
 import com.zrqx.resource.bg.service.pdflibrary.PdfGoodsService;
 import com.zrqx.resource.bg.service.pdflibrary.PdfLibraryDiyTypeService;
@@ -74,7 +74,7 @@ public class PdfLibraryController {
 	@Autowired
 	private PdfResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private LabelContentDiyTypeService labelContentDiyTypeService;
 	
@@ -123,7 +123,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/periodical/PeriodVolumeLibraryController.java

@@ -33,7 +33,7 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.ebook.EpubVo;
 import com.zrqx.core.vo.resource.periodicel.PeriodVolumeListVO;
 import com.zrqx.core.vo.resource.periodicel.PeriodVolumeVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.paperLibrary.PaperLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.periodical.PeriodVolumeResourceService;
 import com.zrqx.resource.bg.service.periodical.PeriodVolumeService;
@@ -54,7 +54,7 @@ public class PeriodVolumeLibraryController {
 	@Autowired
 	private PeriodVolumeService volumeService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private PeriodVolumeResourceService resourceService;
 	@Autowired

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/recycleBin/RecycleBinController.java

@@ -63,7 +63,7 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.recycleBin.ExcleRecycleBinResourceVo;
 import com.zrqx.core.vo.resource.recycleBin.ResourceRecycleBinListVO;
 import com.zrqx.core.vo.resource.recycleBin.ResourceRecycleBinOneVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.achievementLibrary.AchievementGoodsService;
 import com.zrqx.resource.bg.service.achievementLibrary.AchievementLibraryService;
 import com.zrqx.resource.bg.service.animationlibrary.AnimationGoodsService;
@@ -157,7 +157,7 @@ public class RecycleBinController {
 	@Autowired
 	private RecycleBinResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private BookService bookservice;
 	@Autowired

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

@@ -47,7 +47,7 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.label.LabelAndContentByDataTypeVO;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryOneVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
+import com.zrqx.resource.bg.service.ResourceRelationVoService;
 import com.zrqx.resource.bg.service.label.LabelContentDiyTypeService;
 import com.zrqx.resource.bg.service.videolibrary.VideoGoodsService;
 import com.zrqx.resource.bg.service.videolibrary.VideoLibraryDiyTypeService;
@@ -72,7 +72,7 @@ public class VideoLibraryController {
 	@Autowired
 	private VideoResourceService resourceService;
 	@Autowired
-	private ResourceRelationService resourceRelationService;
+	private ResourceRelationVoService resourceRelationService;
 	@Autowired
 	private VideoGoodsService goodsService;
 	@Autowired
@@ -126,7 +126,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);
 			}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ResourceRelationService.java → com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ResourceRelationVoService.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.zrqx.core.vo.resource.ResourceRelationVo;
 
-public interface ResourceRelationService {
+public interface ResourceRelationVoService {
 
 	List<ResourceRelationVo> queryRelationList(List<ResourceRelationVo> list);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ResourceRelationServiceImpl.java → com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ResourceRelationVoServiceImpl.java

@@ -31,7 +31,7 @@ import com.zrqx.resource.bg.mapper.statuteLibrary.StatuteLibraryMapper;
 import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryMapper;
 
 @Service
-public class ResourceRelationServiceImpl implements ResourceRelationService {
+public class ResourceRelationVoServiceImpl implements ResourceRelationVoService {
 	@Autowired
 	private ArticleLibraryMapper articleLibraryMapper;
 	@Autowired