--no commit message

com.zrqx.resource/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

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

 package com.zrqx.resource.bg.controller.articlelibrary;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -76,7 +77,8 @@ public class ArticleLibraryController {
 		}
 		return CallBack.success();
 	}
-
+	
+	
 	@ApiOperation(value = "批量审核", notes = "批量审核")
 	@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_STATUS)
 	public CallBack<Boolean> updateArray(@RequestBody List<Integer> ids) {
@@ -89,20 +91,33 @@ public class ArticleLibraryController {
 		}
 		return CallBack.success();
 	}
-
+	
+	@ApiOperation(value = "批量修改阅读权限", notes = "批量修改阅读权限")
+	@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_READ)
+	public CallBack<Boolean> updateReadTextPower(@RequestBody BatchUpdateArticleLibraryForm form) {
+		Criteria cr = service.createCriteria();
+		cr.andIn("id", form.getIds());
+		ArticleLibrary entity = new ArticleLibrary();
+		entity.setReadTextPower(form.getReadTextPower());
+		if (!service.updateByCriteriaSelective(entity)) {
+			throw new BaseException(ResponseCodeEnum.FAIL);
+		}
+		return CallBack.success();
+	}
+	
 	@ApiOperation(value = "批量修改价格", notes = "批量修改价格")
 	@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_PRICE)
 	public CallBack<Boolean> updatePrice(@RequestBody BatchUpdateArticleLibraryForm form) {
 		Criteria cr = service.createCriteria();
 		cr.andIn("id", form.getIds());
 		ArticleLibrary entity = new ArticleLibrary();
-		entity.setPrice(form.getPrice());
+		entity.setRealPrice(new BigDecimal(form.getRealPrice()));
 		if (!service.updateByCriteriaSelective(entity)) {
 			throw new BaseException(ResponseCodeEnum.FAIL);
 		}
 		return CallBack.success();
 	}
-
+	
 	@ApiOperation(value = "批量修改分类", notes = "批量修改分类")
 	@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_DIYTIPE)
 	public CallBack<Boolean> updateDivType(@RequestBody BatchUpdateArticleLibraryForm form) {

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

@@ -14,11 +14,22 @@ import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
  * 文章库
  */
 public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
+	/**
+	 * 后台 10种文章列表页查询
+	 * @param form
+	 * @return
+	 */
 	@Select("<script>" 
 			+ "select distinct a.id,a.title,a.author,a.bookName,a.price,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status "
 			+ "from res_Article_Library a left join res_Article_Library_Diy_Type ad "
 			+ "on a.id = ad.alid "
 			+ "where 1=1 "
+			+ "<if test='form.nationsType != null' >"  
+			+ "and a.nationsType = #{form.nationsType} "
+			+ "</if>" 
+			+ "<if test='form.articleType != null' >"  
+		    + "and a.articleType = #{form.articleType} "
+		    + "</if>" 
 			+ "<if test='form.diyTypeCode != null and form.diyTypeCode != \"\"'>"  
 		    + "and ad.code like concat(#{form.diyTypeCode},'%') "                  
 		    + "</if>"