Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java

@@ -13,9 +13,9 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import java.util.*;
@@ -54,7 +54,16 @@
   @GetMapping(GET_REF_PAGE)
   @Override
   public R<IPage<RevisionRuleVO>> getRefPage(BaseQueryObject baseQueryObject) {
      return R.data(service.pageQueryVO(baseQueryObject));
      Map<String, String> conditionMap = baseQueryObject.getConditionMap();
      if (conditionMap == null){
         conditionMap = new HashMap<>();
      }
      Query query = new Query();
      query.setSize(baseQueryObject.getLimit());
      query.setCurrent(baseQueryObject.getPage());
      Map<String,Object> condition = new HashMap<>();
      BeanUtil.copy(conditionMap,condition);
      return R.data(service.pageQueryVO(condition,query));
   }

   /**
@@ -78,8 +87,8 @@
    * @return 业务对象
    */
   @Override
   @GetMapping(GET_BY_IDS)
   public R<List<RevisionRuleVO>> selectByIdCollection(List<String> ids) {
   @PostMapping(GET_BY_IDS)
   public R<List<RevisionRuleVO>> selectByIdCollection(@RequestBody List<String> ids) {
      return R.data(service.listRevisionRuleByIdCollection(ids));
   }

@@ -94,4 +103,15 @@
   public R<List<RevisionRuleVO>> listBtmTypeByOidCollection(Collection<String> oidCollection) {
      return R.data(service.listRevisionRuleByOidCollection(oidCollection));
   }

   /**
    * 根据id获取版本规则
    * @param id
    * @return
    */
   @Override
   public R<RevisionRuleVO> selectById(@RequestParam("id") String id) {
      return R.data(service.getReversionRuleById(id));
   }

}