refactor(constant): 使用常量类替换硬编码字符串

- 引入 FormConstant 类统一管理表单实体标识
- 将代码中的硬编码字符串替换为对应的常量引用
- 删除冗余的局部变量定义，提升代码可维护性
- 统一薪资相关实体标识的引用方式
- 优化查询字段选择逻辑，明确指定所需字段
- 增强代码的一致性和可读性

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

@@ -1,5 +1,7 @@
 package nckd.jxccl.base.common.constant;
 
+import java.util.ArrayList;
+
 /**
  * 表单或页面常量
  * @author W.Y.C
@@ -72,12 +74,54 @@ public class FormConstant {
     public static final String HSBS_EMPLOYEE = "hsbs_employee";
     /** 法人单位 */
     public static final String HBSS_LAWENTITY = "hbss_lawentity";
+    /** 薪资核算列表 实体标识 */
+    public static final String HSAS_CALTABLE = "hsas_caltable";
+    /** 薪资核算任务 实体标识 */
+    public static final String HSAS_CALPAYROLLTASK = "hsas_calpayrolltask";
+    /** 薪资核算名单 实体标识 */
+    public static final String HSAS_CALPERSON = "hsas_calperson";
+    /** 定调薪类型  实体标识 */
+    public static final String HSBS_SALARYADJUSTRSN = "hsbs_salaryadjustrsn";
+    /**
+     * 定调薪类型 默认值  用于  定调薪清单处理
+     * */
+    public static ArrayList<String> getsalaryTypeList (){
+        ArrayList<String> salaryTypeList = new ArrayList<>();
+        /** 岗位调整调薪  */
+        salaryTypeList.add("tiaozhengtiaoxin");
+        /** 入职定薪新  */
+        salaryTypeList.add("100009");
+        return salaryTypeList;
+    }
+    /** 定调薪人员属性配置 实体标识 */
+    public static final String HCDM_CONTRASTPROPCONF = "hcdm_contrastpropconf";
+
+    /** 证件信息 实体标识 */
+    public static final String HRPI_PERCRE = "hrpi_percre";
+    /** 社保档案 实体标识 */
+    public static final String HCSI_SINSURFILE = "hcsi_sinsurfile";
+    /** 定调薪档案 实体标识 */
+    public static final String HCDM_ADJFILEINFO = "hcdm_adjfileinfo";
+    /** 薪酬体系 实体标识 */
+    public static final String HCDM_STDRSCMSC = "hcdm_stdscmsc";
+    /** 员工变动及处理_定调薪档案 实体标识 */
+    public static final String HPFS_EMPCOORDVERIFBILL2 = "hpfs_empcoordverifbill2";
+
+    /** HR人员与平台用户关联信息  HR组织-人员关系-实体标识 */
+    public static final String HRPI_PERSONUSERREL = "hrpi_personuserrel";
+
     /** 法人岗位层级 */
     public static final String NCKD_HBSS_LEGPOSTLV = "nckd_hbss_legpostlv";
     /** 岗位管理层级 */
     public static final String NCKD_HPFS_POSTLEVEL = "nckd_hpfs_postlevel";
     /** 任期 */
     public static final String NCKD_HPFS_TERM = "nckd_hpfs_term";
+    /** 退休人员信息 实体标识 */
+    public static final String NCKD_RETIREWARNING = "nckd_retirewarning";
+    /** 特殊工种记录 实体标识 */
+    public static final String NCKD_HRPI_SPECWRKLOG = "nckd_hrpi_specwrklog";
+    /** 员工待定调薪清单 实体标识 */
+    public static final String NCKD_PENDINGSALARYADJ = "nckd_pendingsalaryadj";
 
     //====================================== 标品op ======================================
     /** 确认框确认按钮 */

code/base/nckd-jxccl-base-helper/src/main/java/nckd/jxccl/base/swc/helper/SWCHelper.java

@@ -10,6 +10,7 @@ import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
+import nckd.jxccl.base.common.constant.FormConstant;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -32,7 +33,7 @@ public class SWCHelper {
      */
     public static DynamicObject queryTaskInfoById(Long id) {
         String selPros = "id,number,taskstatus, name, startdate, enddate, ishandleproration,taxitemschemev,country,org,calrulev,paysubjectv,calversionno,tasktype,payrollgroupv.currency.amtprecision,islimitadd,payrollgroupv.currency.name";
-        return queryOne(selPros,"hsas_calpayrolltask", id);
+        return queryOne(selPros, FormConstant.HSAS_CALPAYROLLTASK, id);
     }
 
     /**
@@ -90,9 +91,8 @@ public class SWCHelper {
      */
     public static Map<Long, DynamicObject> queryCalPersonList(Long employeeId) {
 
-        String entityName = "hsas_calperson";
         QFilter filter = new QFilter("employee.id", QCP.equals, employeeId);
-        DynamicObjectCollection dyns = QueryServiceHelper.query(entityName, "id,name,adminorg.nckd_firstorg.name,adminorg.nckd_secondorg.name,adminorg.nckd_thirdorg.name,adminorg.nckd_fourthorg.name,adminorg.nckd_fifthorg.name,adminorg.nckd_sixthorg.name,empposorgrelsndet.position.name", new QFilter[]{filter});
+        DynamicObjectCollection dyns = QueryServiceHelper.query(FormConstant.HSAS_CALPERSON, "id,name,adminorg.nckd_firstorg.name,adminorg.nckd_secondorg.name,adminorg.nckd_thirdorg.name,adminorg.nckd_fourthorg.name,adminorg.nckd_fifthorg.name,adminorg.nckd_sixthorg.name,empposorgrelsndet.position.name", new QFilter[]{filter});
 
         Map<Long, DynamicObject> dynsMap = (Map)dyns.stream().collect(Collectors.toMap((obj) -> {
             return obj.getLong("id");
@@ -115,7 +115,7 @@ public class SWCHelper {
      * @return
      */
     public static DynamicObjectCollection querySalaryList(List<Long> calPersonIds, Date startdate, Date enddate, String type) {
-        String entityName = "hsas_caltable";
+
         // 获取核算列表信息
         QFilter filter = new QFilter("calpersonid", QCP.in, calPersonIds);
         if(type.equals("10")){
@@ -138,7 +138,7 @@ public class SWCHelper {
         }
         selectFields = selectFields + ",caltask.paydate,caltask.payrolldate";
 
-        DynamicObjectCollection calTableDyns = QueryServiceHelper.query(entityName, selectFields, new QFilter[]{filter}, orderStr);
+        DynamicObjectCollection calTableDyns = QueryServiceHelper.query(FormConstant.HSAS_CALTABLE, selectFields, new QFilter[]{filter}, orderStr);
 
         return calTableDyns;
     }
@@ -149,7 +149,7 @@ public class SWCHelper {
      * @return
      */
     public static Long queryEmployeeIdByUserId(Long userId) {
-        HRBaseServiceHelper SERVICE_HELPER = new HRBaseServiceHelper("hrpi_personuserrel");
+        HRBaseServiceHelper SERVICE_HELPER = new HRBaseServiceHelper(FormConstant.HRPI_PERSONUSERREL);
         DynamicObject personuserrel = SERVICE_HELPER.queryOne("employee,user,createtime", new QFilter[]{new QFilter("user", "=", userId), new QFilter("enable", "=", "1")}, "createtime desc");
         return personuserrel == null ? 0L : personuserrel.getLong("employee_id");
     }
@@ -159,11 +159,8 @@ public class SWCHelper {
      */
     public static  DynamicObjectCollection getSalaryTypeDyns() {
 
-        ArrayList<String> salaryTypeList = new ArrayList<>();
-        salaryTypeList.add("tiaozhengtiaoxin");  //岗位调整调薪
-        salaryTypeList.add("100009");  //入职定薪新
-        QFilter qFilter11 = new QFilter("number", QCP.in, salaryTypeList);
-        DynamicObjectCollection salaryTypeDyns = QueryServiceHelper.query("hsbs_salaryadjustrsn","id,number,name",new QFilter[]{qFilter11},"number");
+        QFilter qFilter11 = new QFilter("number", QCP.in, FormConstant.getsalaryTypeList());
+        DynamicObjectCollection salaryTypeDyns = QueryServiceHelper.query(FormConstant.HSBS_SALARYADJUSTRSN,"id,number,name",new QFilter[]{qFilter11},"number");
         return salaryTypeDyns;
     }
 
@@ -174,7 +171,7 @@ public class SWCHelper {
      */
     public static DynamicObject getSalaryPersonProperty(String SalaryPersonPropertyName) {
         QFilter qFilter = new QFilter("name", QCP.equals, SalaryPersonPropertyName);
-        DynamicObject salaryPersonPropertDyn = QueryServiceHelper.queryOne("hcdm_contrastpropconf","id,number,name",new QFilter[]{qFilter});
+        DynamicObject salaryPersonPropertDyn = QueryServiceHelper.queryOne(FormConstant.HCDM_CONTRASTPROPCONF,"id,number,name",new QFilter[]{qFilter});
         return salaryPersonPropertDyn;
     }
 

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/business/SynPendingSalaryAdjDataServiceImpl.java

@@ -14,6 +14,7 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.bos.servicehelper.parameter.SystemParamServiceHelper;
+import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.swc.helper.SWCHelper;
 
 import java.time.LocalDate;
@@ -35,10 +36,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
 
     private static final Log logger = LogFactory.getLog(SynPendingSalaryAdjDataServiceImpl.class);
 
-    /**
-     * 员工待定调薪清单
-     */
-    private static final String entityName = "nckd_pendingsalaryadj";
+
     /**
      * 入职单
      */
@@ -111,7 +109,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
 
         ArrayList<DynamicObject> billDynList = new ArrayList<>();
         StringBuffer errorInfo = new StringBuffer();
-        MainEntityType entityType = EntityMetadataCache.getDataEntityType(entityName);
+        MainEntityType entityType = EntityMetadataCache.getDataEntityType(FormConstant.NCKD_PENDINGSALARYADJ);
 
         /**
          * 查询入职单
@@ -137,8 +135,8 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
         List<Long> onhasonbrdIDs = onhasonbrdMap.keySet().stream().collect(Collectors.toList());
 
         QFilter qFilter22 = new QFilter("nckd_billid", QCP.in, onhasonbrdIDs);
-        List<Object> listIDs = QueryServiceHelper.queryPrimaryKeys(entityName,new QFilter[]{qFilter22}, null, Integer.MAX_VALUE);
-        DynamicObject billDyn =  BusinessDataServiceHelper.newDynamicObject(entityName);
+        List<Object> listIDs = QueryServiceHelper.queryPrimaryKeys(FormConstant.NCKD_PENDINGSALARYADJ,new QFilter[]{qFilter22}, null, Integer.MAX_VALUE);
+        DynamicObject billDyn =  BusinessDataServiceHelper.newDynamicObject(FormConstant.NCKD_PENDINGSALARYADJ);
         DynamicObject[] billDyns = BusinessDataServiceHelper.load(listIDs.toArray(),billDyn.getDynamicObjectType());
 
         int onhasonbrdCount = 0;
@@ -195,8 +193,8 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
         List<Long> transferIDs = transferMap.keySet().stream().collect(Collectors.toList());
 
         QFilter qFilter15 = new QFilter("nckd_billid", QCP.in, transferIDs);
-        List<Object> transferlistIDs = QueryServiceHelper.queryPrimaryKeys(entityName,new QFilter[]{qFilter15}, null, Integer.MAX_VALUE);
-        DynamicObject billDynType =  BusinessDataServiceHelper.newDynamicObject(entityName);
+        List<Object> transferlistIDs = QueryServiceHelper.queryPrimaryKeys(FormConstant.NCKD_PENDINGSALARYADJ,new QFilter[]{qFilter15}, null, Integer.MAX_VALUE);
+        DynamicObject billDynType =  BusinessDataServiceHelper.newDynamicObject(FormConstant.NCKD_PENDINGSALARYADJ);
         DynamicObject[] billDyns1 = BusinessDataServiceHelper.load(transferlistIDs.toArray(),billDynType.getDynamicObjectType());
 
         int transferCount = 0;

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/plugin/form/EmpSalaryQueryMobFormPlugin.java

@@ -14,6 +14,7 @@ import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.servicehelper.user.UserServiceHelper;
 import kd.sdk.plugin.Plugin;
+import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.swc.constants.SwcConstant;
 import nckd.jxccl.base.swc.helper.SWCHelper;
 
@@ -37,7 +38,6 @@ public class EmpSalaryQueryMobFormPlugin extends AbstractMobFormPlugin implement
     private static final String KEY_LAB_SUBAMT = "nckd_subamt";
     private static String KEY_CTL_STARTDATE = "startmonth";
     private static String KEY_CTL_ENDDATE = "endmonth";
-    private static String KEY_META_PERUSER = "hrpi_personuserrel";
     private static Long KEY_EMPID = 0L;
     private static Date KEY_STARTDATE = new Date();
     private static Date KEY_ENDDATE = new Date();
@@ -101,7 +101,7 @@ public class EmpSalaryQueryMobFormPlugin extends AbstractMobFormPlugin implement
         Long userId = UserServiceHelper.getCurrentUserId();
         this.getModel().setValue("nckd_user", userId);
 
-        DynamicObject personUserDyn = SWCHelper.queryOne(KEY_META_PERUSER, "employee.id","user",userId);
+        DynamicObject personUserDyn = SWCHelper.queryOne(FormConstant.HRPI_PERSONUSERREL, "employee.id","user",userId);
 
         if(personUserDyn == null){
             /**
@@ -164,7 +164,7 @@ public class EmpSalaryQueryMobFormPlugin extends AbstractMobFormPlugin implement
         QFilter filter1 = new QFilter("isprimary", QCP.equals, "1");
         QFilter filter2 = new QFilter("iscurrentdata", QCP.equals, "1");
         QFilter filter3 = new QFilter("employee.id", QFilter.equals, KEY_EMPID);
-        DynamicObject employeeDyn = QueryServiceHelper.queryOne("hrpi_empposorgrel",selectFields1, new QFilter[]{filter1, filter2, filter3});
+        DynamicObject employeeDyn = QueryServiceHelper.queryOne(FormConstant.HRPI_EMPPOSORGREL,selectFields1, new QFilter[]{filter1, filter2, filter3});
 
         if(employeeDyn == null){
             this.getView().showMessage("未找到员工！");

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/plugin/form/EmpSalaryQueryWebFormPlugin.java

@@ -21,6 +21,7 @@ import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.servicehelper.user.UserServiceHelper;
 import kd.sdk.plugin.Plugin;
+import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.swc.helper.SWCHelper;
 
@@ -44,7 +45,6 @@ public class EmpSalaryQueryWebFormPlugin extends AbstractFormPlugin implements
     private static final String KEY_LAB_SUBAMT = "nckd_subamt";
     private static String KEY_CTL_STARTDATE = "startmonth";
     private static String KEY_CTL_ENDDATE = "endmonth";
-    private static String KEY_META_PERUSER = "hrpi_personuserrel";
     private static Long KEY_EMPID = 0L;
     private static Date KEY_STARTDATE = new Date();
     private static Date KEY_ENDDATE = new Date();
@@ -64,7 +64,7 @@ public class EmpSalaryQueryWebFormPlugin extends AbstractFormPlugin implements
 
         Long userId = UserServiceHelper.getCurrentUserId();
 
-        DynamicObject personUserDyn = SWCHelper.queryOne(KEY_META_PERUSER, "employee.id","user",userId);
+        DynamicObject personUserDyn = SWCHelper.queryOne(FormConstant.HRPI_PERSONUSERREL, "employee.id","user",userId);
 
         if(personUserDyn == null){
             /**
@@ -152,7 +152,7 @@ public class EmpSalaryQueryWebFormPlugin extends AbstractFormPlugin implements
         QFilter filter1 = new QFilter("isprimary", QCP.equals, "1");
         QFilter filter2 = new QFilter("iscurrentdata", QCP.equals, "1");
         QFilter filter3 = new QFilter("employee.id", QFilter.equals, KEY_EMPID);
-        DynamicObject employeeDyn = QueryServiceHelper.queryOne("hrpi_empposorgrel",selectFields1, new QFilter[]{filter1, filter2, filter3});
+        DynamicObject employeeDyn = QueryServiceHelper.queryOne(FormConstant.HRPI_EMPPOSORGREL,selectFields1, new QFilter[]{filter1, filter2, filter3});
 
         if(employeeDyn == null){
             this.getView().showMessage("未找到员工！");

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/plugin/form/PendingSalaryAdjListPlugin.java

@@ -21,6 +21,7 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.sdk.plugin.Plugin;
+import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.swc.init.business.SynPendingSalaryAdjDataServiceImpl;
 import java.util.*;
 
@@ -34,11 +35,6 @@ import java.util.*;
  */
 public class PendingSalaryAdjListPlugin extends AbstractListPlugin implements Plugin {
 
-    /**
-     * 员工待定调薪清单
-     */
-    private static final String entityName = "nckd_pendingsalaryadj";
-
     @Override
     public void registerListener(EventObject e) {
         super.registerListener(e);
@@ -54,7 +50,7 @@ public class PendingSalaryAdjListPlugin extends AbstractListPlugin implements Pl
             ListSelectedRow selectedRow = billList.getCurrentSelectedRowInfo();
             if (selectedRow != null) {
                 long id = Long.parseLong(String.valueOf(selectedRow.getPrimaryKeyValue()));
-                DynamicObject dyn = QueryServiceHelper.queryOne(entityName,"id,nckd_employeefield.boid,nckd_employeefield.name", new QFilter[]{new QFilter("id", "=", id)});
+                DynamicObject dyn = QueryServiceHelper.queryOne(FormConstant.NCKD_PENDINGSALARYADJ,"id,nckd_employeefield.boid,nckd_employeefield.name", new QFilter[]{new QFilter("id", "=", id)});
                 BaseShowParameter showParameter = new BaseShowParameter();
                 showParameter.setFormId("hsbs_employee");
                 showParameter.setPkId(dyn.get("nckd_employeefield.boid"));
@@ -137,7 +133,7 @@ public class PendingSalaryAdjListPlugin extends AbstractListPlugin implements Pl
     public void setBillStatus(String billStatus,String operateKey) {
         StringBuffer errorInfo = new StringBuffer();
         ListSelectedRowCollection selectedRows = this.getSelectedRows();
-        MainEntityType entityType= EntityMetadataCache.getDataEntityType(entityName);
+        MainEntityType entityType= EntityMetadataCache.getDataEntityType(FormConstant.NCKD_PENDINGSALARYADJ);
         DynamicObject[] billDyns = BusinessDataServiceHelper.load(selectedRows.getPrimaryKeyValues(), entityType);
         for (DynamicObject billDyn : billDyns){
             String currbillstatus = billDyn.getString("billstatus");

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/plugin/operate/ApplyBillBackPendSalaryAdjOpPlugin.java

@@ -8,6 +8,7 @@ import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.sdk.plugin.Plugin;
+import nckd.jxccl.base.common.constant.FormConstant;
 
 import java.util.Arrays;
 import java.util.List;
@@ -25,7 +26,7 @@ public class ApplyBillBackPendSalaryAdjOpPlugin extends AbstractOperationService
      * 员工待定调薪清单
      */
     private static final String entityName = "nckd_pendingsalaryadj";
-    private static final String SelectFields = "nckd_pendingsalaryadj";
+    private static final String SelectFields = "id,billno,billstatus,nckd_applybillid";
 
     @Override
     public void afterExecuteOperationTransaction(AfterOperationArgs e) {
@@ -58,7 +59,7 @@ public class ApplyBillBackPendSalaryAdjOpPlugin extends AbstractOperationService
         List<Long> billIDs = billMap.keySet().stream().collect(Collectors.toList());
 
         QFilter qFilter = new QFilter("nckd_applybillid", QCP.in, billIDs);
-        DynamicObject[] pendSalaryAdjDyns = BusinessDataServiceHelper.load(entityName,SelectFields, new QFilter[]{qFilter});
+        DynamicObject[] pendSalaryAdjDyns = BusinessDataServiceHelper.load(FormConstant.NCKD_PENDINGSALARYADJ,SelectFields, new QFilter[]{qFilter});
         for (DynamicObject pendSalaryAdjDyn : pendSalaryAdjDyns) {
             if(operationKey.equals("delete")) {
                 pendSalaryAdjDyn.set("nckd_applybillid", 0L);  ///更新为 0

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/plugin/operate/BuildApplyBillOpPlugin.java

@@ -18,6 +18,7 @@ import kd.sdk.swc.hcdm.business.helper.HCDMApplyBillServiceHelper;
 import kd.sdk.swc.hcdm.business.helper.HCDMSalaryStdServiceHelper;
 import kd.sdk.swc.hcdm.common.dto.stdtab.match.StdTableGradeRankRangeMatchParam;
 import kd.sdk.swc.hcdm.common.dto.stdtab.match.StdTableGradeRankRangeMatchResult;
+import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.ConvertUtil;
 import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.swc.helper.SWCHelper;
@@ -303,7 +304,7 @@ public class BuildApplyBillOpPlugin extends AbstractOperationServicePlugIn imple
         QFilter qFilter2 = new QFilter("datastatus", QCP.equals, "1"); // 启用
         QFilter qFilter3 = new QFilter("position.id", QCP.equals, positionID);
         String selectField = "id,boid,number,employee.id,org.id,country.id,salarystructure.id,stdscm.id,empgroup.id,position.nckd_postgrade.id";
-        DynamicObject employeesFiles = QueryServiceHelper.queryOne("hcdm_adjfileinfo", selectField, new QFilter[]{qFilter,qFilter1,qFilter2,qFilter3});
+        DynamicObject employeesFiles = QueryServiceHelper.queryOne(FormConstant.HCDM_ADJFILEINFO, selectField, new QFilter[]{qFilter,qFilter1,qFilter2,qFilter3});
 
         return employeesFiles;
     }
@@ -374,11 +375,10 @@ public class BuildApplyBillOpPlugin extends AbstractOperationServicePlugIn imple
      * @param salaryStdItemId   定调薪项目
      */
     public Long getSalarystandard( Long stdscmId, Long salaryStdItemId) {
-        String entryentity = "hcdm_stdscm";
         String selectField = "id,entryentity.salarystandard.id";
         QFilter qFilter1 = new QFilter("id", QCP.equals, stdscmId);
         QFilter qFilter2 = new QFilter("entryentity.standarditem.id", QCP.equals, salaryStdItemId);
-        DynamicObject salarystandardDyn = QueryServiceHelper.queryOne(entryentity, selectField, new QFilter[]{qFilter1,qFilter2});
+        DynamicObject salarystandardDyn = QueryServiceHelper.queryOne(FormConstant.HCDM_STDRSCMSC, selectField, new QFilter[]{qFilter1,qFilter2});
         return salarystandardDyn.getLong("entryentity.salarystandard.id");
     }
 
@@ -397,7 +397,12 @@ public class BuildApplyBillOpPlugin extends AbstractOperationServicePlugIn imple
         String billnameStr = billname.substring(0, billname.length()-1);
 
         String billnameMonth = DateUtil.format(DateUtil.now(), "yyyyMM");
-        String re = "【"+billnameStr+"】"+billnameMonth+"-员工待定调薪清单-生成";
+        String re = "";
+        if(index >= 2) {
+            re = "【" + billnameStr + "...等】" + billnameMonth + "-员工待定调薪清单-生成";
+        }else{
+            re = "【" + billnameStr + "】" + billnameMonth + "-员工待定调薪清单-生成";
+        }
         return re;
     }
 

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/plugin/operate/SalaryAdjDelivaryDateValidator.java

@@ -8,6 +8,7 @@ import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.util.StringUtils;
+import nckd.jxccl.base.common.constant.FormConstant;
 
 import java.util.ArrayList;
 
@@ -18,10 +19,6 @@ import java.util.ArrayList;
  */
 public class SalaryAdjDelivaryDateValidator extends AbstractValidator {
 
-    /**
-     * 员工变动及处理_定调薪档案
-     */
-    private static final String EmpChangeBill = "hpdi_empcoordverifbill2";
     /**
      * 协作业务对象   定调薪档案
      */
@@ -62,7 +59,7 @@ public class SalaryAdjDelivaryDateValidator extends AbstractValidator {
             QFilter qFilter2 = new QFilter("dealresult", QCP.equals, "8"); // 变动状态  已处理
             QFilter qFilter3 = new QFilter("coordbizobject.number", QCP.equals, CoordBizObject);  //协作业务对象   定调薪档案
             String selectField = "id,employeev.boid,coordruleparam.chgevent_z.id,dealresult";
-            DynamicObject employeesFiles = QueryServiceHelper.queryOne(EmpChangeBill, selectField, new QFilter[]{qFilter,qFilter1,qFilter2,qFilter3});
+            DynamicObject employeesFiles = QueryServiceHelper.queryOne(FormConstant.HPFS_EMPCOORDVERIFBILL2, selectField, new QFilter[]{qFilter,qFilter1,qFilter2,qFilter3});
             if(EmptyUtil.isEmpty(employeesFiles) ){
                 this.addErrorMessage(obj,"员工：" + employeeName + "，定调薪档案不存在，请先完成员工变动及处理！");
             }

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/plugin/other/DelayedRetirementDateCalcTask.java

@@ -14,6 +14,7 @@ import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.bos.util.StringUtils;
 import kd.sdk.plugin.Plugin;
+import nckd.jxccl.base.common.constant.FormConstant;
 
 
 import java.math.BigDecimal;
@@ -76,14 +77,13 @@ public class DelayedRetirementDateCalcTask  extends AbstractTask implements Plug
         // 将 Instant 转换回 Date
         Date ninetyDaysAgoDate = Date.from(ninetyDaysAgoInstant);
         //取员工档案
-        String billKey = "hcsi_sinsurfile";
         QFilter filter1 = new QFilter("iscurrentversion", QCP.equals, true); // 启用
         QFilter filter2 = new QFilter("datastatus", QCP.equals, "1"); // 启用
         QFilter filter3 = new QFilter("nckd_legaldate", QCP.large_equals, currentDate);
         QFilter filter4 = new QFilter("nckd_legaldate", QCP.less_equals, ninetyDaysAgoDate);
 
         String selectFields="id,employee.id,employee.number,employee.name,certificatenumber,nckd_recorddate,nckd_legaldate,nckd_newlegaldate";
-        DynamicObject[] recordDyn = BusinessDataServiceHelper.load(billKey, selectFields, new QFilter[]{filter1.and(filter2).and(filter3).and(filter4)});
+        DynamicObject[] recordDyn = BusinessDataServiceHelper.load(FormConstant.HCSI_SINSURFILE, selectFields, new QFilter[]{filter1.and(filter2).and(filter3).and(filter4)});
 
         Map<Long, DynamicObject> employeeFileMaps = Arrays.stream(recordDyn).collect(
                 Collectors.toMap(
@@ -102,7 +102,7 @@ public class DelayedRetirementDateCalcTask  extends AbstractTask implements Plug
         QFilter filter10 = new QFilter("postype.id", QCP.equals, 1010L); //主任职
 
         String selectFields1 = "id,employee.id,company.id";
-        DynamicObjectCollection empposorgreDyns = QueryServiceHelper.query("hrpi_empposorgrel", selectFields1, new QFilter[]{filter7 ,filter8,filter9,filter10});
+        DynamicObjectCollection empposorgreDyns = QueryServiceHelper.query(FormConstant.HRPI_EMPPOSORGREL, selectFields1, new QFilter[]{filter7 ,filter8,filter9,filter10});
 
         Map<Long, DynamicObject> empposorgreMap = (Map)empposorgreDyns.stream().collect(Collectors.toMap((obj) -> {
             return obj.getLong("employee.id");
@@ -118,7 +118,7 @@ public class DelayedRetirementDateCalcTask  extends AbstractTask implements Plug
         QFilter filter12 = new QFilter("credentialstype.id", QCP.equals, 1010L); // 启用
         QFilter filter13 = new QFilter("employee.id", QCP.in, employeeIDs);
         String selectFields2="id,employee.id,number,birthday";
-        DynamicObjectCollection personDyns = QueryServiceHelper.query("hrpi_percre", selectFields2,new QFilter[]{ filter12, filter13});
+        DynamicObjectCollection personDyns = QueryServiceHelper.query(FormConstant.HRPI_PERCRE, selectFields2,new QFilter[]{ filter12, filter13});
 
         Map<Long, DynamicObject> personMap = (Map)personDyns.stream().collect(Collectors.toMap((obj) -> {
             return obj.getLong("employee.id");
@@ -134,7 +134,7 @@ public class DelayedRetirementDateCalcTask  extends AbstractTask implements Plug
         QFilter filter23 = new QFilter("employee.id", QCP.in, employeeIDs);
 
         String selectFields3="id,employee.id,laborrelstatus.id";
-        DynamicObjectCollection empentrelDyns = QueryServiceHelper.query("hrpi_empentrel", selectFields3,new QFilter[]{filter21, filter22, filter23});
+        DynamicObjectCollection empentrelDyns = QueryServiceHelper.query(FormConstant.HRPI_EMPENTREL, selectFields3,new QFilter[]{filter21, filter22, filter23});
 
         Map<Long, DynamicObject> empentrelMap = (Map)empentrelDyns.stream().collect(Collectors.toMap((obj) -> {
             return obj.getLong("employee.id");
@@ -146,7 +146,7 @@ public class DelayedRetirementDateCalcTask  extends AbstractTask implements Plug
 
         //查退休人员信息数据
         QFilter qFilter = new QFilter("nckd_person.id", QCP.in, employeeIDs);
-        List<Object> listIDs = QueryServiceHelper.queryPrimaryKeys("nckd_retirewarning",new QFilter[]{qFilter}, null, Integer.MAX_VALUE);
+        List<Object> listIDs = QueryServiceHelper.queryPrimaryKeys(FormConstant.NCKD_RETIREWARNING,new QFilter[]{qFilter}, null, Integer.MAX_VALUE);
         DynamicObject retirewarnDyn =  BusinessDataServiceHelper.newDynamicObject("nckd_retirewarning");
         DynamicObject[] retirewarnDyns = BusinessDataServiceHelper.load(listIDs.toArray(),retirewarnDyn.getDynamicObjectType());
 
@@ -236,13 +236,12 @@ public class DelayedRetirementDateCalcTask  extends AbstractTask implements Plug
         // 将 Instant 转换回 Date
         Date threeDaysAgoDate = Date.from(threeDaysAgoInstant);
         //取员工档案
-        String billKey = "hcsi_sinsurfile";
         QFilter filter1 = new QFilter("iscurrentversion", QCP.equals, true); // 启用
         QFilter filter2 = new QFilter("datastatus", QCP.equals, "1"); // 启用
         QFilter filter5 = new QFilter("modifytime", QCP.large_equals, threeDaysAgoDate);
 
         String selectFields="id,employee.id,employee.number,nckd_recorddate,nckd_legaldate,nckd_newlegaldate";
-        DynamicObject[] datas = BusinessDataServiceHelper.load(billKey, selectFields, new QFilter[]{filter1.and(filter2).and(filter5)});
+        DynamicObject[] datas = BusinessDataServiceHelper.load(FormConstant.HCSI_SINSURFILE, selectFields, new QFilter[]{filter1.and(filter2).and(filter5)});
 
         Map<Long, DynamicObject> employeeFileMaps = Arrays.stream(datas).collect(
                 Collectors.toMap(
@@ -475,7 +474,7 @@ public class DelayedRetirementDateCalcTask  extends AbstractTask implements Plug
          QFilter filter13 = new QFilter("employee.id", QCP.in, employeeIDs);
          // 查人员基础信息中的性别
          String selectFields2="id,employee.id,nckd_totalmon";
-         DynamicObjectCollection personDyns = QueryServiceHelper.query("nckd_hrpi_specwrklog", selectFields2,new QFilter[]{filter11, filter13});
+         DynamicObjectCollection personDyns = QueryServiceHelper.query(FormConstant.NCKD_HRPI_SPECWRKLOG, selectFields2,new QFilter[]{filter11, filter13});
 
          Map<Long, DynamicObject> specialWorkersMap = (Map)personDyns.stream().collect(Collectors.toMap((obj) -> {
              return obj.getLong("employee.id");
@@ -499,7 +498,7 @@ public class DelayedRetirementDateCalcTask  extends AbstractTask implements Plug
          QFilter filter9 = new QFilter("employee.id", QCP.in, employeeIDs);
 
          String selectFields1 = "id,employee.id,employee.number,position.nckd_jobseq.number";
-         DynamicObjectCollection empposorgreDyns = QueryServiceHelper.query("hrpi_empposorgrel", selectFields1, new QFilter[]{filter7 ,filter9});
+         DynamicObjectCollection empposorgreDyns = QueryServiceHelper.query(FormConstant.HRPI_EMPPOSORGREL, selectFields1, new QFilter[]{filter7 ,filter9});
 
          Map<Long, DynamicObject> empposorgreMap = (Map)empposorgreDyns.stream().collect(Collectors.toMap((obj) -> {
              return obj.getLong("employee.id");
@@ -522,7 +521,7 @@ public class DelayedRetirementDateCalcTask  extends AbstractTask implements Plug
          QFilter filter13 = new QFilter("id", QCP.in, employeeIDs);
          // 查人员基础信息中的性别
          String selectFields2="id,number,name,birthday,gender.masterid";
-         DynamicObjectCollection personDyns = QueryServiceHelper.query("hrpi_employee", selectFields2,new QFilter[]{filter11, filter12, filter13});
+         DynamicObjectCollection personDyns = QueryServiceHelper.query(FormConstant.HRPI_EMPLOYEE, selectFields2,new QFilter[]{filter11, filter12, filter13});
 
          Map<Long, DynamicObject> personMap = (Map)personDyns.stream().collect(Collectors.toMap((obj) -> {
              return obj.getLong("id");