Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
@@ -68,7 +69,7 @@
    * @throws VciBaseException 查询条件和分页出错的时候会抛出异常
    */
   @Override
   public DataGrid<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
   public IPage<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
      Query query = new Query();
      if (pageHelper == null) {
         pageHelper = new PageHelper(-1);
@@ -81,14 +82,17 @@
      CodeClassifyProcessTemp codeClassifyProcessTemp = new CodeClassifyProcessTemp();
      BeanMap beanMap = BeanMap.create(codeClassifyProcessTemp);
      beanMap.putAll(conditionMap);

      IPage<CodeClassifyProcessTemp> doList = codeClassifyProcessTempMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeClassifyProcessTemp));
      DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
      IPage<CodeClassifyProcessTempVO> pageList = new Page<CodeClassifyProcessTempVO>();
      //DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
      if (!CollectionUtils.isEmpty(doList.getRecords())) {
         dataGrid.setData(codeClassifyProcessTempDO2VOs(doList.getRecords()));
         dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeClassifyProcessTempMapper.selectCount(Condition.getQueryWrapper(codeClassifyProcessTemp)))));
         pageList.setRecords(codeClassifyProcessTempDO2VOs(doList.getRecords()));
         pageList.setTotal(doList.getTotal());
         pageList.setSize(doList.getSize());
         pageList.setCurrent(doList.getCurrent());
         pageList.setPages(doList.getPages());
      }
      return dataGrid;
      return pageList;
   }

   /**
@@ -224,7 +228,7 @@
    * @throws VciBaseException 查询条件和分页出错的时候会抛出异常
    */
   @Override
   public DataGrid<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
   public IPage<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
      if(conditionMap == null){
         conditionMap = new HashMap<String, String>();
      }