瀏覽代碼

fix(swc): 修正定调薪档案验证逻辑

- 修改错误提示信息,增强用户友好性
- 提取档案类型常量,提高代码可维护性
- 优化查询字段,移除冗余字段number
- 修正员工档案不存在时的提示信息
turborao 23 小時之前
父節點
當前提交
9ecc9425f1

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

@@ -14,7 +14,10 @@ import java.util.ArrayList;
 
 public class SalaryAdjDelivaryDateValidator extends AbstractValidator {
 
-
+    /**
+     * 员工变动及处理_定调薪档案
+     */
+    private static final String EmpChangeBill = "hpdi_empcoordverifbill2";
     @Override
     public void validate() {
 
@@ -28,7 +31,7 @@ public class SalaryAdjDelivaryDateValidator extends AbstractValidator {
         for(ExtendedDataEntity obj :dataEntities) {
             DynamicObject bill = obj.getDataEntity();//获取当前单据的数据包
             if(StringUtils.isNotEmpty(billType) && !billType.equals(bill.getString("nckd_billtype"))){
-                this.addErrorMessage(obj,"定调薪类型不一致,请重新选择");
+                this.addErrorMessage(obj,"定调薪类型不一致,请重新选择");
             }
             billType = bill.getString("nckd_billtype");
 
@@ -36,10 +39,10 @@ public class SalaryAdjDelivaryDateValidator extends AbstractValidator {
             QFilter qFilter = new QFilter("employeev.id", QCP.equals, employeeId);
             QFilter qFilter1 = new QFilter("coordruleparam.chgevent_z.id", QCP.in, chgeventList); // 启用
             QFilter qFilter2 = new QFilter("dealresult", QCP.equals, "8"); // 变动状态  已处理
-            String selectField = "id,number,employeev.id,coordruleparam.chgevent_z.id,dealresult";
-            DynamicObject employeesFiles = QueryServiceHelper.queryOne("hpdi_empcoordverifbill2", selectField, new QFilter[]{qFilter,qFilter1,qFilter2});
+            String selectField = "id,employeev.id,coordruleparam.chgevent_z.id,dealresult";
+            DynamicObject employeesFiles = QueryServiceHelper.queryOne(EmpChangeBill, selectField, new QFilter[]{qFilter,qFilter1,qFilter2});
             if(EmptyUtil.isEmpty(employeesFiles) ){
-                this.addErrorMessage(obj,"员工定调薪档案不存在,要生成新的定调薪档案,如要生成新的定调薪档案,应先操作完档案后");
+                this.addErrorMessage(obj,"员工定调薪档案不存在,请先完成员工变动及处理!");
             }
         }
     }