country_card-管理发布-发布或撤回接口。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java

@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO;
@@ -170,4 +172,17 @@ public class CountryCardManageReleaseEOController extends JeroController<Country
         return super.importExcel(request, response, CountryCardManageReleaseEO.class);
     }
 
+
+	 /**
+	  * 更新状态  发布或撤回
+	  * @param json
+	  * @return
+	  */
+	 @AutoLog(value = "问题知识库-country_card-管理发布表-发布或撤回")
+	 @ApiOperation(value="问题知识库-country_card-管理发布表-发布或撤回", notes="问题知识库-country_card-管理发布表-发布或撤回")
+	 @PostMapping(value = "/batchUpdateReleaseStatus")
+	 public Result<?> batchUpdateReleaseStatus(@RequestBody JSONObject json) {
+	 	 this.countryCardManageReleaseEOService.batchUpdateReleaseStatus(json);
+		 return Result.OK("批量更新发布状态成功!");
+	 }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java

@@ -54,6 +54,7 @@ public class CountryCardTempEOController extends JeroController<CountryCardTempE
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<CountryCardTempEO> queryWrapper = QueryGenerator.initQueryWrapper(countryCardTempEO, req.getParameterMap());
+		queryWrapper.orderByAsc("order_num");
 		Page<CountryCardTempEO> page = new Page<CountryCardTempEO>(pageNo, pageSize);
 		IPage<CountryCardTempEO> pageList = countryCardTempEOService.page(page, queryWrapper);
 		this.countryCardTempEOService.disposeData(pageList.getRecords(),countryCardTempEO.getCut());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java

@@ -53,6 +53,7 @@ public class ProblemKnowledgeBaseClassifyEOController extends JeroController<Pro
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<ProblemKnowledgeBaseClassifyEO> queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseClassifyEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		Page<ProblemKnowledgeBaseClassifyEO> page = new Page<ProblemKnowledgeBaseClassifyEO>(pageNo, pageSize);
 		IPage<ProblemKnowledgeBaseClassifyEO> pageList = problemKnowledgeBaseClassifyEOService.page(page, queryWrapper);
 		return Result.OK(pageList);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java

@@ -53,6 +53,7 @@ public class ProblemKnowledgeBaseCommentEOController extends JeroController<Prob
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<ProblemKnowledgeBaseCommentEO> queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseCommentEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		Page<ProblemKnowledgeBaseCommentEO> page = new Page<ProblemKnowledgeBaseCommentEO>(pageNo, pageSize);
 		IPage<ProblemKnowledgeBaseCommentEO> pageList = problemKnowledgeBaseCommentEOService.page(page, queryWrapper);
 		return Result.OK(pageList);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java

@@ -53,6 +53,7 @@ public class ProblemKnowledgeBaseEOController extends JeroController<ProblemKnow
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<ProblemKnowledgeBaseEO> queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		Page<ProblemKnowledgeBaseEO> page = new Page<ProblemKnowledgeBaseEO>(pageNo, pageSize);
 		IPage<ProblemKnowledgeBaseEO> pageList = problemKnowledgeBaseEOService.page(page, queryWrapper);
 		this.problemKnowledgeBaseEOService.disposeData(pageList.getRecords(),problemKnowledgeBaseEO.getCut());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempEO.java

@@ -73,6 +73,8 @@ public class CountryCardTempEO implements Serializable {
 	@Excel(name = "标签类型", width = 15)
     @ApiModelProperty(value = "标签类型")
     private java.lang.String lableType;
+	@TableField(exist = false)
+    private java.lang.String lableType_dicText;
 
 	/**展示顺序*/
 	@Excel(name = "展示顺序", width = 15)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java

@@ -8,8 +8,8 @@ import org.apache.commons.lang3.StringUtils;
  */
 public enum ReleaseStatusEnum {
 
-    HAVE_RELEASED("已发布","Have released","have released"),
+    HAVE_RELEASED("已发布","Have released","Have released"),
-    DRAFT("草稿","Draft","draft"),
+    DRAFT("草稿","Draft","Draft"),
     ;
 
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java

@@ -1,5 +1,6 @@
 package com.jero.modules.problemKnowledgeBase.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
@@ -65,4 +66,10 @@ public interface ICountryCardManageReleaseEOService extends IService<CountryCard
 	 * @param cut
 	 */
     void disposeData(List<CountryCardManageReleaseEO> datas, String cut);
+
+	/**
+	 * 批量更新发布状态
+	 * @param json
+	 */
+    void batchUpdateReleaseStatus(JSONObject json);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jero.modules.problemKnowledgeBase.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO;
@@ -12,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Date;
 import java.util.stream.Collectors;
@@ -142,4 +144,19 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
 			});
 		}
 	}
+
+	@Override
+	public void batchUpdateReleaseStatus(JSONObject json) {
+		String ids = json.getString("ids");
+		String releaseStatus = json.getString("releaseStatus");
+
+		QueryWrapper<CountryCardManageReleaseEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(CountryCardManageReleaseEO::getId,Arrays.asList(ids.split(",")));
+		List<CountryCardManageReleaseEO> countryCardManageReleaseEOList = this.list(queryWrapper);
+		countryCardManageReleaseEOList.forEach(countryCardManageReleaseEO -> {
+			countryCardManageReleaseEO.setReleaseStatus(releaseStatus);
+		});
+
+		this.updateBatchById(countryCardManageReleaseEOList);
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java

@@ -118,6 +118,7 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl<CountryCardTempEOM
 	@Override
     public List<CountryCardTempEO> queryList(CountryCardTempEO countryCardTempEO, HttpServletRequest req) {
 		QueryWrapper<CountryCardTempEO> queryWrapper = QueryGenerator.initQueryWrapper(countryCardTempEO, req.getParameterMap());
+		queryWrapper.orderByAsc("order_num");
 		List<CountryCardTempEO> result = this.list(queryWrapper);
 		return result;
     }
@@ -144,6 +145,10 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl<CountryCardTempEOM
 
 					countryCardTemp.setCountryCardTempItemEOList(collect);
 				}
+
+				if(StringUtils.isNotEmpty(countryCardTemp.getLableType())){
+					countryCardTemp.setLableType_dicText(LableTypeEnum.getTextByValue(countryCardTemp.getLableType(),cut));
+				}
 			});
 		}
 	}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java

@@ -92,6 +92,7 @@ public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl<Proble
 	@Override
     public List<ProblemKnowledgeBaseCommentEO> queryList(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO, HttpServletRequest req) {
 		QueryWrapper<ProblemKnowledgeBaseCommentEO> queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseCommentEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		List<ProblemKnowledgeBaseCommentEO> result = this.list(queryWrapper);
 		return result;
     }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java

@@ -129,6 +129,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
     public List<ProblemKnowledgeBaseEO> queryList(ProblemKnowledgeBaseEO problemKnowledgeBaseEO,
 												  HttpServletRequest req) {
 		QueryWrapper<ProblemKnowledgeBaseEO> queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		List<ProblemKnowledgeBaseEO> result = this.list(queryWrapper);
 		this.disposeData(result,problemKnowledgeBaseEO.getCut());
 		return result;