From 7d9733a9fe0e21efe346787838aa5182633e30d2 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期日, 08 十月 2023 22:33:10 +0800 Subject: [PATCH] 注意更新blade-core-tool.jar --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java index 5b5112a..69e569d 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java @@ -3,6 +3,7 @@ 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.applyjtcodeservice.vo.BaseModelVO; import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; import com.vci.ubcs.code.dto.CodeOrderDTO; import com.vci.ubcs.code.entity.CodeClassify; @@ -24,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -143,6 +145,7 @@ List<CodeClassifyValueVO> codeClassifyValueVOS= codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifyValueOid); return R.data(codeClassifyValueVOS); } + /** * 涓婚搴撳垎绫绘爲 * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 @@ -150,7 +153,7 @@ */ @GetMapping("/treeCodeClassify") public R<List<Tree>> treeCodeClassify(TreeQueryObject treeQueryObject) { - List<Tree> treeList= codeClassifyService. treeCodeClassify(treeQueryObject); + List<Tree> treeList = codeClassifyService.treeCodeClassify(treeQueryObject); return R.data(treeList); } @@ -172,8 +175,8 @@ * @return 鎵ц鐨勭粨鏋� */ @GetMapping("/defaultReferDataGrid") - public R<IPage<BaseModel>> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){ - IPage<BaseModel> iPage= mdmEngineService.referDataGrid(referConfigVO,baseQueryObject); + public R<IPage<BaseModelVO>> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){ + IPage<BaseModelVO> iPage= mdmEngineService.referDataGrid(referConfigVO,baseQueryObject); return R.data(iPage); } @@ -236,4 +239,19 @@ public R checkKeyAttrOnOrderFordatas(@RequestBody CodeOrderDTO orderDTO) throws Exception { return R.data(mdmEngineService.checkKeyAttrOnOrderFordatas(orderDTO)); } + + /** + * 闆嗗洟/浼佷笟鐮佹鍒ゆ柇 + * @param classifyGroupCode 浼犲叆鏁版嵁 ,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣 + * @param oid 浼犲叆鏁版嵁 ,閫夋嫨鑺傜偣鐨刼id--锛宯owApplyCode锛氬綋鍓嶇敵璇风紪鐮佺殑鍒嗙被 + * @return 鎵ц缁撴灉 + */ + @GetMapping("/checkGroupCode") + @VciBusinessLog(operateName = "闆嗗洟/浼佷笟鐮佹鍒ゆ柇") + public R checkGroupCode(String oid,String classifyGroupCode) throws Exception { + Map<String,String> codtionMap=new HashMap<>(); + codtionMap.put("oid",oid); + codtionMap.put("classifyGroupCode",classifyGroupCode); + return mdmEngineService.checkGroupCode(codtionMap); + } } -- Gitblit v1.9.3