Source/UBCS-WEB/vue.config.js
@@ -26,8 +26,8 @@ proxy: { '/api': { //本地服务接口地址 //target: 'http://localhost:37000', target: 'http://dev.vci-tech.com:37000', target: 'http://localhost:37000', //target: 'http://dev.vci-tech.com:37000', //远程演示服务地址,可用于直接启动项目 //target: 'https://saber.bladex.vip/api', ws: true, Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessTemp.java
@@ -1,5 +1,6 @@ package com.vci.ubcs.code.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.vci.ubcs.code.vo.pagemodel.BaseModelVO; import com.vci.ubcs.starter.revision.model.BaseModel; @@ -47,6 +48,7 @@ * 流程模板用途显示名称 */ //@Transient @TableField(exist = false) private String codeProcessUseText; /** Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java
@@ -1,6 +1,7 @@ package com.vci.ubcs.code.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO; import com.vci.ubcs.code.entity.CodeClassifyProcessTemp; @@ -45,11 +46,11 @@ * @return 分类使用的流程模板显示对象列表 */ @GetMapping("/gridCodeClassifyProcessTemp") public DataGrid<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(BaseQueryObject baseQueryObject){ public R<IPage<CodeClassifyProcessTempVO>> gridCodeClassifyProcessTemp(BaseQueryObject baseQueryObject){ if(baseQueryObject == null){ baseQueryObject = new BaseQueryObject(); } return codeClassifyProcessTempService.gridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()); return R.data(codeClassifyProcessTempService.gridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper())); } /** @@ -112,11 +113,11 @@ * @return 分类使用的流程模板显示对象列表，生效的内容 */ @GetMapping("/refDataGrid") public DataGrid<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(BaseQueryObject baseQueryObject){ public R<IPage<CodeClassifyProcessTempVO>> refDataGridCodeClassifyProcessTemp(BaseQueryObject baseQueryObject){ if(baseQueryObject == null){ baseQueryObject = new BaseQueryObject(); } return codeClassifyProcessTempService.refDataGridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()); return R.data(codeClassifyProcessTempService.refDataGridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper())); } /** Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyProcessTempService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO; import com.vci.ubcs.code.entity.CodeClassifyProcessTemp; @@ -32,7 +33,7 @@ * @return 执行结果 * @throws VciBaseException 查询条件和分页出错的时候会抛出异常 */ DataGrid<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; IPage<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; /** * 批量数据对象转换为显示对象 @@ -97,7 +98,7 @@ * @return 分类使用的流程模板显示对象列表，生效的内容 * @throws VciBaseException 查询条件和分页出错的时候会抛出异常 */ DataGrid<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; IPage<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException; /** * 获取流程的模板的信息 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>(); }
