Browse Source

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

- 将所有业务实体标识符提取到 FormConstant 类中统一管理
- 替换 BaseMedicalAllowanceServiceImpl 中的硬编码表名
- 更新 BuildApplyBillOpPlugin 中的表单常量引用
- 修改 CalResultCoverSalaryItemExtPlugin 中的计算规则引用
- 调整 SalaryAdjDelivaryDateValidator 中的协作业务对象常量
- 在 SynPendingSalaryAdjDataServiceImpl 中统一使用常量定义
- 删除冗余的局部变量定义,提升代码可维护性
- 确保所有查询操作使用统一的常量配置
turborao 1 week ago
parent
commit
b03087053c

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

@@ -95,7 +95,6 @@ public class FormConstant {
     }
     /** 定调薪人员属性配置 实体标识 */
     public static final String HCDM_CONTRASTPROPCONF = "hcdm_contrastpropconf";
-
     /** 证件信息 实体标识 */
     public static final String HRPI_PERCRE = "hrpi_percre";
     /** 社保档案 实体标识 */
@@ -103,13 +102,19 @@ public class FormConstant {
     /** 定调薪档案 实体标识 */
     public static final String HCDM_ADJFILEINFO = "hcdm_adjfileinfo";
     /** 薪酬体系 实体标识 */
-    public static final String HCDM_STDRSCMSC = "hcdm_stdscmsc";
+    public static final String HCDM_STDSCM = "hcdm_stdscm";
     /** 员工变动及处理_定调薪档案 实体标识 */
-    public static final String HPFS_EMPCOORDVERIFBILL2 = "hpfs_empcoordverifbill2";
-
+    public static final String HPDI_EMPCOORDVERIFBILL2 = "hpdi_empcoordverifbill2";
+    /** 入职办理列表-已入职 实体标识 */
+    public static final String HOM_PERSONHASONBRD = "hom_personhasonbrd";
+    /** 定调薪信息 实体标识 */
+    public static final String HCDM_DECADJRECORD = "hcdm_decadjrecord";
+    /** 薪档 实体标识 */
+    public static final String HSBS_SALARYRANK = "hsbs_salaryrank";
+    /** 计算规则 实体标识 */
+    public static final String HSAS_CALRULE = "hsas_calrule";
     /** HR人员与平台用户关联信息  HR组织-人员关系-实体标识 */
     public static final String HRPI_PERSONUSERREL = "hrpi_personuserrel";
-
     /** 法人岗位层级 */
     public static final String NCKD_HBSS_LEGPOSTLV = "nckd_hbss_legpostlv";
     /** 岗位管理层级 */

+ 10 - 10
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/business/BaseMedicalAllowanceServiceImpl.java

@@ -12,6 +12,8 @@ import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
+import nckd.jxccl.base.common.constant.FormConstant;
+
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -37,12 +39,11 @@ public class BaseMedicalAllowanceServiceImpl implements BaseMedicalAllowanceServ
     public Map<String, String> calcBaseMedicalAllowanceForAll() {
 
         //取员工档案
-        String billKey = "hcsi_sinsurfile";
         QFilter filter1 = new QFilter("iscurrentversion", QCP.equals, true); // 启用
         QFilter filter2 = new QFilter("datastatus", QCP.equals, "1"); // 启用
 
         String selectFields="id,employee.id,employee.number,nckd_benefitentry.nckd_effeyear,nckd_benefitentry.nckd_suppbenefit";
-        DynamicObject[] datas = BusinessDataServiceHelper.load(billKey, selectFields, new QFilter[]{filter1.and(filter2)});
+        DynamicObject[] datas = BusinessDataServiceHelper.load(FormConstant.HCSI_SINSURFILE, selectFields, new QFilter[]{filter1.and(filter2)});
 
         Map<String, String> result = calcBaseMedicalAllowance(datas, true);
 
@@ -52,13 +53,12 @@ public class BaseMedicalAllowanceServiceImpl implements BaseMedicalAllowanceServ
     public Map<String, String> calcBaseMedicalAllowanceForPersons(List<Long> billIds) {
 
         //取员工档案
-        String billKey = "hcsi_sinsurfile";
         QFilter filter1 = new QFilter("iscurrentversion", QCP.equals, true); // 启用
         QFilter filter2 = new QFilter("datastatus", QCP.equals, "1"); // 启用
         QFilter filter3 = new QFilter("id", QCP.in, billIds); // 启用
 
         String selectFields="id,employee.id,employee.number,nckd_benefitentry.nckd_effeyear,nckd_benefitentry.nckd_suppbenefit";
-        DynamicObject[] datas = BusinessDataServiceHelper.load(billKey, selectFields, new QFilter[]{filter1.and(filter2).and(filter3)});
+        DynamicObject[] datas = BusinessDataServiceHelper.load(FormConstant.HCSI_SINSURFILE, selectFields, new QFilter[]{filter1.and(filter2).and(filter3)});
 
         Map<String, String> result = calcBaseMedicalAllowance(datas,false);
 
@@ -92,7 +92,7 @@ public class BaseMedicalAllowanceServiceImpl implements BaseMedicalAllowanceServ
         QFilter qFilter1 = new QFilter("id",QCP.in, employeeIDs);
         QFilter qFilter11 = new QFilter("iscurrentversion", QCP.equals, true); // 启用
         QFilter qFilter12 = new QFilter("datastatus", QCP.equals, "1"); // 启用
-        DataSet employeeDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),"hrpi_employee", "id,number,name", new QFilter[]{qFilter1,qFilter11,qFilter12},null);
+        DataSet employeeDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),FormConstant.HRPI_EMPLOYEE, "id,number,name", new QFilter[]{qFilter1,qFilter11,qFilter12},null);
         employeeDS.print(true);
         /***
          * 获取员工档案 任职经历  岗位
@@ -101,7 +101,7 @@ public class BaseMedicalAllowanceServiceImpl implements BaseMedicalAllowanceServ
         QFilter qFilter21 = new QFilter("iscurrentdata", QCP.equals, true); // 启用
         QFilter qFilter22 = new QFilter("isprimary", QCP.equals, "1");  //主任职
         QFilter qFilter23 = new QFilter("postype.id", QCP.equals, 1010L); //主任职
-        DataSet empOrgRelDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),"hrpi_empposorgrel", "id,employee.id,company.id,company.name,position.id,position.number,position.name,adminorg.number", new QFilter[]{qFilter2,qFilter21,qFilter22,qFilter23},null);
+        DataSet empOrgRelDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),FormConstant.HRPI_EMPPOSORGREL, "id,employee.id,company.id,company.name,position.id,position.number,position.name,adminorg.number", new QFilter[]{qFilter2,qFilter21,qFilter22,qFilter23},null);
         empOrgRelDS.print(true);
         /***
          * 获取员工档案 雇佣信息  用工关系状态
@@ -109,28 +109,28 @@ public class BaseMedicalAllowanceServiceImpl implements BaseMedicalAllowanceServ
         QFilter qFilter3 = new QFilter("employee.id",QCP.in, employeeIDs);
         QFilter qFilter31 = new QFilter("iscurrentdata", QCP.equals, true); // 启用
         QFilter qFilter32 = new QFilter("ishired", QCP.equals, "1"); // 是否在职
-        DataSet empentrelDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),"hrpi_empentrel", "id,employee.id,laborrelstatus.number", new QFilter[]{qFilter3,qFilter31,qFilter32},null);
+        DataSet empentrelDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),FormConstant.HRPI_EMPENTREL, "id,employee.id,laborrelstatus.number", new QFilter[]{qFilter3,qFilter31,qFilter32},null);
 
         /***
          * 获取员工档案 党政职务  职务级别
          */
         QFilter qFilter4 = new QFilter("employee.id",QCP.in, employeeIDs);
         QFilter qFilter41 = new QFilter("iscurrentdata", QCP.equals, true); // 启用
-        DataSet posgradeDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),"nckd_hrpi_partyposh", "id,employee.id,nckd_posgrade.number", new QFilter[]{qFilter4,qFilter41},null);
+        DataSet posgradeDS = QueryServiceHelper.queryDataSet(this.getClass().getName(), FormConstant.NCKD_HRPI_PARTYPOSH, "id,employee.id,nckd_posgrade.number", new QFilter[]{qFilter4,qFilter41},null);
 
         /***
          * 获取员工档案 职称信息 职称级别  hrpi_perprotitle
          */
         QFilter qFilter5 = new QFilter("employee.id",QCP.in, employeeIDs);
         QFilter qFilter51 = new QFilter("ishigh", QCP.equals, "1"); // 启用
-        DataSet perprotitleDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),"hrpi_perprotitle", "id,employee.id,prolevel.number", new QFilter[]{qFilter5,qFilter51},null);
+        DataSet perprotitleDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),FormConstant.HRPI_PERPROTITLE, "id,employee.id,prolevel.number", new QFilter[]{qFilter5,qFilter51},null);
 
         /***
          * 获取员工档案 职业资格 职业资格等级  hrpi_perocpqual
          */
         QFilter qFilter6 = new QFilter("employee.id",QCP.in, employeeIDs);
         QFilter qFilter61 = new QFilter("ismajor", QCP.equals, "1"); // 启用
-        DataSet perocpqualeDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),"hrpi_perocpqual", "id,employee.id,qualevel.number", new QFilter[]{qFilter6,qFilter61},null);
+        DataSet perocpqualeDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),FormConstant.HRPI_PEROCPQUAL, "id,employee.id,qualevel.number", new QFilter[]{qFilter6,qFilter61},null);
 
 
         DataSet reDataset = null;

+ 2 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/business/CalResultCoverSalaryItemExtPlugin.java

@@ -10,6 +10,7 @@ import kd.bos.servicehelper.parameter.SystemParamServiceHelper;
 import kd.bos.servicehelper.permission.PermissionServiceHelper;
 import kd.sdk.swc.hsas.business.extpoint.payroll.ICalPersonCalResultCoverExtPlugin;
 import kd.sdk.swc.hsas.common.events.calperson.CalResultCoverSalaryItemEventArgs;
+import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.swc.helper.SWCHelper;
 import java.util.ArrayList;
 import java.util.List;
@@ -48,7 +49,7 @@ public class CalResultCoverSalaryItemExtPlugin implements ICalPersonCalResultCov
         DynamicObject calRuleHisObj = task.getDynamicObject("calrulev");
         if (calRuleHisObj != null && calRuleHisObj.getLong("id") > 0L && userIdList.contains(userId)) {
 
-            DynamicObject calRulev = SWCHelper.queryOne("hsas_calrule",calRuleHisObj.getLong("id"));
+            DynamicObject calRulev = SWCHelper.queryOne(FormConstant.HSAS_CALRULE,calRuleHisObj.getLong("id"));
             if (calRulev != null && !SWCHelper.isEmpty(calRulev.getDynamicObjectCollection("calruleitementry"))) {
                 DynamicObjectCollection calRuleItemEntry = calRulev.getDynamicObjectCollection("calruleitementry");
                 for (DynamicObject dataItem: calRuleItemEntry ) {

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

@@ -36,20 +36,6 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
 
     private static final Log logger = LogFactory.getLog(SynPendingSalaryAdjDataServiceImpl.class);
 
-
-    /**
-     * 入职单
-     */
-    private static final String onhasonbrdEntityName = "hom_personhasonbrd";
-    /**
-     * 调动单
-     */
-    private static final String transferEntityName = "hdm_transferapply";
-    /**
-     * 定调薪信息
-     */
-    private static final String adjrecordEntityName = "hcdm_decadjrecord";
-
     private static int days = 5;
 
     private DynamicObjectCollection salaryTypeDyns = null;
@@ -87,14 +73,13 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
          * 获取入职时的薪档
          */
         QFilter qFilter12 = new QFilter("number", QCP.equals, "01");
-        salaryRankDyn = QueryServiceHelper.queryOne("hsbs_salaryrank","id,number,name",new QFilter[]{qFilter12});
-
+        salaryRankDyn = QueryServiceHelper.queryOne(FormConstant.HSBS_SALARYRANK,"id,number,name",new QFilter[]{qFilter12});
 
         /**
          * 获取 定调薪项目 岗位工资标准
          */
         QFilter qFilter13 = new QFilter("name", QCP.equals, "岗位工资标准");
-        standardItemDyn = QueryServiceHelper.queryOne("hsbs_standarditem","id,number,name",new QFilter[]{qFilter13});
+        standardItemDyn = QueryServiceHelper.queryOne(FormConstant.HSBS_STANDARDITEM,"id,number,name",new QFilter[]{qFilter13});
     }
 
 
@@ -121,7 +106,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
         QFilter qFilter4 = new QFilter("b_effectivedate", QCP.less_equals, currentDate);
         QFilter qFilter5 = new QFilter("ba_po_position.nckd_paystdplan.name", QCP.equals, "江铜集团岗位绩效工资制");
 
-        DynamicObjectCollection onhasonbrdDyns = QueryServiceHelper.query(onhasonbrdEntityName, selectField2,new QFilter[]{qFilter1,qFilter2,qFilter3,qFilter4,qFilter5});
+        DynamicObjectCollection onhasonbrdDyns = QueryServiceHelper.query(FormConstant.HOM_PERSONHASONBRD, selectField2,new QFilter[]{qFilter1,qFilter2,qFilter3,qFilter4,qFilter5});
 
         Map<Long, DynamicObject> onhasonbrdMap = (Map)onhasonbrdDyns.stream().collect(Collectors.toMap((obj) -> {
             return obj.getLong("id");
@@ -181,7 +166,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
         QFilter qFilter14 = new QFilter("b_effectivedate", QCP.less_equals, currentDate);  //实际调动日期
         QFilter qFilter16 = new QFilter("aposition.nckd_paystdplan.name", QCP.equals, "江铜集团岗位绩效工资制");
 
-        DynamicObjectCollection transferDyns = QueryServiceHelper.query(transferEntityName, selectField1,new QFilter[]{qFilter12,qFilter13,qFilter14,qFilter16});
+        DynamicObjectCollection transferDyns = QueryServiceHelper.query(FormConstant.HDM_TRANSFERAPPLY, selectField1,new QFilter[]{qFilter12,qFilter13,qFilter14,qFilter16});
 
         Map<Long, DynamicObject> transferMap = (Map)transferDyns.stream().collect(Collectors.toMap((obj) -> {
             return obj.getLong("id");
@@ -288,7 +273,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
         QFilter qFilter4= new QFilter("salaryrank.id", QCP.equals, standardItemDyn.getLong("id"));
         QFilter qFilter5= new QFilter("iscurrentdata", QCP.equals, "1");
 
-        DynamicObjectCollection adjDyns = QueryServiceHelper.query(adjrecordEntityName, selectField,new QFilter[]{qFilter1,qFilter2,qFilter3,qFilter4,qFilter5});
+        DynamicObjectCollection adjDyns = QueryServiceHelper.query(FormConstant.HCDM_DECADJRECORD, selectField,new QFilter[]{qFilter1,qFilter2,qFilter3,qFilter4,qFilter5});
 
 
         Map<Long, DynamicObject> adjRecordMap = (Map)adjDyns.stream().collect(Collectors.toMap((obj) -> {
@@ -322,11 +307,11 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
         if(oldPosition != null || newPosition != null) {
             String selectField = "id,number,name,nckd_postgrade.id,nckd_mgtlvldtl.nckd_mgmtlevel.id";
             QFilter qFilter = new QFilter("id", QCP.equals, oldPosition);
-            DynamicObject oldPositionDyn = QueryServiceHelper.queryOne("hbpm_positionhr", selectField, new QFilter[]{qFilter});
+            DynamicObject oldPositionDyn = QueryServiceHelper.queryOne(FormConstant.HBPM_POSITIONHR, selectField, new QFilter[]{qFilter});
 
             String selectField1 = "id,number,name,nckd_postgrade.id,nckd_mgtlvldtl.nckd_mgmtlevel.id";
             QFilter qFilter1 = new QFilter("id", QCP.equals, newPosition);
-            DynamicObject newPositionDyn = QueryServiceHelper.queryOne("hbpm_positionhr", selectField1, new QFilter[]{qFilter1});
+            DynamicObject newPositionDyn = QueryServiceHelper.queryOne(FormConstant.HBPM_POSITIONHR, selectField1, new QFilter[]{qFilter1});
             //岗级
             Long oldPostGrade = EmptyUtil.isEmpty(oldPositionDyn.getLong("nckd_postgrade.id")) ? 0L : oldPositionDyn.getLong("nckd_postgrade.id");
             Long newPostGrade = EmptyUtil.isEmpty(newPositionDyn.getLong("nckd_postgrade.id")) ? 0L : newPositionDyn.getLong("nckd_postgrade.id");

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

@@ -378,7 +378,7 @@ public class BuildApplyBillOpPlugin extends AbstractOperationServicePlugIn imple
         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(FormConstant.HCDM_STDRSCMSC, selectField, new QFilter[]{qFilter1,qFilter2});
+        DynamicObject salarystandardDyn = QueryServiceHelper.queryOne(FormConstant.HCDM_STDSCM, selectField, new QFilter[]{qFilter1,qFilter2});
         return salarystandardDyn.getLong("entryentity.salarystandard.id");
     }
 

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

@@ -59,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(FormConstant.HPFS_EMPCOORDVERIFBILL2, selectField, new QFilter[]{qFilter,qFilter1,qFilter2,qFilter3});
+            DynamicObject employeesFiles = QueryServiceHelper.queryOne(FormConstant.HPDI_EMPCOORDVERIFBILL2, selectField, new QFilter[]{qFilter,qFilter1,qFilter2,qFilter3});
             if(EmptyUtil.isEmpty(employeesFiles) ){
                 this.addErrorMessage(obj,"员工:" + employeeName + ",定调薪档案不存在,请先完成员工变动及处理!");
             }