Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java

@@ -25,6 +25,8 @@
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeRuleWrapper;

import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -66,24 +68,14 @@
   }

   /**
    * 编码规则 分页
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入codeRuleVO")
   public R<IPage<CodeRuleVO>> list(CodeRule codeRule, Query query) {
      IPage<CodeRule> pages = codeRuleService.page(Condition.getPage(query), Condition.getQueryWrapper(codeRule));
      return R.data(CodeRuleWrapper.build().pageVO(pages));
   }

   /**
    * 编码规则 自定义分页
    * @return baseQueryObject
    */
   @GetMapping("/gridCodeRule")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入CodeRule")
   public R<IPage<CodeRuleVO>> gridCodeRule(CodeRuleVO CodeRule, Query query) {
      IPage<CodeRuleVO> pages = codeRuleService.gridCodeRule(Condition.getPage(query.setDescs("CREATETIME")), CodeRule);
   public R<IPage<CodeRuleVO>> gridCodeRule(BladeQueryObject bladeQueryObject) {
      IPage<CodeRuleVO> pages = codeRuleService.gridCodeRule(bladeQueryObject.getQuery().setDescs("CREATETIME"), bladeQueryObject.getConditionMap());
      return R.data(pages);
   }

@@ -151,15 +143,14 @@

   /**
    * 参照主数据编码规则列表
    * @param CodeRule
    * @param query
    * @param bladeQueryObject
    * @return 主数据编码规则显示对象列表，生效的内容
    */
   @GetMapping("/refDataGrid")
   @ApiOperationSupport(order = 10)
   @ApiOperation(value = "参照主数据编码规则列表", notes = "传入oids")
   public R<IPage<CodeRuleVO>> refDataGridCodeRule(CodeRuleVO CodeRule, Query query){
      return R.data(codeRuleService.refDataGridCodeRule(Condition.getPage(query),CodeRule));
   public R<IPage<CodeRuleVO>> refDataGridCodeRule(BladeQueryObject bladeQueryObject){
      return R.data(codeRuleService.refDataGridCodeRule(bladeQueryObject));
   }

   /**