From c6b118cf77295f4c23583cde9d7890b014691e66 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期二, 05 九月 2023 13:10:30 +0800 Subject: [PATCH] 日志对象加枚举显示值转换 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java index 3ca0dac..95bd055 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java @@ -1,19 +1,23 @@ package com.vci.ubcs.code.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.dto.CodeBasicSecDTO; +import com.vci.ubcs.code.dto.CodeOrderDTO; +import com.vci.ubcs.code.dto.CodeRuleDTO; import com.vci.ubcs.code.entity.CodeBasicSec; +import com.vci.ubcs.code.vo.CodeReferConfigVO; import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO; +import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO; import com.vci.ubcs.starter.exception.VciBaseException; -import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject; -import com.vci.ubcs.starter.web.pagemodel.KeyValue; +import com.vci.ubcs.starter.web.pagemodel.*; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; +import org.springframework.util.CollectionUtils; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 鍥哄畾鐮佹鐨勭爜鍊兼湇鍔℃帴鍙� @@ -148,10 +152,10 @@ /** * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭 - * @param conditionMap 瑙勫垯鐨勫唴瀹� + * @param ruleOid 瑙勫垯鐨勫唴瀹� * @return 鐮佹鐨勫唴瀹� */ - List<CodeBasicSecVO> listCodeBasicSecByRuleOid(Map<String,Object> conditionMap); + List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid); /** * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� @@ -178,4 +182,20 @@ * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 */ CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSec codeBasicSecDO) throws VciBaseException; + + /** + * 鏍规嵁缂栫爜瑙勫垯涓婚敭鑾峰彇缂栫爜涓嬬殑娴佹按渚濊禆鐮佹 + * @param oid 缂栫爜瑙勫垯涓婚敭 + * @return + * @throws VciBaseException + */ + CodeRuleVO getSerialNumberDepend(String oid) throws VciBaseException; + + /** + * 璁剧疆鏈�澶ф祦姘村彿 + * @param codeOrderDTO 缂栫爜鐢宠浼犺緭瀵硅薄 + * @return + * @throws VciBaseException + */ + String setMaxSerialNumberForCodeRule(CodeOrderDTO codeOrderDTO) throws VciBaseException; } -- Gitblit v1.9.3