From f02c15e434ffbc248b55d9d14e104c7d8556062b Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期五, 28 四月 2023 11:42:42 +0800 Subject: [PATCH] 1、主要完成主题库定义的模板分类的接口移植。 2、主要对界面字数多了换行问题进行了修改。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java | 68 ++++++++++++++++++++++++++++------ 1 files changed, 56 insertions(+), 12 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java index 4f61b25..db94cd2 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java @@ -25,8 +25,9 @@ import com.vci.ubcs.code.mapper.CodeClstemplateMapper; import com.vci.ubcs.code.service.ICodeClstemplateService; import com.vci.ubcs.code.vo.CodeClstemplateVO; -import com.vci.ubcs.starter.revision.model.TreeQueryObject; import com.vci.ubcs.code.wrapper.PlCodeClstemplateWrapper; +import com.vci.ubcs.starter.revision.model.TreeQueryObject; +import com.vci.ubcs.starter.web.pagemodel.DataGrid; import com.vci.ubcs.starter.web.pagemodel.Tree; import com.vci.ubcs.starter.web.util.VciBaseUtil; import io.swagger.annotations.Api; @@ -142,16 +143,37 @@ return plCodeClstemplateService.treeCodeClassifyTemplate(treeQueryObject); } -// /** -// * 鍒嗙被妯℃澘鍒楄〃 -// * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄 -// * @return 鏄剧ず瀵硅薄 -// */ -// @GetMapping("/gridCodeClassifyTemplate") -// public DataGrid<CodeClstemplateVO> gridCodeClassifyTemplate(BaseQueryObject baseQueryObject){ -// -// return plCodeClstemplateService.gridCodeClassifyTemplate(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()); -// } + /** + * 鍒嗙被妯℃澘鍒楄〃 + * @param plCodeClstemplate 鍩虹鏌ヨ瀵硅薄 + * @return 鏄剧ず瀵硅薄 + */ + @GetMapping("/gridCodeClassifyTemplate") + public DataGrid<CodeClstemplateVO> gridCodeClassifyTemplate(CodeClstemplateVO plCodeClstemplate, Query query){ + + return plCodeClstemplateService.gridCodeClassifyTemplate(plCodeClstemplate,query); + + } + + /** + * 澧炲姞 鍒嗙被妯℃澘瀵硅薄 + * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄 + * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞� + */ + @PostMapping( "/addSave") + public R<CodeClstemplateVO> addSave(@RequestBody CodeClstemplateDTO codeClassifyTemplateDTO){ + return plCodeClstemplateService.addSave(codeClassifyTemplateDTO); + } + + /** + * 淇敼 鍒嗙被妯℃澘瀵硅薄 + * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄 + * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞� + */ + @PutMapping("/editSave") + public R<CodeClstemplateVO> editSave(@RequestBody CodeClstemplateDTO codeClassifyTemplateDTO){ + return plCodeClstemplateService.editSave(codeClassifyTemplateDTO); + } /** @@ -234,7 +256,7 @@ * @return */ @PostMapping( "/editDate") - public R editDate( CodeClstemplateDTO codeClassifyDTO) { + public R editDate(@RequestBody CodeClstemplateDTO codeClassifyDTO) { return plCodeClstemplateService.updateLcStatus(codeClassifyDTO.getOid(),CodeClassifyTemplateLC.EDITING.getValue()); } @@ -248,4 +270,26 @@ return plCodeClstemplateService.Upgrade(codeClassifyDTO); } + + @GetMapping( "/upgrade1") + public R upgrade1(@RequestBody CodeClstemplateDTO codeClassifyDTO) { + return Upgrade(codeClassifyDTO); + } + + /** + * 鍏嬮殕 + * @param codeClassifyDTO + * @return oid妯℃澘oid + */ + @PostMapping( "/copy") + public R copyTemplate(@RequestBody CodeClstemplateDTO codeClassifyDTO) { + + return plCodeClstemplateService.copyTemplate(codeClassifyDTO); + } + + @GetMapping( "/copyTemplate1") + public R copyTemplate1(@RequestBody CodeClstemplateDTO codeClassifyDTO) { + + return copyTemplate(codeClassifyDTO); + } } -- Gitblit v1.9.3