Эх сурвалжийг харах

refactor(hr): 优化合同取消操作插件和岗位单据服务

- 修复取消合同列表变量名拼写错误
- 简化SaveServiceHelper调用逻辑,移除不必要的try-catch块
- 添加filterEmpty方法来源注释
- 移除PositionBillServiceHelper中未使用的StringUtils导入
- 替换StringUtils为HRStringUtils以修复编译错误
jtd 3 өдөр өмнө
parent
commit
71e558d7c3

+ 4 - 9
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hdm/plugin/operate/transfer/CancelContractAfterEffectOpPlugin.java

@@ -70,18 +70,12 @@ public class CancelContractAfterEffectOpPlugin extends AbstractOperationServiceP
 
         DynamicObject[] dataEntites = e.getDataEntities();
         List<DynamicObject> transferData = Arrays.stream(dataEntites).filter(data -> data.getBoolean(TransferApplyBillConstant.NCKD_ISTERMORIGCONT_KEY)).collect(Collectors.toList());
-        List<DynamicObject> cancelConstractDyoList = new ArrayList<DynamicObject>();
+        List<DynamicObject> cancelContractDyoList = new ArrayList<DynamicObject>();
         for (DynamicObject data : transferData) {
-            cancelConstractDyoList.add(buildContract(data));
-        }
-
-        OperationResult operationResult;
-        try {
-            operationResult = SaveServiceHelper.saveOperate(TransferApplyBillConstant.HLCM_CONTRACTAPPLYCANCEL_ENTITY, cancelConstractDyoList.toArray(new DynamicObject[0]));
-        } catch (KDException ex) {
-            throw new KDBizException(new ErrorCode(ex.getErrorCode().getCode(), ex.getErrorCode().getMessage()), ex.getCause());
+            cancelContractDyoList.add(buildContract(data));
         }
 
+        OperationResult operationResult = SaveServiceHelper.saveOperate(TransferApplyBillConstant.HLCM_CONTRACTAPPLYCANCEL_ENTITY, cancelContractDyoList.toArray(new DynamicObject[0]));
         if (!operationResult.isSuccess()) {
             List<String> errorMsgList = new ArrayList<String>();
             for (IOperateInfo operateInfo : operationResult.getAllErrorOrValidateInfo()) {
@@ -314,6 +308,7 @@ public class CancelContractAfterEffectOpPlugin extends AbstractOperationServiceP
         return currIdHisIdMap;
     }
 
+    // from: kd.hr.hlcm.business.infrastructure.client.hbpm.impl.HbpmServiceImpl.filterEmpty
     private void filterEmpty(List<Long> ids) {
         log.info("before filter ids|{}", ids);
         ids.removeIf((id) -> id == null || id == 0L);

+ 1 - 2
code/hrmp/nckd-jxccl-hrmp/src/main/java/nckd/jxccl/hrmp/hbpm/business/hr/service/impl/PositionBillServiceHelper.java

@@ -3,7 +3,6 @@ package nckd.jxccl.hrmp.hbpm.business.hr.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.kingdee.util.StringUtils;
 import kd.bos.bill.BillShowParameter;
 import kd.bos.bill.OperationStatus;
 import kd.bos.common.enums.EnableEnum;
@@ -139,7 +138,7 @@ public class PositionBillServiceHelper {
             DynamicObject dynamicObject = positionBillHelper.loadDynamicObject(idFilter);
             if (dynamicObject != null) {
                 String billStatus = dynamicObject.getString(PositionBillConstant.BILL_STATUS_KEY);
-                if (!billStatus.equals(RegBillStatusEnum.TEMPSTORAGE.getCode()) && !billStatus.equals(RegBillStatusEnum.WAITRESUBMIT.getCode()) && !billStatus.equals(RegBillStatusEnum.APPROVING.getCode()) && (!billStatus.equals(RegBillStatusEnum.ALREADYSUBMIT.getCode()) || !StringUtils.equals(iFormView.getFormShowParameter().getAppId(), PositionBillConstant.WFTASK_APP))) {
+                if (!billStatus.equals(RegBillStatusEnum.TEMPSTORAGE.getCode()) && !billStatus.equals(RegBillStatusEnum.WAITRESUBMIT.getCode()) && !billStatus.equals(RegBillStatusEnum.APPROVING.getCode()) && (!billStatus.equals(RegBillStatusEnum.ALREADYSUBMIT.getCode()) || !HRStringUtils.equals(iFormView.getFormShowParameter().getAppId(), PositionBillConstant.WFTASK_APP))) {
                     String operateLocaleName = PositionChangeTypeEnum.getTipByTag(operation);
                     String auditstatusName = RegBillStatusEnum.getName(dynamicObject.getString(PositionBillConstant.BILL_STATUS_KEY));
                     iFormView.showErrorNotification(String.format("“%1$s”的单据不能“%2$s”。", auditstatusName, operateLocaleName));