diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index ed478a2..2ba58e2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper; import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; -import com.casic.missiles.model.customer.CustomerInfo; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; @@ -33,7 +32,6 @@ import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService; -import com.casic.missiles.service.customer.CustomerService; import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; @@ -292,6 +290,13 @@ approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED); } + List rejectApprovalList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(rejectBusinessKey)) { + rejectApprovalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, rejectBusinessKey); + rejectApprovalList = handleApprovalListResponse(rejectApprovalList, ApprovalStatusEnum.FAILED_REJECT); + } + //合并未通过-拒绝和未通过-驳回 + approvalList.addAll(rejectApprovalList); break; //已取消,该状态维护在flowable case ApprovalStatusEnum.CANCELED: