```

feat(constants): 重构表单常量类，新增标品实体、操作和控件标识将 FormConstant 类中的常量按功能模块重新组织，划分为标品实体标识、标品操作标识、标品页面控件、通用字段等几大类，并删除冗余或重复定义的常量。同时统一命名规范，提升代码可读性和维护性。

此外，更新了多个插件和业务服务中对旧常量的引用，确保与新的常量定义保持一致。
```

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

@@ -8,70 +8,138 @@ package nckd.jxccl.base.common.constant;
  */
 public class FormConstant {
 
-    /** ID标识 */
-    public static final String ID_KEY = "id";
-    /** 名称标识 */
-    public static final String NAME_KEY = "name";
-    /** 编号标识 */
-    public static final String NUMBER_KEY = "number";
-    /** 排序 */
-    public static final String INDEX_KEY = "index";
-    /** 编号标识 */
-    public static final String EMP_NUMBER_KEY = "empnumber";
+    //====================================== 标品实体标识 ======================================
+    /**学历-实体标识*/
+    public static final String HBSS_DIPLOMA = "hbss_diploma";
+    /**教育经历-实体标识*/
+    public static final String HRPI_PEREDUEXP = "hrpi_pereduexp";
+    /**任职经历-实体标识*/
+    public static final String HRPI_EMPPOSORGREL = "hrpi_empposorgrel";
+    /**职称级别-实体标识*/
+    public static final String HBSS_PROTITLELEVEL = "hbss_protitlelevel";
+    /**资格等级-实体标识*/
+    public static final String HBSS_OCPQUALLEVEL = "hbss_ocpquallevel";
+    /**职称信息-实体标识*/
+    public static final String HRPI_PERPROTITLE = "hrpi_perprotitle";
+    /**职业资格-实体标识*/
+    public static final String HRPI_PEROCPQUAL = "hrpi_perocpqual";
+    /**职位序列-实体标识*/
+    public static final String HBJM_JOBSEQHR = "hbjm_jobseqhr";
+    /**职等方案-实体标识*/
+    public static final String HBJM_JOBGRADESCMHR = "hbjm_jobgradescmhr";
+    /**职等-实体标识*/
+    public static final String HBJM_JOBGRADEHR = "hbjm_jobgradehr";
+    /**职级方案-实体标识*/
+    public static final String HBJM_JOBLEVELSCMHR = "hbjm_joblevelscmhr";
+    /**职级-实体标识*/
+    public static final String HBJM_JOBLEVELHR = "hbjm_joblevelhr";
+    /** HR行政组织-实体标识*/
+    public static final String ADMINORGHR_ENTITYID = "haos_adminorghr";
+    /** 组织分配-实体标识 */
+    public static final String ASSIGNMENT_ENTITYID = "hrpi_assignment";
+    /** 岗位-实体标识*/
+    public static final String HBPM_POSITIONHR = "HBPM_POSITIONHR";
+    /** 服务年限-实体标识*/
+    public static final String HRPI_PERSERLEN = "HRPI_PERSERLEN";
+
+
+    //====================================== 标品op ======================================
+    /** 确认框确认按钮 */
+    public static final String BTN_OK_OP = "btnok";
+    /** 提交操作 */
+    public static final String SUBMIT_OP = "submit";
+    /** 启用操作 */
+    public static final String ENABLE_OP = "enable";
+    /** 审核操作 */
+    public static final String AUDIT_OP = "audit";
+    /** 反审核操作 */
+    public static final String UNAUDIT_OP = "unaudit";
+    /** 删除操作 */
+    public static final String DELETE_OP = "delete";
+    /** 刷新*/
+    public static final String REFRESH_OP = "refresh";
+    /** 确认*/
+    public static final String AFFIRM_OP = "affirm";
+    /** 保存按钮标识 */
+    public static final String SAVE_OP = "save";
+    /** 退出按钮 */
+    public static final String CLOSE_OP = "tblclose";
+    /** 审核操作标识 */
+    public static final String OP_BAR_AUDIT = "bar_audit";
+    /** 反审核操作标识*/
+    public static final String OP_BAR_UNAUDIT = "bar_unaudit";
+
+
+    //====================================== 标品页面控件 ======================================
     /** 分录字段标识 */
     public static final String ENTRY_ENTITY_KEY = "entryentity";
-    /** 保存按钮标识 */
-    public static final String SAVE_KEY = "save";
-    /** 提交按钮标识 */
-    public static final String SUBMIT_KEY = "submit";
     /** 左树右表日期标识 */
     public static final String SEARCH_DATE_KEY = "searchdate";
-    /** 退出按钮 */
-    public static final String CLOSE_KEY = "tblclose";
     /** 工具栏标识 */
     public static final String TOOLBARAP = "toolbarap";
     /** 报表列表 */
     public static final String REPORTLISTAP = "reportlistap";
-    /**
-     * 单据编号
-     **/
+    /** 多选基础资料*/
+    public static final String BASEDATAID_KEY = "fbasedataid";
+    /**工具栏*/
+    public static final String TBMAIN = "tbmain";
+    /** 左树右表-是否包含子部门*/
+    public static final String CHKINCLUDECHILD = "chkincludechild";
+
+
+    //====================================== 通用字段 ======================================
+    /** ID标识 */
+    public static final String ID_KEY = "id";
+    /** 名称标识 */
+    public static final String NAME_KEY = "name";
+    /** 编号标识 */
+    public static final String NUMBER_KEY = "number";
+    /** 单据编号*/
     public static final String BILL_NO_KEY = "BILLNO";
-    /**
-     * 单据状态
-     **/
+    /** 单据状态 */
     public static final String BILL_STATUS_KEY = "billstatus";
-    /**
-     * 创建人
-     **/
+    /** 创建人 */
     public static final String CREATOR_KEY = "CREATOR";
-    /**
-     * 修改人
-     **/
+    /** 创建时间 */
+    public static final String CREATE_TIME_KEY = "CREATETIME";
+    /** 修改人 */
     public static final String MODIFIER_KEY = "MODIFIER";
-    /**
-     * 审核人
-     **/
+    /** 修改时间 */
+    public static final String MODIFY_TIME_KEY = "MODIFYTIME";
+    /** 审核人 */
     public static final String AUDITOR_KEY = "AUDITOR";
-    /**
-     * 审核日期
-     **/
+    /** 审核日期 */
     public static final String AUDIT_DATE_KEY = "AUDITDATE";
-    /**
-     * 修改时间
-     **/
-    public static final String MODIFY_TIME_KEY = "MODIFYTIME";
-    /**
-     * 创建时间
-     **/
-    public static final String CREATE_TIME_KEY = "CREATETIME";
-    /**
-     * 组织
-     **/
+    /** 数据状态 */
+    public static final String STATUS = "status";
+    /** 使用状态 */
+    public static final String ENABLE = "enable";
+    /** 主数据内码 */
+    public static final String MASTER_ID = "masterid";
+    /**** 是否当前版本 */
+    public static final String IS_CURRENT_VERSION = "iscurrentversion";
+    /** 数据状态 */
+    public static final String DATA_STATUS = "datastatus";
+    /** 业务状态 */
+    public static final String BUSINESS_STATUS = "businessstatus";
+    /** 初始状态 */
+    public static final String INIT_STATUS = "initstatus";
+    /** 组织 */
     public static final String ORG_KEY = "ORG";
     /** 创建组织*/
     public static final String CREATEORG_KEY = "createorg";
     /** 所属单位*/
     public static final String USEORG_KEY = "useorg";
+    /** 分录行号 */
+    public static final String SEQ_KEY = "SEQ";
+    /** 排序 */
+    public static final String INDEX_KEY = "index";
+    /** 编号标识 */
+    public static final String EMP_NUMBER_KEY = "empnumber";
+    /**人员*/
+    public static final String PERSON = "PERSON";
+    /** 组织*/
+    public static final String ADMINORG = "adminorg";
     /** 所属公司*/
     public static final String COMPANY_KEY = "company";
     /** 岗位*/
@@ -82,32 +150,6 @@ public class FormConstant {
     public static final String PROLEVEL_KEY = "prolevel";
     /** 职业资格等级*/
     public static final String QUALEVEL_KEY = "qualevel";
-    /**
-     * 分录行号
-     **/
-    public static final String SEQ_KEY = "SEQ";
-    /**
-     * 修改人
-     **/
-    public static final String MODIFIER_FIELD_KEY = "MODIFIERFIELD";
-    /**
-     * 修改时间
-     **/
-    public static final String MODIFY_DATE_FIELD_KEY = "MODIFYDATEFIELD";
-    /** 数据状态 */
-    public static final String STATUS = "status";
-    /** 使用状态 */
-    public static final String ENABLE = "enable";
-    /** 主数据内码 */
-    public static final String MASTER_ID = "masterid";
-    /**** 是否当前版本 */
-    public static final String IS_CURRENT_VERSION = "iscurrentversion";
-    /** 数据状态 */
-    public static final String DATA_STATUS = "datastatus";
-    /** 业务状态 */
-    public static final String BUSINESS_STATUS = "businessstatus";
-    /** 初始状态 */
-    public static final String INIT_STATUS = "initstatus";
     /** 是否主要 */
     public static final String IS_PRIMARY = "isprimary";
     /** 是否删除 */
@@ -118,103 +160,36 @@ public class FormConstant {
     public static final String STARTDATE = "startdate";
     /** 结束时间 */
     public static final String ENDDATE = "enddate";
+    /** 本次加入集团日期*/
+    public static final String JOINCOMDATE_KEY = "JOINCOMDATE";
+    /** 首次加入集团日期*/
+    public static final String FIRSTJOINCOMDATE_KEY = "FIRSTJOINCOMDATE";
     /** 毕业时间 */
     public static final String GRADUTIONDATE = "gradutiondate";
-
-    /**工具栏*/
-    public static final String TBMAIN = "tbmain";
-    /** 确认框确认按钮 */
-    public static final String OP_BTN_OK = "btnok";
-    /** 提交操作 */
-    public static final String OP_SUBMIT = "submit";
-    /** 启用操作 */
-    public static final String OP_ENABLE = "enable";
-    /** 审核操作 */
-    public static final String OP_AUDIT = "audit";
-    /** 反审核操作 */
-    public static final String OP_UNAUDIT = "unaudit";
-    /** 删除操作 */
-    public static final String OP_DELETE = "delete";
-    /** 刷新*/
-    public static final String REFRESH = "refresh";
-    /** 刷新*/
-    public static final String AFFIRM = "affirm";
-    /** 多选基础资料*/
-    public static final String BASEDATAID_KEY = "fbasedataid";
     /** 当前user id*/
     public static final String KEY_CURR_USER_ID = "KEY_CURR_USER_ID";
     /** 当前org id*/
     public static final String CURR_ORG_ID = "ORG_ID";
     /** 当前org id*/
     public static final String DEP_EMP = "depemp";
-    /** 左树右表-是否包含子部门*/
-    public static final String CHKINCLUDECHILD = "chkincludechild";
-    /**人员*/
-    public static final String PERSON = "PERSON";
-    /** 组织*/
-    public static final String ADMINORG = "adminorg";
     /**组织上下级结构长编码*/
     public static final String STRUCTLONGNUMBER = "structlongnumber";
-    /** HR行政组织*/
-    public static final String ADMINORGHR_ENTITYID = "haos_adminorghr";
-    /** 组织分配-实体标识 */
-    public static final String ASSIGNMENT_ENTITYID = "hrpi_assignment";
+    /** 人员*/
+    public static final String EMPLOYEE_KEY = "employee";
+    /**职级序列*/
+    public static final String JOBLEVELSEQ = "joblevelseq";
 
-    /** 审核操作标识 */
-    public static final String OP_BAR_AUDIT = "bar_audit";
-    /** 反审核操作标识*/
-    public static final String OP_BAR_UNAUDIT = "bar_unaudit";
-    /** 反审核操作标识*/
+    /** 工具栏标识（二开）*/
     public static final String NCKD_TOOLBARAP = "nckd_toolbarap";
     /** 人员标识*/
     public static final String NCKD_PERSON = "nckd_person";
-
-    /**学历-实体标识*/
-    public static final String HBSS_DIPLOMA = "hbss_diploma";
-    /**教育经历-实体标识*/
-    public static final String HRPI_PEREDUEXP = "hrpi_pereduexp";
-    /**任职经历-实体标识*/
-    public static final String HRPI_EMPPOSORGREL = "hrpi_empposorgrel";
-    /**职称级别-实体标识*/
-    public static final String HBSS_PROTITLELEVEL = "hbss_protitlelevel";
-    /**资格等级-实体标识*/
-    public static final String HBSS_OCPQUALLEVEL = "hbss_ocpquallevel";
-    /**职称信息-实体标识*/
-    public static final String HRPI_PERPROTITLE = "hrpi_perprotitle";
-    /**职业资格-实体标识*/
-    public static final String HRPI_PEROCPQUAL = "hrpi_perocpqual";
-    /**职位序列-实体标识*/
-    public static final String HBJM_JOBSEQHR = "hbjm_jobseqhr";
-
-
-    /**职等方案-实体标识*/
-    public static final String HBJM_JOBGRADESCMHR = "hbjm_jobgradescmhr";
-    /**职等-实体标识*/
-    public static final String HBJM_JOBGRADEHR = "hbjm_jobgradehr";
-    /**职级方案-实体标识*/
-    public static final String HBJM_JOBLEVELSCMHR = "hbjm_joblevelscmhr";
-    /**职级-实体标识*/
-    public static final String HBJM_JOBLEVELHR = "hbjm_joblevelhr";
-    /**职级序列*/
-    public static final String JOBLEVELSEQ = "joblevelseq";
     /** 职位序列*/
     public static final String NCKD_JOBSEQ = "nckd_jobseq";
-    /** 积分*/
+    /** 职层/职级-积分*/
     public static final String NCKD_SCORE = "NCKD_SCORE";
-    /** 积分*/
-    public static final String JOBSEQ = "jobseq";
-    /** 积分*/
-    public static final String EMPLOYEE_KEY = "employee";
-    /** 系数*/
+    /** 职层-系数*/
     public static final String NCKD_COEFFICIENT = "NCKD_COEFFICIENT";
-    /** 资格级别*/
+    /** 职层-资格级别*/
     public static final String NCKD_JOBLEVELNUMBER = "NCKD_JOBLEVELNUMBER";
-    /** 岗位*/
-    public static final String HBPM_POSITIONHR = "HBPM_POSITIONHR";
-    /** 服务年限*/
-    public static final String HRPI_PERSERLEN = "HRPI_PERSERLEN";
-    /** 本次加入集团日期*/
-    public static final String JOINCOMDATE_KEY = "JOINCOMDATE";
-    /** 首次加入集团日期*/
-    public static final String FIRSTJOINCOMDATE_KEY = "FIRSTJOINCOMDATE";
+
 }

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/business/CreateEvalQuestService.java

@@ -192,7 +192,7 @@ public class CreateEvalQuestService {
      * @date: 2025/07/15 16:06
      */
     private static void saveQuest(DynamicObject mainObj, OperateOption option, String personName) {
-        OperationResult operationResult = SaveServiceHelper.saveOperate(FormConstant.SAVE_KEY,HonorStudentConstant.NCKD_EVALQUEST_ENTITYID, new DynamicObject[]{mainObj}, option);
+        OperationResult operationResult = SaveServiceHelper.saveOperate(FormConstant.SAVE_OP,HonorStudentConstant.NCKD_EVALQUEST_ENTITYID, new DynamicObject[]{mainObj}, option);
         if (!operationResult.isSuccess()) {
             StringJoiner errorMsg = new StringJoiner("；");
             for (IOperateInfo error : operationResult.getAllErrorOrValidateInfo()) {

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/plugin/form/CreateEvalQuestFormPlugin.java

@@ -4,41 +4,26 @@ import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.form.CloseCallBack;
-import kd.bos.form.ConfirmCallBackListener;
-import kd.bos.form.MessageBoxOptions;
-import kd.bos.form.MessageBoxResult;
-import kd.bos.form.control.Control;
 import kd.bos.form.events.AfterDoOperationEventArgs;
-import kd.bos.form.events.ClosedCallBackEvent;
-import kd.bos.form.events.MessageBoxClosedEvent;
 import kd.bos.form.operate.FormOperate;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
 import kd.bos.mvc.list.ListView;
-import kd.bos.orm.query.QCP;
-import kd.bos.orm.query.QFilter;
 import kd.bos.schedule.api.JobInfo;
 import kd.bos.schedule.api.JobType;
 import kd.bos.schedule.form.JobForm;
 import kd.bos.schedule.form.JobFormInfo;
-import kd.bos.servicehelper.QueryServiceHelper;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.ConvertUtil;
-import nckd.jxccl.base.common.utils.StrFormatter;
-import nckd.jxccl.hr.hstu.business.CreateEvalQuestService;
 import nckd.jxccl.hr.hstu.common.HonorStudentConstant;
 import nckd.jxccl.hr.hstu.task.CreateEvalQuestTask;
 import nckd.jxccl.hr.hstu.task.CreateEvalQuestTaskClick;
 
-import java.util.ArrayList;
 import java.util.EventObject;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
 
 /**
 * 生成评价对象（弹窗）表单插件
@@ -52,7 +37,7 @@ public class CreateEvalQuestFormPlugin extends AbstractFormPlugin implements Plu
 
     @Override
     public void registerListener(EventObject e) {
-        this.addClickListeners(HonorStudentConstant.OP_BTN_OK);
+        this.addClickListeners(HonorStudentConstant.BTN_OK_OP);
     }
 
     @Override
@@ -67,7 +52,7 @@ public class CreateEvalQuestFormPlugin extends AbstractFormPlugin implements Plu
     public void afterDoOperation(AfterDoOperationEventArgs e) {
         String operateKey = e.getOperateKey();
         boolean success = e.getOperationResult() != null && e.getOperationResult().isSuccess();
-        if(HonorStudentConstant.AFFIRM.equalsIgnoreCase(operateKey) && success) {
+        if(HonorStudentConstant.AFFIRM_OP.equalsIgnoreCase(operateKey) && success) {
             FormOperate formOperate = (FormOperate) e.getSource();
             // ------------------------------------- 获取评价对象开启异步生成 begin -------------------------------------
             // 只有操作插件确认开启异步后才会开启
@@ -115,7 +100,7 @@ public class CreateEvalQuestFormPlugin extends AbstractFormPlugin implements Plu
                 logger.info("【优秀生考评】-生成综合评测问卷-开启异步任务");
                 // ------------------------------------- 获取评价对象开启异步生成 end -------------------------------------
             }else{
-                this.getView().getParentView().invokeOperation(FormConstant.REFRESH);
+                this.getView().getParentView().invokeOperation(FormConstant.REFRESH_OP);
                 this.getView().getParentView().showSuccessNotification("生成综合评测问卷成功，可在【查看评价列表】中查看");
                 this.getView().close();
             }

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/plugin/form/EvalQuestFormPlugin.java

@@ -2,41 +2,29 @@ package nckd.jxccl.hr.hstu.plugin.form;
 
 import kd.bos.bill.BillShowParameter;
 import kd.bos.bill.OperationStatus;
-import kd.bos.context.RequestContext;
 import kd.bos.dataentity.OperateOption;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
-import kd.bos.entity.MainEntityType;
 import kd.bos.entity.operate.OperateOptionConst;
 import kd.bos.entity.operate.result.OperationResult;
-import kd.bos.entity.property.MulBasedataProp;
 import kd.bos.form.CloseCallBack;
-import kd.bos.form.FieldTip;
 import kd.bos.form.FormShowParameter;
 import kd.bos.form.ShowType;
-import kd.bos.form.control.Button;
 import kd.bos.form.control.EntryGrid;
 import kd.bos.form.control.Toolbar;
 import kd.bos.form.control.events.ItemClickEvent;
-import kd.bos.form.events.AfterDoOperationEventArgs;
-import kd.bos.form.events.BeforeDoOperationEventArgs;
 import kd.bos.form.events.ClosedCallBackEvent;
-import kd.bos.form.events.PreOpenFormEventArgs;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
-import kd.bos.orm.query.QCP;
-import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.enums.PerfPlanRoleEnum;
 import nckd.jxccl.base.common.utils.DateUtil;
-import nckd.jxccl.base.org.helper.PersonHelper;
 import nckd.jxccl.hr.hstu.business.CreateEvalQuestService;
 import nckd.jxccl.hr.hstu.common.HonorStudentConstant;
 
-import javax.naming.ldap.Control;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.EventObject;
@@ -151,7 +139,7 @@ public class EvalQuestFormPlugin extends AbstractFormPlugin implements Plugin {
                 //持久化到数据库
                 OperateOption option = OperateOption.create();
                 option.setVariableValue(OperateOptionConst.ISSHOWMESSAGE, Boolean.FALSE+"");
-                OperationResult operationResult = this.getView().invokeOperation(FormConstant.SAVE_KEY,option);
+                OperationResult operationResult = this.getView().invokeOperation(FormConstant.SAVE_OP,option);
                 if(operationResult.isSuccess()){
                     this.getView().showSuccessNotification("刷新同级人员并保存成功，本次更新人员以蓝色标识");
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/plugin/form/EvalQuestListPlugin.java

@@ -1,19 +1,6 @@
 package nckd.jxccl.hr.hstu.plugin.form;
 
-import kd.bos.context.RequestContext;
-import kd.bos.dataentity.OperateOption;
-import kd.bos.dataentity.entity.DynamicObject;
-import kd.bos.dataentity.entity.DynamicObjectCollection;
-import kd.bos.db.tx.TX;
-import kd.bos.db.tx.TXHandle;
-import kd.bos.entity.EntityMetadataCache;
-import kd.bos.entity.MainEntityType;
-import kd.bos.entity.constant.StatusEnum;
 import kd.bos.entity.datamodel.ListSelectedRowCollection;
-import kd.bos.entity.operate.OperateOptionConst;
-import kd.bos.entity.operate.result.IOperateInfo;
-import kd.bos.entity.operate.result.OperationResult;
-import kd.bos.exception.KDBizException;
 import kd.bos.form.CloseCallBack;
 import kd.bos.form.ConfirmCallBackListener;
 import kd.bos.form.ConfirmTypes;
@@ -27,41 +14,16 @@ import kd.bos.form.events.SetFilterEvent;
 import kd.bos.list.plugin.AbstractListPlugin;
 import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
-import kd.bos.orm.query.QCP;
-import kd.bos.orm.query.QFilter;
 import kd.bos.portal.util.SerializationUtils;
 import kd.bos.schedule.api.TaskInfo;
 import kd.bos.schedule.api.TaskStatusConstant;
-import kd.bos.servicehelper.BusinessDataServiceHelper;
-import kd.bos.servicehelper.QueryServiceHelper;
-import kd.bos.servicehelper.operation.SaveServiceHelper;
-import kd.bos.servicehelper.user.UserServiceHelper;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
-import nckd.jxccl.base.common.enums.PerfPlanRoleEnum;
-import nckd.jxccl.base.common.exception.ValidationException;
-import nckd.jxccl.base.common.utils.ConvertUtil;
-import nckd.jxccl.base.common.utils.StrFormatter;
-import nckd.jxccl.base.entity.helper.EntityHelper;
-import nckd.jxccl.base.org.helper.AdminOrgHelper;
-import nckd.jxccl.base.org.helper.PersonHelper;
-import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.hr.hstu.business.helper.HonorStudentHelper;
 import nckd.jxccl.hr.hstu.common.HonorStudentConstant;
 import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
 import java.util.EventObject;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
 
 /**
 * 【优秀生】-综合测评问卷
@@ -102,19 +64,19 @@ public class EvalQuestListPlugin extends AbstractListPlugin implements Plugin {
 
         if(HonorStudentConstant.OP_GENERATE_QUEST.equalsIgnoreCase(operateKey) && success) {
             //生成问卷（答卷） & 执行成功后刷新列表
-            this.getView().invokeOperation(FormConstant.REFRESH);
+            this.getView().invokeOperation(FormConstant.REFRESH_OP);
             this.getView().showSuccessNotification("生成问卷成功");
         }else if(HonorStudentConstant.OP_BEGINEVAL.equalsIgnoreCase(operateKey) && success) {
             //发起评测
-            this.getView().invokeOperation(FormConstant.REFRESH);
+            this.getView().invokeOperation(FormConstant.REFRESH_OP);
             this.getView().showSuccessNotification("发起评测成功");
         }else if(HonorStudentConstant.OP_ENDEVAL.equalsIgnoreCase(operateKey) && success) {
             //结束评测
-            this.getView().invokeOperation(FormConstant.REFRESH);
+            this.getView().invokeOperation(FormConstant.REFRESH_OP);
             this.getView().showSuccessNotification("结束评测成功");
         }else if(HonorStudentConstant.OP_GETSCORE.equalsIgnoreCase(operateKey) && success){
             //获取并更新评分结果
-            this.getView().invokeOperation(FormConstant.REFRESH);
+            this.getView().invokeOperation(FormConstant.REFRESH_OP);
             this.getView().showSuccessNotification("更新考评结果成功");
         }
 
@@ -134,7 +96,7 @@ public class EvalQuestListPlugin extends AbstractListPlugin implements Plugin {
                         String status = taskInfo.getStatus();
                         if (TaskStatusConstant.COMPLETED.equalsIgnoreCase(status)) {
                             //刷新列表
-                            this.getView().invokeOperation(FormConstant.REFRESH);
+                            this.getView().invokeOperation(FormConstant.REFRESH_OP);
                             //成功提示
                             this.getView().showConfirm(
                                     "成功提示",

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/plugin/form/EvalQuestSelectOrg.java

@@ -18,7 +18,7 @@ public class EvalQuestSelectOrg extends AbstractFormPlugin implements Plugin {
 
     @Override
     public void registerListener(EventObject e) {
-        this.addClickListeners(HonorStudentConstant.OP_BTN_OK);
+        this.addClickListeners(HonorStudentConstant.BTN_OK_OP);
     }
 
     @Override
@@ -32,7 +32,7 @@ public class EvalQuestSelectOrg extends AbstractFormPlugin implements Plugin {
     @Override
     public void click(EventObject evt) {
         Control source = (Control) evt.getSource();
-        if (HonorStudentConstant.OP_BTN_OK.equals(source.getKey())) {
+        if (HonorStudentConstant.BTN_OK_OP.equals(source.getKey())) {
             //获取选择的组织范围
             DynamicObjectCollection mulSelectOrg = (DynamicObjectCollection)this.getModel().getValue(HonorStudentConstant.NCKD_MULSELECTORG);
             //将选择的数据返回给父页面

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/plugin/form/EvalResultFormPlugin.java

@@ -2,14 +2,6 @@ package nckd.jxccl.hr.hstu.plugin.form;
 
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
-import kd.bos.entity.constant.StatusEnum;
-import kd.bos.form.control.Button;
-import kd.bos.form.control.Control;
-import kd.bos.form.control.Toolbar;
-import kd.bos.form.control.events.ClickListener;
-import kd.bos.form.control.events.ItemClickEvent;
-import kd.bos.form.control.events.ItemClickListener;
-import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.events.BeforeDoOperationEventArgs;
 import kd.bos.form.operate.FormOperate;
 import kd.bos.form.plugin.AbstractFormPlugin;
@@ -17,8 +9,6 @@ import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.hr.hstu.common.HonorStudentConstant;
 
-import java.util.EventObject;
-
 /**
 * 【优秀生】-综合测评答卷
 * @author W.Y.C
@@ -31,7 +21,7 @@ public class EvalResultFormPlugin extends AbstractFormPlugin implements Plugin {
     @Override
     public void beforeDoOperation(BeforeDoOperationEventArgs e) {
         String operateKey = ((FormOperate) e.getSource()).getOperateKey();
-        if(FormConstant.OP_AUDIT.equals(operateKey)){
+        if(FormConstant.AUDIT_OP.equals(operateKey)){
             DynamicObject dataEntity = this.getModel().getDataEntity();
             DynamicObjectCollection entrys = dataEntity.getDynamicObjectCollection(HonorStudentConstant.NCKD_EVALRESULTENTRY);
             System.out.println();

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/plugin/form/EvaluationRuleListPlugin.java

@@ -6,7 +6,6 @@ import kd.bos.entity.constant.StatusEnum;
 import kd.bos.entity.datamodel.ListSelectedRowCollection;
 import kd.bos.entity.operate.Delete;
 import kd.bos.entity.operate.OperateOptionConst;
-import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.events.BeforeDoOperationEventArgs;
 import kd.bos.form.operate.FormOperate;
 import kd.bos.list.plugin.AbstractListPlugin;
@@ -69,15 +68,15 @@ public class EvaluationRuleListPlugin extends AbstractListPlugin implements Plug
                 }
                 String status = dynamicObject.getString(HonorStudentConstant.STATUS);
                 String enable = dynamicObject.getString(HonorStudentConstant.ENABLE);
-                this.getView().invokeOperation(HonorStudentConstant.OP_ENABLE, option);
-                this.getView().invokeOperation(HonorStudentConstant.OP_SUBMIT, option);
-                this.getView().invokeOperation(HonorStudentConstant.OP_AUDIT, option);
+                this.getView().invokeOperation(HonorStudentConstant.ENABLE_OP, option);
+                this.getView().invokeOperation(HonorStudentConstant.SUBMIT_OP, option);
+                this.getView().invokeOperation(HonorStudentConstant.AUDIT_OP, option);
                 dynamicObject.set(HonorStudentConstant.NCKD_STARTTIME,new Date());
                 dynamicObject.set(HonorStudentConstant.NCKD_PERIODSTATE,new Date());
                 dynamicObject.set(HonorStudentConstant.NCKD_PERIODSTATE, StatusEnum.B.ordinal());
                 SaveServiceHelper.save(new DynamicObject[]{dynamicObject});
                 //刷新列表
-                this.getView().invokeOperation(HonorStudentConstant.REFRESH);
+                this.getView().invokeOperation(HonorStudentConstant.REFRESH_OP);
                 this.getView().showSuccessNotification("操作成功！");
             }else if (OP_END.equals(operateKey)) {
                 DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(HonorStudentConstant.EVALUATIONRULE_ENTITYID, new QFilter[]{new QFilter("id", QCP.equals, billId)});
@@ -91,7 +90,7 @@ public class EvaluationRuleListPlugin extends AbstractListPlugin implements Plug
                 dynamicObject.set(HonorStudentConstant.NCKD_PERIODSTATE, StatusEnum.C.ordinal());
                 SaveServiceHelper.save(new DynamicObject[]{dynamicObject});
                 //刷新列表
-                this.getView().invokeOperation(HonorStudentConstant.REFRESH);
+                this.getView().invokeOperation(HonorStudentConstant.REFRESH_OP);
                 this.getView().showSuccessNotification("操作成功！");
             }
         }

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/plugin/operate/EvalQuestGenerateQuestOperationPlugin.java

@@ -13,7 +13,6 @@ import kd.bos.entity.operate.OperateOptionConst;
 import kd.bos.entity.operate.result.IOperateInfo;
 import kd.bos.entity.operate.result.OperationResult;
 import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
-import kd.bos.entity.plugin.PreparePropertysEventArgs;
 import kd.bos.entity.plugin.args.BeginOperationTransactionArgs;
 import kd.bos.exception.KDBizException;
 import kd.bos.logging.Log;
@@ -240,7 +239,7 @@ public class EvalQuestGenerateQuestOperationPlugin extends AbstractOperationServ
         //开启事务确保事务一致性
         try (TXHandle t = TX.required(HonorStudentConstant.OP_GENERATE_QUEST)) {
             try {
-                OperationResult operationResult = SaveServiceHelper.saveOperate(FormConstant.SAVE_KEY,HonorStudentConstant.NCKD_EVALQUEST_ENTITYID, evalResultToSaveList.toArray(new DynamicObject[0]), option);
+                OperationResult operationResult = SaveServiceHelper.saveOperate(FormConstant.SAVE_OP,HonorStudentConstant.NCKD_EVALQUEST_ENTITYID, evalResultToSaveList.toArray(new DynamicObject[0]), option);
                 if (!operationResult.isSuccess()) {
                     StringJoiner errorMsg = new StringJoiner("\n");
                     for (IOperateInfo error : operationResult.getAllErrorOrValidateInfo()) {

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/business/JobLevelCalculatorService.java

@@ -200,15 +200,15 @@ public class JobLevelCalculatorService {
         }
 
         // 15. 获取最近一次聘任信息
-        //对应SHR：PR_lastjobgradeindex；1139~1147行
-        int PR_lastjobgradeindex = getLastAppointmentJobGradeIndex(personId, currentJobLevelIndex,jobLevelIndex);
-        if (jobLevelIndex - PR_lastjobgradeindex > 1) {
-            jobLevelIndex = PR_lastjobgradeindex + 1;
+        //对应SHR：lastAppointmentJobGradeIndex；1139~1147行
+        int lastAppointmentJobGradeIndex = getLastAppointmentJobGradeIndex(personId, currentJobLevelIndex,jobLevelIndex);
+        if (jobLevelIndex - lastAppointmentJobGradeIndex > 1) {
+            jobLevelIndex = lastAppointmentJobGradeIndex + 1;
         }
 
         // 16. 根据考核结果使用情况处理职级计算
         //对应SHR行：1149~1180行
-        jobLevelIndex = handleAppraisalUsage(jobSeq,rankingInfo,jobLevelIndex,PR_lastjobgradeindex,currentJobLevelIndex,minusPersonAppraisal,firstPR,usedAppraisalResult,jobLevelResult);
+        jobLevelIndex = handleAppraisalUsage(jobSeq,rankingInfo,jobLevelIndex,lastAppointmentJobGradeIndex,currentJobLevelIndex,minusPersonAppraisal,firstPR,usedAppraisalResult,jobLevelResult);
 
         // 17. 处理首次聘任情况 & 处理聘任相关限制
         //对应SHR：1182~1295行
@@ -1063,31 +1063,31 @@ public class JobLevelCalculatorService {
 
                 if (currentJobLevelIndex > 9) {
                     // 职级>9：前60%升职，后5%降职
-                    if (allowanceRank <= SelMAXallowancerank(60,countR)) {
+                    if (allowanceRank <= selMaxAllowanceRank(60,countR)) {
                         // selMap.put("allowanceranksel", "前60%");
                         jobLevelIndex++;
                     }
-                    else if (allowanceRank >= SelMinallowancerank(5,countR) && SelMinallowancerank(5,countR) > 0) {
+                    else if (allowanceRank >= selMinAllowanceRank(5,countR) && selMinAllowanceRank(5,countR) > 0) {
                         // selMap.put("allowanceranksel", "后5%");
                         jobLevelIndex--;
                     }
                 } else if (currentJobLevelIndex > 5 && currentJobLevelIndex <= 9) {
                     // 职级5-9：前70%升职，后5%降职
-                    if (allowanceRank <= SelMAXallowancerank(70,countR)) {
+                    if (allowanceRank <= selMaxAllowanceRank(70,countR)) {
                         // selMap.put("allowanceranksel", "前70%");
                         jobLevelIndex++;
                     }
-                    else if (allowanceRank >= SelMinallowancerank(5,countR) && SelMinallowancerank(5,countR) > 0) {
+                    else if (allowanceRank >= selMinAllowanceRank(5,countR) && selMinAllowanceRank(5,countR) > 0) {
                         // selMap.put("allowanceranksel", "后5%");
                         jobLevelIndex--;
                     }
                 }else if (currentJobLevelIndex <= 5) {
                     // 职级≤5：前80%升职，后3%降职
-                    if (allowanceRank <= SelMAXallowancerank(80,countR)) {
+                    if (allowanceRank <= selMaxAllowanceRank(80,countR)) {
                         // selMap.put("allowanceranksel", "前80%");
                         jobLevelIndex++;
                     }
-                    else if (allowanceRank >= SelMinallowancerank(3,countR) && SelMinallowancerank(3,countR) > 0) {
+                    else if (allowanceRank >= selMinAllowanceRank(3,countR) && selMinAllowanceRank(3,countR) > 0) {
                         // selMap.put("allowanceranksel", "后3%");
                         jobLevelIndex--;
                     }
@@ -1096,31 +1096,31 @@ public class JobLevelCalculatorService {
                 // 技能序列：
                 if (currentJobLevelIndex > 8) {
                     //职级>8：前60%升职，后5%降职
-                    if (allowanceRank <= SelMAXallowancerank(60,countR)) {
+                    if (allowanceRank <= selMaxAllowanceRank(60,countR)) {
                         // selMap.put("allowanceranksel", "前60%");
                         jobLevelIndex++;
                     }
-                    else if (allowanceRank >= SelMinallowancerank(5,countR) && SelMinallowancerank(5,countR) > 0) {
+                    else if (allowanceRank >= selMinAllowanceRank(5,countR) && selMinAllowanceRank(5,countR) > 0) {
                         // selMap.put("allowanceranksel", "后5%");
                         jobLevelIndex--;
                     }
                 }else if (currentJobLevelIndex > 4 && currentJobLevelIndex <= 8) {
                     // 职级4-8：前70%升职，后5%降职
-                    if (allowanceRank <= SelMAXallowancerank(70,countR)) {
+                    if (allowanceRank <= selMaxAllowanceRank(70,countR)) {
                         // selMap.put("allowanceranksel", "前70%");
                         jobLevelIndex++;
                     }
-                    else if (allowanceRank >= SelMinallowancerank(5,countR) && SelMinallowancerank(5,countR) > 0) {
+                    else if (allowanceRank >= selMinAllowanceRank(5,countR) && selMinAllowanceRank(5,countR) > 0) {
                         // selMap.put("allowanceranksel", "后5%");
                         jobLevelIndex--;
                     }
                 } else if (currentJobLevelIndex <= 4) {
                     // 职级≤4：前80%升职，后3%降职
-                    if (allowanceRank <= SelMAXallowancerank(80,countR)) {
+                    if (allowanceRank <= selMaxAllowanceRank(80,countR)) {
                         // selMap.put("allowanceranksel", "前80%");
                         jobLevelIndex++;
                     }
-                    else if (allowanceRank >= SelMinallowancerank(3,countR) && SelMinallowancerank(3,countR) > 0) {
+                    else if (allowanceRank >= selMinAllowanceRank(3,countR) && selMinAllowanceRank(3,countR) > 0) {
                         // selMap.put("allowanceranksel", "后3%");
                         jobLevelIndex--;
                     }
@@ -1132,40 +1132,40 @@ public class JobLevelCalculatorService {
             jobLevelIndex = currentJobLevelIndex + 1;
         }
 
-        if (allowanceRank <= SelMAXallowancerank(60, countR)) {
+        if (allowanceRank <= selMaxAllowanceRank(60, countR)) {
             rankingResult.allowanceRankSel = "前60%";
         }
-        else if (allowanceRank <= SelMAXallowancerank(70, countR)) {
+        else if (allowanceRank <= selMaxAllowanceRank(70, countR)) {
             rankingResult.allowanceRankSel = "前60-70%";
         }
-        else if (allowanceRank <= SelMAXallowancerank(80, countR)) {
+        else if (allowanceRank <= selMaxAllowanceRank(80, countR)) {
             rankingResult.allowanceRankSel = "前70-80%";
         }
-        else if (allowanceRank <= SelMAXallowancerank(95, countR)) {
+        else if (allowanceRank <= selMaxAllowanceRank(95, countR)) {
             rankingResult.allowanceRankSel = "前80-95%";
         }
-        else if (allowanceRank >= SelMinallowancerank(3, countR)) {
+        else if (allowanceRank >= selMinAllowanceRank(3, countR)) {
             rankingResult.allowanceRankSel = "后3%";
         }
-        else if (allowanceRank >= SelMinallowancerank(5, countR)) {
+        else if (allowanceRank >= selMinAllowanceRank(5, countR)) {
             rankingResult.allowanceRankSel = "后5%";
         }
         return jobLevelIndex;
     }
 
-    public static int SelMAXallowancerank(int percent, int countallowancerank) {
-        int MAXallowancerank = 0;
-        double MAXallowancerankDouble = Double.parseDouble(countallowancerank + "") / 100.0 * Double.parseDouble(percent + "");
-        MAXallowancerank = (int) Math.round(MAXallowancerankDouble);
-        return MAXallowancerank;
+    public static int selMaxAllowanceRank(int percent, int countallowancerank) {
+        int maxAllowanceRank = 0;
+        double maxAllowancerRankDouble = Double.parseDouble(countallowancerank + "") / 100.0 * Double.parseDouble(percent + "");
+        maxAllowanceRank = (int) Math.round(maxAllowancerRankDouble);
+        return maxAllowanceRank;
     }
 
 
-    public static int SelMinallowancerank(int percent, int countallowancerank) {
-        int Minallowancerank = 0;
-        double MinallowancerankDouble = Double.parseDouble(countallowancerank + "") / 100.0 * Double.parseDouble(percent + "");
-        Minallowancerank = countallowancerank - ((int) Math.round(MinallowancerankDouble));
-        return Minallowancerank;
+    public static int selMinAllowanceRank(int percent, int countallowancerank) {
+        int minAllowanceRank = 0;
+        double minAllowanceRankDouble = Double.parseDouble(countallowancerank + "") / 100.0 * Double.parseDouble(percent + "");
+        minAllowanceRank = countallowancerank - ((int) Math.round(minAllowanceRankDouble));
+        return minAllowanceRank;
     }
 
 
@@ -1196,8 +1196,8 @@ public class JobLevelCalculatorService {
         DynamicObjectCollection query = QueryServiceHelper.query(PositionStructureConstant.PERSONPOSFILE_ENTITYID, selectFields.toString(), new QFilter[]{filer}, "nckd_executeyear desc,nckd_begindate desc");
         if(!query.isEmpty()){
             DynamicObject personPosFile = query.get(0);
-            int PR_lastjobgradeindex = personPosFile.getInt(String.join(".", PositionStructureConstant.NCKD_JOBLEVELHR, FormConstant.JOBLEVELSEQ));
-            return PR_lastjobgradeindex;
+            int lastAppointmentJobGradeIndex = personPosFile.getInt(String.join(".", PositionStructureConstant.NCKD_JOBLEVELHR, FormConstant.JOBLEVELSEQ));
+            return lastAppointmentJobGradeIndex;
         }
         return currentJobLevelIndex;
     }
@@ -1206,13 +1206,13 @@ public class JobLevelCalculatorService {
      * 根据考核结果使用情况处理职级计算
      */
     private static int handleAppraisalUsage(DynamicObject jobSeq, RankingResult rankingResult, int jobLevelIndex,
-                                     int PR_lastjobgradeindex, int currentJobLevelIndex, int minuspersonappraisal, boolean fistPR, boolean usedAppraisalResult, JobLevelResult jobLevelResult){
+                                     int lastAppointmentJobGradeIndex, int currentJobLevelIndex, int minuspersonappraisal, boolean fistPR, boolean usedAppraisalResult, JobLevelResult jobLevelResult){
         JobSeqEnum jobSeqEnum = JobSeqEnum.getByCode(jobSeq.getString(FormConstant.NUMBER_KEY));
         if (!usedAppraisalResult) {
             if (minuspersonappraisal == 0) {
                 if (!fistPR) {
                     // 考核结果为保级 所以相 等
-                    jobLevelIndex = PR_lastjobgradeindex;
+                    jobLevelIndex = lastAppointmentJobGradeIndex;
                 }
                 if (fistPR && ((rankingResult.countR == null || rankingResult.countR == 0) || (rankingResult.allowanceRank == null || rankingResult.allowanceRank == 0))) {
                     System.out.println("首次聘任而且无R排名,保持分数算出来的职级");
@@ -1221,12 +1221,12 @@ public class JobLevelCalculatorService {
                     jobLevelIndex = getnewjobgradeindexByrank(jobLevelIndex, currentJobLevelIndex, rankingResult, jobSeq);
                 }
                 System.out.println("newjobgradeindex:::" + jobLevelIndex);
-                System.out.println("PR_lastjobgradeindex:::" + PR_lastjobgradeindex);
-                if (currentJobLevelIndex > 1 && jobLevelIndex - PR_lastjobgradeindex == 1) {
+                System.out.println("PR_lastjobgradeindex:::" + lastAppointmentJobGradeIndex);
+                if (currentJobLevelIndex > 1 && jobLevelIndex - lastAppointmentJobGradeIndex == 1) {
                     // R排名升级
                     jobLevelResult.adjustType = "2";
                     System.out.println("R排名升级");
-                } else if (jobLevelIndex == PR_lastjobgradeindex) {
+                } else if (jobLevelIndex == lastAppointmentJobGradeIndex) {
                     // 保级
                     jobLevelResult.adjustType = "1";
                     System.out.println("R排名保级");
@@ -1388,14 +1388,14 @@ public class JobLevelCalculatorService {
         /*String Maxjobgradeindexstr = personpositionfileUtils.getMaxJobLevel(ctx, jobFamilyInfo.processedJobFamilyNumber,
                 jobScoreInfo.zgjbnumber, jobScoreInfo.zyjndjnumber);*/
         DynamicObject maxJobLevel1 = getMaxJobLevel(jobSeq, jobScoreInfo.perProTitleNumber, jobScoreInfo.quaLevelNumber);
-        int Maxjobgradeindex = maxJobLevel1.getInt(String.join(".",FormConstant.HBJM_JOBLEVELHR, FormConstant.JOBLEVELSEQ));
+        int maxJobGradeIndex = maxJobLevel1.getInt(String.join(".",FormConstant.HBJM_JOBLEVELHR, FormConstant.JOBLEVELSEQ));
         // 职级超出职称等级或技能等级能任命最高职职级则该最高职级就是要任命的职级
-        if (jobLevelIndex > Maxjobgradeindex) {
+        if (jobLevelIndex > maxJobGradeIndex) {
             if (StringUtils.isBlank(jobLevelResult.adjustType)) {
                 // 聘任下调
                 jobLevelResult.adjustType = "5";
             }
-            jobLevelIndex = Maxjobgradeindex;
+            jobLevelIndex = maxJobGradeIndex;
             if (currentJobLevelIndex > 1 && jobLevelIndex - currentJobLevelIndex == 1) {
                 // R排名升级
                 jobLevelResult.adjustType = "2";

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/common/PositionStructureConstant.java

@@ -62,7 +62,7 @@ public class PositionStructureConstant extends FormConstant {
     public static final String NCKD_APPOINTSTATUS = "NCKD_APPOINTSTATUS";
     /** 年度 */
     public static final String NCKD_EXECUTEYEAR = "NCKD_EXECUTEYEAR";
-    /** 调整类别 */
+    /** 调整类别（已生效1；未生效0） */
     public static final String NCKD_ADJUSTTYPE = "NCKD_ADJUSTTYPE";
     /** 年度调整状态 */
     public static final String NCKD_ADJUSSTATUS = "NCKD_ADJUSSTATUS";

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/form/adjust/NewDynamicAdjustmentDiaLogFormPlugin.java

@@ -136,14 +136,14 @@ public class NewDynamicAdjustmentDiaLogFormPlugin extends AbstractFormPlugin {
         DynamicObject[] personPosFileByPersonAndState = PositionStructureHelper.getPersonPosFileByPersonAndState(personId,
                 new String[]{"3"},
                 null,
-                new QFilter(PositionStructureConstant.NCKD_TYPESTATE, QCP.not_in, new String[]{"1", "2"}).and(new QFilter(PositionStructureConstant.NCKD_EXECUTEYEAR, QCP.in, new Integer[]{currentYear, year})));
+                new QFilter(PositionStructureConstant.NCKD_ADJUSTTYPE, QCP.not_in, new String[]{"1", "2"}).and(new QFilter(PositionStructureConstant.NCKD_EXECUTEYEAR, QCP.in, new Integer[]{currentYear, year})));
         if(personPosFileByPersonAndState != null && personPosFileByPersonAndState.length > 0){
             StringJoiner yearJoin = new StringJoiner("，");
             for (DynamicObject dynamicObject : personPosFileByPersonAndState) {
                 int executeYear = dynamicObject.getInt(PositionStructureConstant.NCKD_EXECUTEYEAR);
                 yearJoin.add(executeYear+"");
             }
-            throw new ValidationException(StrFormatter.format("当前无法为【{}】进行调整，因为人员存在【{}】年未生效的年度调整记录，请先前往【职位及积分年度调整】中进行处理！，不能早于最近一次职位调整时间。", personName,yearJoin.toString()));
+            throw new ValidationException(StrFormatter.format("当前无法为【{}】进行调整，因为人员存在【{}】年未生效的年度调整记录，请先前往【职位及积分年度调整】中进行处理！", personName,yearJoin.toString()));
         }
 
         // 9、处理考核结果

code/opmc/nckd-jxccl-opmc/src/main/java/nckd/jxccl/opmc/pm/plugin/form/PerfManagerBillPlugin.java

@@ -67,7 +67,7 @@ public class PerfManagerBillPlugin extends AbstractBillPlugIn implements Plugin
         DynamicObject dataEntity = this.getModel().getDataEntity();
         DynamicObjectCollection entrys = dataEntity.getDynamicObjectCollection(PerfManagerFormConstant.PERFMANAGER_ENTRY_ENTITYID);
         List<Date> dateList = entrys.stream().map(entry -> entry.getDate(PerfManagerFormConstant.APPRAISAL_YEAR_KEY)).collect(Collectors.toList());
-        if(FormConstant.SAVE_KEY.equals(operateKey)){
+        if(FormConstant.SAVE_OP.equals(operateKey)){
             if(CollectionUtils.isNotEmpty(dateList) && !dateList.stream().allMatch(Objects::isNull)) {
                 Date beginYear = dataEntity.getDate(PerfManagerFormConstant.BEGIN_YEAR_KEY);
                 Date endYear = dataEntity.getDate(PerfManagerFormConstant.END_YEAR_KEY);

code/opmc/nckd-jxccl-opmc/src/main/java/nckd/jxccl/opmc/pm/plugin/form/PerfManagerListPlugin.java

@@ -34,7 +34,7 @@ public class PerfManagerListPlugin extends AbstractListPlugin implements Plugin
             //是否向导方式进入
             this.getPageCache().put("isWizard","1");
             //隐藏退出按钮/生成调薪按钮
-            this.getView().setVisible(Boolean.FALSE,PerfManagerFormConstant.CLOSE_KEY);
+            this.getView().setVisible(Boolean.FALSE,PerfManagerFormConstant.CLOSE_OP);
             this.getView().setVisible(Boolean.FALSE,PerfManagerFormConstant.GENERATE_KEY);
         }
     }