|
@@ -2,6 +2,7 @@ package com.persagy.dmp.dic.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
|
import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
|
|
|
import com.persagy.dmp.common.constant.ResponseCode;
|
|
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -31,6 +33,9 @@ public class DictDataController {
|
|
|
@Autowired
|
|
|
private DictDataService service;
|
|
|
|
|
|
+ private static final String STATUS="status";
|
|
|
+ private static final String VALID="valid";
|
|
|
+
|
|
|
@Deprecated
|
|
|
@PostMapping("/query")
|
|
|
public CommonResult<List<DictData>> query(@RequestBody QueryCriteria criteria) {
|
|
@@ -38,6 +43,14 @@ public class DictDataController {
|
|
|
throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
|
|
|
}
|
|
|
QueryWrapper<DictData> wrapper = new QueryWrapper<>();
|
|
|
+ ObjectNode objCriteria = criteria.getCriteria();
|
|
|
+ if (null!=objCriteria && objCriteria.size()>0){
|
|
|
+ // 2021年8月18日19:29:32 兼容旧的逻辑.因为字段改为valid了
|
|
|
+ if(objCriteria.has(STATUS)){
|
|
|
+ objCriteria.put(VALID,objCriteria.get(STATUS));
|
|
|
+ objCriteria.remove(STATUS);
|
|
|
+ }
|
|
|
+ }
|
|
|
// 转换查询条件
|
|
|
QueryCriteriaHelper.toWrapper(wrapper, criteria);
|
|
|
Page page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
|