From c2c0c9370a72d253c624ff11d630d27c9cd0040d Mon Sep 17 00:00:00 2001 From: ludc Date: 星期一, 09 十月 2023 15:34:25 +0800 Subject: [PATCH] 主数据排序改为按id排序 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java index 9ebdb8f..1cc49df 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java @@ -5,6 +5,7 @@ import com.alibaba.nacos.common.utils.StringUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO; import com.vci.ubcs.code.dto.CodeDeleteBatchDTO; import com.vci.ubcs.code.dto.CodeExportAttrDTO; import com.vci.ubcs.code.dto.CodeOrderDTO; @@ -237,6 +238,7 @@ file1.delete(); } } + /** * 瀵煎叆鍘嗗彶鏁版嵁 * @param codeClassifyOid 鍒嗙被鐨勪富閿� @@ -277,7 +279,6 @@ R r = R.fail("瀵煎叆澶辫触"); r.setData(codeImProtRusultVO); - return r; }finally { @@ -657,7 +658,6 @@ return engineService.getFlowUIInfoByClassifyOid(codeClassifyOid,functionId,templateId,taskId,modelKey); } - @GetMapping("/thisistest") @ResponseBody public Integer thisistest(String codeClassifyOid, String functionId) throws Exception { @@ -725,8 +725,8 @@ * @param referConfigVO 鍙傜収鐨勯厤缃俊鎭� * @return 鎵ц鐨勭粨鏋� */ - @GetMapping("/defaultReferDataGrid") - public IPage<BaseModel> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){ + @RequestMapping(value = "/defaultReferDataGrid",method = {RequestMethod.POST, RequestMethod.GET}) + public IPage<BaseModelVO> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){ return engineService.referDataGrid(referConfigVO,baseQueryObject); } -- Gitblit v1.9.3