From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 04 十二月 2024 10:47:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java index ea30ac7..eebef67 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java @@ -3,7 +3,6 @@ import com.vci.corba.common.PLException; import com.vci.corba.omd.data.BusinessObject; import com.vci.corba.omd.lcm.LifeCycle; -import com.vci.dto.OsAttributeDTO; import com.vci.dto.OsLifeCycleDTO; import com.vci.pagemodel.*; import com.vci.starter.web.exception.VciBaseException; @@ -37,7 +36,7 @@ * @param targetStatus 鐩爣鐨勭敓鍛藉懆鏈熺姸鎬侊紝涓嶅尯鍒嗗ぇ灏� * @throws VciBaseException 濡傛灉鐩爣鐢熷懡鍛ㄦ湡鍜屽綋鍓嶇敓鍛藉懆鏈熺姸鎬佹病鏈夎繛鎺ョ嚎鏃舵姏鍑哄紓甯� */ - void transStatus(com.vci.corba.omd.data.BusinessObject bo, String targetStatus) throws VciBaseException; + void transStatus(BusinessObject bo, String targetStatus) throws VciBaseException; /** * 鎵归噺璺冭縼鐢熷懡鍛ㄦ湡鐘舵�侊紝杩欎簺鏁版嵁涓殑褰撳墠鐘舵�佸繀椤婚兘鏄竴鏍枫�傛垨鑰呮槸褰撳墠鐘舵�侀兘鍙互杩炴帴鍒扮洰鏍囩姸鎬� @@ -45,7 +44,7 @@ * @param targetStatus 鐩爣鐘舵�侊紝涓嶅尯鍒嗗ぇ灏忓啓 * @throws VciBaseException 杞崲鐢熷懡鍛ㄦ湡鍑洪敊鐨勬椂鍊欐姏鍑哄紓甯� */ - void transStatus(List<com.vci.corba.omd.data.BusinessObject> boList, String targetStatus) throws VciBaseException; + void transStatus(List<BusinessObject> boList, String targetStatus) throws VciBaseException; /** * 鎵归噺璺冭縼鐢熷懡鍛ㄦ湡鐘舵�侊紝杩欎簺鏁版嵁涓殑褰撳墠鐘舵�佸繀椤婚兘鏄竴鏍凤紝鎴栬�呮槸褰撳墠鐘舵�侀兘鍙互杩炴帴鍒扮洰鏍囩姸鎬� @@ -53,7 +52,7 @@ * @param targetStatus 鐩爣鐘舵�侊紝涓嶅尯鍒嗗ぇ灏忓啓 * @throws VciBaseException 杞崲鐢熷懡鍛ㄦ湡鍑洪敊鐨勬椂鍊欐姏鍑哄紓甯� */ - void transStatus(com.vci.corba.omd.data.BusinessObject[] bos, String targetStatus) throws VciBaseException; + void transStatus(BusinessObject[] bos, String targetStatus) throws VciBaseException; /** * 鎵归噺璺冭縼鐢熷懡鍛ㄦ湡鐘舵�侊紝杩欎簺鏁版嵁涓殑褰撳墠鐘舵�佸繀椤婚兘鏄竴鏍凤紝鎴栬�呮槸褰撳墠鐘舵�侀兘鍙互杩炴帴鍒扮洰鏍囩姸鎬� @@ -89,7 +88,7 @@ * @param lifeCycleVO 鏄剧ず瀵硅薄 * @return 鏁版嵁瀵硅薄 */ - LifeCycle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO); + LifeCycle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO) throws PLException; /** * 鏌ヨ鎵�鏈夌敓鍛藉懆鏈熺姸鎬� @@ -121,7 +120,7 @@ * @param lineVO 璺冭縼璺敱 * @throws VciBaseException 璺冭縼鍑洪敊鐨勬槸浼氭姏鍑哄紓甯� */ - void doTransVO(com.vci.corba.omd.data.BusinessObject obj, OsLifeCycleLineVO lineVO) throws VciBaseException; + void doTransVO(BusinessObject obj, OsLifeCycleLineVO lineVO) throws VciBaseException; /** * 鎵归噺鎵ц璺冭縼鎿嶄綔锛岃姹傚繀椤绘槸鍚屼竴涓笟鍔$被鍨嬩笅鐨� @@ -148,6 +147,13 @@ * @return 鐘舵�佺殑鏄剧ず瀵硅薄 */ List<OsStatusVO> listStatusById(String lifeCycleId); + + /** + * 浣跨敤澶氫釜缂栧彿鑾峰彇鐢熷懡鍛ㄦ湡鐨勫璞� + * @param lcIdList 缂栧彿 + * @return 鏄剧ず瀵硅薄 + */ + List<OsLifeCycleVO> getLifeCycleByIds(Collection<String> lcIdList); /** * 鎵归噺娣诲姞鐢熷懡鍛ㄦ湡 @@ -240,4 +246,10 @@ */ OsERVO listLinesPic(String id); + /** + * 鏌ヨ鎵�鏈夎穬杩佷簨浠秌ey + * @return + */ + List<String> getLCEventKeys() throws PLException; + } -- Gitblit v1.9.3