浏览代码

fix(swc): 调整定调薪档案查询逻辑

- 移除了 getSalaryFileInfo 方法中冗余的 salaryStdItemId 参数
- 在薪资调整交付日期验证器中增加了对协作业务对象的过滤条件
- 添加了协作业务对象常量定义以提高代码可读性
turborao 1 周之前
父节点
当前提交
8d5ae0035e

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

@@ -159,7 +159,7 @@ public class BuildApplyBillOpPlugin extends AbstractOperationServicePlugIn imple
                 applyBill.put("salaryadjrsn", salaryTypeDyns.get(0).getLong("id"));
                 applyBill.put("salaryadjrsn", salaryTypeDyns.get(0).getLong("id"));
             }
             }
             Long positionId = data.getLong("nckd_newposition.id");
             Long positionId = data.getLong("nckd_newposition.id");
-            DynamicObject salaryfile  = getSalaryFileInfo(employeeId,positionId,salaryStdItemId);
+            DynamicObject salaryfile  = getSalaryFileInfo(employeeId,positionId);
             applyBillEntry.put("adjfile", salaryfile.getLong("id"));
             applyBillEntry.put("adjfile", salaryfile.getLong("id"));
             applyBillEntry.put("employee", employeeId);
             applyBillEntry.put("employee", employeeId);
             applyBillEntry.put("standarditem", salaryStdItemId);    //定调薪项目   岗位工资标准
             applyBillEntry.put("standarditem", salaryStdItemId);    //定调薪项目   岗位工资标准
@@ -295,9 +295,8 @@ public class BuildApplyBillOpPlugin extends AbstractOperationServicePlugIn imple
      * stdscm.entryentity.salarystandard.id  标准表 ID
      * stdscm.entryentity.salarystandard.id  标准表 ID
      * @param employeeID  员工ID
      * @param employeeID  员工ID
      * @param positionID  岗位ID
      * @param positionID  岗位ID
-     * @param salaryStdItemId  定调薪项目ID
      */
      */
-    public DynamicObject getSalaryFileInfo(Long employeeID, Long positionID, Long salaryStdItemId){
+    public DynamicObject getSalaryFileInfo(Long employeeID, Long positionID){
 
 
         QFilter qFilter = new QFilter("employee.id", QCP.equals, employeeID);
         QFilter qFilter = new QFilter("employee.id", QCP.equals, employeeID);
         QFilter qFilter1 = new QFilter("iscurrentversion", QCP.equals, "1"); // 启用
         QFilter qFilter1 = new QFilter("iscurrentversion", QCP.equals, "1"); // 启用

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

@@ -22,6 +22,12 @@ public class SalaryAdjDelivaryDateValidator extends AbstractValidator {
      * 员工变动及处理_定调薪档案
      * 员工变动及处理_定调薪档案
      */
      */
     private static final String EmpChangeBill = "hpdi_empcoordverifbill2";
     private static final String EmpChangeBill = "hpdi_empcoordverifbill2";
+    /**
+     * 协作业务对象   定调薪档案
+     */
+    private static final String CoordBizObject = "hcdm_adjfileinfo";  //协作业务对象   定调薪档案
+
+
     @Override
     @Override
     public void validate() {
     public void validate() {
 
 
@@ -54,8 +60,9 @@ public class SalaryAdjDelivaryDateValidator extends AbstractValidator {
             QFilter qFilter = new QFilter("employeev.boid", QCP.equals, employeeId);
             QFilter qFilter = new QFilter("employeev.boid", QCP.equals, employeeId);
             QFilter qFilter1 = new QFilter("coordruleparam.chgevent_z.id", QCP.in, chgeventList); // 启用
             QFilter qFilter1 = new QFilter("coordruleparam.chgevent_z.id", QCP.in, chgeventList); // 启用
             QFilter qFilter2 = new QFilter("dealresult", QCP.equals, "8"); // 变动状态  已处理
             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";
             String selectField = "id,employeev.boid,coordruleparam.chgevent_z.id,dealresult";
-            DynamicObject employeesFiles = QueryServiceHelper.queryOne(EmpChangeBill, selectField, new QFilter[]{qFilter,qFilter1,qFilter2});
+            DynamicObject employeesFiles = QueryServiceHelper.queryOne(EmpChangeBill, selectField, new QFilter[]{qFilter,qFilter1,qFilter2,qFilter3});
             if(EmptyUtil.isEmpty(employeesFiles) ){
             if(EmptyUtil.isEmpty(employeesFiles) ){
                 this.addErrorMessage(obj,"员工:" + employeeName + ",定调薪档案不存在,请先完成员工变动及处理!");
                 this.addErrorMessage(obj,"员工:" + employeeName + ",定调薪档案不存在,请先完成员工变动及处理!");
             }
             }