feat(annualadjust): 添加年度调整报表关闭功能

- 在UnAnnualAdjustReportFormPlugin中添加BeforeItemClickEvent导入
- 注册nckd_tblclose按钮的点击监听器
- 实现beforeItemClick方法处理关闭操作
- 添加关闭功能的事件处理逻辑

feat(initial): 优化初定人员查询列表过滤条件

- 导入TypeStateEnum枚举类
- 在GradedPersonQueryListPlugin的setFilter方法中添加新的过滤条件
- 新增在服务级别

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/form/annualadjust/report/UnAnnualAdjustReportFormPlugin.java

@@ -7,6 +7,7 @@ import kd.bos.entity.datamodel.ListSelectedRowCollection;
 import kd.bos.form.CloseCallBack;
 import kd.bos.form.FormShowParameter;
 import kd.bos.form.ShowType;
+import kd.bos.form.control.events.BeforeItemClickEvent;
 import kd.bos.form.control.events.ItemClickEvent;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.orm.query.QCP;
@@ -35,6 +36,17 @@ public class UnAnnualAdjustReportFormPlugin extends AbstractReportFormPlugin imp
     @Override
     public void registerListener(EventObject e) {
         this.addItemClickListeners(FormConstant.TOOLBARAP);
+        this.addItemClickListeners(new String[]{"nckd_tblclose"});
+    }
+
+    public void beforeItemClick(BeforeItemClickEvent evt) {
+        super.beforeItemClick(evt);
+        String itemKey = evt.getItemKey();
+        if ("nckd_tblclose".equals(itemKey)) {
+            this.getView().getParentView().invokeOperation("close");
+            this.getView().sendFormAction(this.getView().getParentView());
+        }
+
     }
 
     @Override

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/form/initial/GradedPersonQueryListPlugin.java

@@ -6,6 +6,7 @@ import kd.bos.list.plugin.AbstractListPlugin;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.sdk.plugin.Plugin;
+import nckd.jxccl.base.common.enums.psms.TypeStateEnum;
 import nckd.jxccl.hr.psms.common.PositionStructureConstant;
 
 /**
@@ -20,7 +21,8 @@ public class GradedPersonQueryListPlugin extends AbstractListPlugin implements P
     public void setFilter(SetFilterEvent setFilterEvent) {
         //只查询初定的档案
         QFilter filter = new QFilter(PositionStructureConstant.NCKD_DISABLE, QCP.equals,EnableEnum.NO.getCode())
-                .and(new QFilter(PositionStructureConstant.NCKD_FIRSTRANK, QCP.equals,EnableEnum.YES.getCode()));
+                .and(new QFilter(PositionStructureConstant.NCKD_FIRSTRANK, QCP.equals,EnableEnum.YES.getCode()))
+                .and(new QFilter(PositionStructureConstant.NCKD_TYPESTATE, QCP.in, new String[]{TypeStateEnum.IN_SERVICE_LEVEL.getCode(),TypeStateEnum.NEW_ENTRY.getCode()}));
         setFilterEvent.addCustomQFilter(filter);
     }
 }