From 37163d9ac4fdbf6961aca8f7c6d409092ceff14c Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期三, 13 九月 2023 08:56:27 +0800 Subject: [PATCH] 1、加字段对应默认值。 2、申请接口逻辑处理。 3、将codeApply模块改为jdk1.7调试。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 40 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java index 2865e0f..3174c1e 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java @@ -2,18 +2,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; +import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO; import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO; import com.vci.ubcs.code.dto.CodeDeleteBatchDTO; import com.vci.ubcs.code.dto.CodeOrderDTO; import com.vci.ubcs.code.dto.datapush.BaseModelDTO; -import com.vci.ubcs.code.entity.CodeWupin; import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO; import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO; import com.vci.ubcs.code.vo.pagemodel.*; -import com.vci.ubcs.omd.vo.BtmTypeVO; +import com.vci.ubcs.flow.core.dto.FlowStatusDTO; +import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.model.BaseModel; import com.vci.ubcs.starter.revision.model.TreeQueryObject; import com.vci.ubcs.starter.web.pagemodel.*; @@ -29,7 +28,7 @@ * @author weidy * @date 2022-2-21 */ -public interface MdmEngineService extends IService<CodeWupin> { +public interface MdmEngineService { /** * 浣跨敤鍒嗙被鐨勪富閿幏鍙栧彲浠ヤ娇鐢ㄧ殑妯℃澘瀵硅薄 * @param codeClassifyOid 鍒嗙被鐨勪富閿� @@ -104,6 +103,13 @@ */ void batchSaveSelectChar(CodeClassifyTemplateVO templateVO, /*List<ClientBusinessObject> cboList*/ List<BaseModel> cboList); + + /** + * 灏佽寮�鍏崇殑鍐呭锛屽父鐢ㄤ簬瀵煎嚭 + * @param dataMap 鏁版嵁鐨勫唴瀹� + * @param templateVO 妯℃澘鐨勬樉绀� + */ + void wrapperBoolean(List<Map<String, String>> dataMap, CodeClassifyTemplateVO templateVO); /** * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑淇℃伅 @@ -373,6 +379,15 @@ MdmUIInfoVO getUIInfoByClassifyOid(String codeClassifyOid, String functionId); /** + * 浣跨敤鍒嗙被涓婚敭锛屾ā鏉夸富閿紝闃舵鏍囪瘑锛屾祦绋嬫ā鏉縦ek鑾峰彇娴佺▼瀹℃壒涓〉闈㈢殑鍐呭锛屽寘鍚寜閽� + * + * @param codeClassifyOid 涓婚搴撳垎绫讳富閿� + * @param functionId 鍔熻兘鐨勭紪鍙�,榛樿5 + * @return UI鐩稿叧鐨勫唴瀹� + */ + MdmUIInfoVO getFlowUIInfoByClassifyOid(String codeClassifyOid, String functionId,String templateId,String taskId,String modelKey); + + /** * 浼犲叆涓氬姟绫诲瀷浠ュ強鐩稿叧鏁版嵁杩涜鎵归噺鎻掑叆鎿嶄綔 * * @param btmType 涓氬姟绫诲瀷 @@ -402,7 +417,7 @@ * @param referConfigVO * @return */ - IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject); + IPage<BaseModelVO> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException; /** * 鑾峰彇鏍戝舰鐨勫弬鐓� @@ -410,7 +425,6 @@ * @return 鏍戝舰鐨勬暟鎹� */ List<Tree> referTree(UIFormReferVO referConfigVO, TreeQueryObject queryObject); - /** * 鏄惁涓轰慨鏀瑰拷鐣ョ殑灞炴�� @@ -427,4 +441,23 @@ ||"checkouttime".equalsIgnoreCase(attrName)); } + /** + * 娴佺▼涓彉鏇寸姸鎬佸�� + * @param flowDTO + * @return + */ + R processChangeStatus(FlowStatusDTO flowDTO); + + /** + * 鏍¢獙鍏抽敭灞炴�� + * @param orderDTO 缂栫爜鐢宠鐨勭浉鍏崇殑淇℃伅 + */ + public List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) ; + + /** + * 鏍规嵁褰撳墠鐢宠缂栫爜鐨勫垎绫伙紝閫愬眰寰�涓婃牎楠屾槸鍚︾鍚堝睘浜庨厤缃殑涓殑鍒嗙被瀛愯妭鐐圭殑鍒� + * 绫伙紝濡傛灉绗﹀悎锛屽垯璇ュ垎绫荤敵璇风殑缂栫爜涓洪泦鍥㈢爜杩斿洖true锛屽弽涔嬪垯涓轰紒涓氱紪鐮佽繑鍥瀎alse + * @param parameter 浼犲叆鏁版嵁,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣锛宱id锛氶�夋嫨鑺傜偣鐨刼id + */ + R checkGroupCode(Map<String, String> parameter); } -- Gitblit v1.9.3