Просмотр исходного кода

feat(constants): 添加HR组织树实体标识常量

- 在FormConstant中添加HAOS_ADMINORGTREELISTF7实体标识常量
- 移除OrgBatchConstant中废弃的HAOS_ORGTREE_LIST_F7_FORMID常量
- 更新OrgBatchChgBillListPlugin中使用的表单ID和单据表单ID常量引用
jtd 2 недель назад
Родитель
Сommit
57dc291174

+ 2 - 0
code/base/nckd-jxccl-base-common/src/main/java/nckd/jxccl/base/common/constant/FormConstant.java

@@ -134,6 +134,8 @@ public class FormConstant {
     public static final String NCKD_PENDINGSALARYADJ = "nckd_pendingsalaryadj";
     /** 标准列表 */
     public static final String BOS_LIST_ENTITY = "bos_list";
+    /** HR组织树实体标识 */
+    public static final String HAOS_ADMINORGTREELISTF7_ENTITY = "haos_adminorgtreelistf7";
 
     //====================================== 标品op ======================================
     /** 确认框确认按钮 */

+ 1 - 5
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/homs/common/orgbatch/OrgBatchConstant.java

@@ -40,11 +40,6 @@ public class OrgBatchConstant extends FormConstant {
 	 */
 	public static final String NCKD_ADMINORG_KEY = "nckd_adminorg";
 
-	/**
-	 * F7列表表单模板
-	 */
-	public static final String HAOS_ORGTREE_LIST_F7_FORMID = "haos_orgtreelistf7";
-
 	/**
 	 * 包含所有下级
 	 */
@@ -55,4 +50,5 @@ public class OrgBatchConstant extends FormConstant {
 	 */
 	public static final String NCKD_IS_COPY_POSITION_KEY = "nckd_iscopyposition";
 
+
 }

+ 2 - 2
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/homs/plugin/form/orgbatch/OrgBatchChgBillListPlugin.java

@@ -113,9 +113,9 @@ public class OrgBatchChgBillListPlugin extends AbstractListPlugin {
             // 创建弹出列表界面对象
             ListShowParameter listShowParameter = new ListShowParameter();
             // 设置F7列表表单模板(根据基础资料类型选择)
-            listShowParameter.setFormId(OrgBatchConstant.HAOS_ORGTREE_LIST_F7_FORMID);
+            listShowParameter.setFormId(OrgBatchConstant.HAOS_ADMINORGTREELISTF7_ENTITY);
             // 设置基础资料标识
-            listShowParameter.setBillFormId(OrgBatchConstant.ADMINORG_ENTITYID);
+            listShowParameter.setBillFormId(OrgBatchConstant.HAOS_ADMINORGHRF7_ENTITY);
             // 设置打开方式为模态窗口
             listShowParameter.getOpenStyle().setShowType(ShowType.Modal);
             // 设置界面大小