From 4e681240ba8d985d00ad0abcdf79291794dad607 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 12 Jun 2026 16:27:46 +0800 Subject: [PATCH] =?UTF-8?q?1.1.71=20del=5Fflag=E3=80=81active=5Fflag?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BaseMaterialInfoServiceImpl.java | 5 +- .../impl/BasePaymentStageServiceImpl.java | 3 +- .../impl/CrmBusinessTripApplyServiceImpl.java | 3 +- .../CrmBusinessTripDetailsServiceImpl.java | 3 +- .../impl/CrmCustomerInfoServiceImpl.java | 3 +- .../impl/CrmFlightBookingServiceImpl.java | 3 +- .../impl/CrmGiftApplyDetailServiceImpl.java | 3 +- .../service/impl/CrmGiftApplyServiceImpl.java | 5 +- .../service/impl/CrmGiftInfoServiceImpl.java | 7 +- .../impl/CrmGiftIssueRecordServiceImpl.java | 3 +- .../impl/CrmMailingApplyServiceImpl.java | 5 +- .../impl/CrmPaymentAccountServiceImpl.java | 3 +- .../service/impl/CrmQuoteInfoServiceImpl.java | 7 +- .../impl/CrmQuoteMaterialServiceImpl.java | 3 +- .../impl/CrmSupplierInfoServiceImpl.java | 3 +- .../impl/ContractLedgerReportServiceImpl.java | 3 +- .../ErpAfterSalesLaborCostsServiceImpl.java | 3 +- ...ErpAfterSalesMaterialCostsServiceImpl.java | 3 +- .../impl/ErpAfterSalesServiceImpl.java | 3 +- .../impl/ErpBudgetInfoServiceImpl.java | 3 +- .../ErpContractChangeInfoServiceImpl.java | 3 +- .../ErpContractChangeMaterialServiceImpl.java | 72 +++++++-------- ...ontractChangePaymentMethodServiceImpl.java | 3 +- .../impl/ErpContractChangeServiceImpl.java | 13 +-- .../impl/ErpContractInfoServiceImpl.java | 90 +++++++++---------- .../impl/ErpContractMaterialServiceImpl.java | 3 +- .../impl/ErpContractOrderServiceImpl.java | 23 ++--- .../ErpContractPaymentMethodServiceImpl.java | 5 +- ...inAccountInstallmentDetailServiceImpl.java | 5 +- .../ErpFinAccountInstallmentServiceImpl.java | 3 +- ...pFinAccountReceivableStageServiceImpl.java | 3 +- .../impl/ErpFinInvoiceInfoServiceImpl.java | 9 +- .../impl/ErpProjectAcceptanceServiceImpl.java | 3 +- .../ErpProjectChangeBudgetServiceImpl.java | 3 +- .../ErpProjectChangeProgressServiceImpl.java | 3 +- .../impl/ErpProjectChangeServiceImpl.java | 23 ++--- .../impl/ErpProjectContractsServiceImpl.java | 5 +- .../impl/ErpProjectInfoServiceImpl.java | 15 ++-- .../impl/ErpProjectPlanServiceImpl.java | 15 ++-- .../impl/ErpProjectPlanStageServiceImpl.java | 3 +- ...ErpProjectPurchaseMaterialServiceImpl.java | 3 +- .../impl/ErpProjectPurchaseServiceImpl.java | 5 +- .../impl/ErpProjectReceivingServiceImpl.java | 3 +- .../impl/ErpProjectReportServiceImpl.java | 3 +- .../impl/ErpTimesheetDeptServiceImpl.java | 3 +- .../impl/ErpTimesheetInfoServiceImpl.java | 3 +- ...ErpTimesheetPreAllocDetailServiceImpl.java | 3 +- .../impl/ErpTimesheetPreAllocServiceImpl.java | 19 ++-- .../impl/ErpTimesheetProjectServiceImpl.java | 3 +- .../ErpTimesheetStandardMonthServiceImpl.java | 3 +- .../ErpTimesheetSummaryDetailServiceImpl.java | 3 +- .../impl/ErpTimesheetSummaryServiceImpl.java | 5 +- .../impl/ProjectLedgerReportServiceImpl.java | 7 +- 53 files changed, 241 insertions(+), 198 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseMaterialInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseMaterialInfoServiceImpl.java index 7c41f7a8..dbb51374 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseMaterialInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseMaterialInfoServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.base.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -89,7 +90,7 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService { .eq(bo.getStockingPeriod() != null, BaseMaterialInfo::getStockingPeriod, bo.getStockingPeriod()) .eq(StringUtils.isNotBlank(bo.getAddMethod()), BaseMaterialInfo::getAddMethod, bo.getAddMethod()) .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseMaterialInfo::getActiveFlag, bo.getActiveFlag()) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .orderByDesc(BaseMaterialInfo::getCreateTime); return lqw; } @@ -193,7 +194,7 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService { .like(StringUtils.isNotBlank(bo.getMaterialName()), BaseMaterialInfo::getMaterialName, bo.getMaterialName()) .eq(StringUtils.isNotBlank(bo.getMaterialBrand()), BaseMaterialInfo::getMaterialBrand, bo.getMaterialBrand()) .like(StringUtils.isNotBlank(bo.getMaterialModel()), BaseMaterialInfo::getMaterialModel, bo.getMaterialModel()) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .orderByDesc(BaseRelationMaterial::getRelationMaterialId); return lqw; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePaymentStageServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePaymentStageServiceImpl.java index 7958d485..48c33916 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePaymentStageServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePaymentStageServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.base.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -73,7 +74,7 @@ public class BasePaymentStageServiceImpl implements IBasePaymentStageService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(BasePaymentStage.class) .selectAll(BasePaymentStage.class) - .eq(BasePaymentStage::getDelFlag, "0") + .eq(BasePaymentStage::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(StringUtils.isNotBlank(bo.getStageCode()), BasePaymentStage::getStageCode, bo.getStageCode()) .like(StringUtils.isNotBlank(bo.getStageName()), BasePaymentStage::getStageName, bo.getStageName()) .eq(StringUtils.isNotBlank(bo.getCollectionStage()), BasePaymentStage::getCollectionStage, bo.getCollectionStage()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java index 1bd3e809..f3c6c6be 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.crm.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -158,7 +159,7 @@ public class CrmBusinessTripApplyServiceImpl implements ICrmBusinessTripApplySer .selectAs(CrmCustomerInfo::getCustomerName, CrmBusinessTripApplyVo::getCustomerName) .leftJoin(ErpProjectInfo.class, ErpProjectInfo::getProjectId, CrmBusinessTripApply::getProjectId) .leftJoin(CrmCustomerInfo.class, CrmCustomerInfo::getCustomerId, CrmBusinessTripApply::getCustomerId) - .eq(CrmBusinessTripApply::getDelFlag, "0") + .eq(CrmBusinessTripApply::getDelFlag, DataConstants.DEL_FLAG_NORMAL) // 按指定ID列表过滤（用于导出选中数据） .in(StringUtils.isNotBlank(bo.getTripIds()), CrmBusinessTripApply::getTripId, StringUtils.isNotBlank(bo.getTripIds()) ? List.of(bo.getTripIds().split(",")) : null) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripDetailsServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripDetailsServiceImpl.java index 4d47c781..9073dfa1 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripDetailsServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripDetailsServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.crm.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -73,7 +74,7 @@ public class CrmBusinessTripDetailsServiceImpl implements ICrmBusinessTripDetail Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmBusinessTripDetails.class) .selectAll(CrmBusinessTripDetails.class) - .eq(CrmBusinessTripDetails::getDelFlag, "0") + .eq(CrmBusinessTripDetails::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getTripId() != null, CrmBusinessTripDetails::getTripId, bo.getTripId()) .eq(bo.getItineraryNumber() != null, CrmBusinessTripDetails::getItineraryNumber, bo.getItineraryNumber()) .eq(StringUtils.isNotBlank(bo.getTripLocation()), CrmBusinessTripDetails::getTripLocation, bo.getTripLocation()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmCustomerInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmCustomerInfoServiceImpl.java index 732e207c..b5c3244b 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmCustomerInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmCustomerInfoServiceImpl.java @@ -2,6 +2,7 @@ package org.dromara.oa.crm.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ObjectUtil; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -141,7 +142,7 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService { .eq(StringUtils.isNotBlank(bo.getActiveFlag()), CrmCustomerInfo::getActiveFlag, bo.getActiveFlag()) .eq(StringUtils.isNotBlank(bo.getOurCompanyFlag()), CrmCustomerInfo::getOurCompanyFlag, bo.getOurCompanyFlag()) .eq(bo.getParentCustomerId() != null, CrmCustomerInfo::getParentCustomerId, bo.getParentCustomerId()) - .eq("t.del_flag", "0"); + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL); if (!isAllData){ applyCustomerDataScope(lqw); } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java index 42238e9b..8aa86701 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.map.MapUtil; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -96,7 +97,7 @@ public class CrmFlightBookingServiceImpl implements ICrmFlightBookingService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmFlightBooking.class) .selectAll(CrmFlightBooking.class) - .eq(CrmFlightBooking::getDelFlag, "0") + .eq(CrmFlightBooking::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .like(StringUtils.isNotBlank(bo.getApplyCode()), CrmFlightBooking::getApplyCode, bo.getApplyCode()) .eq(bo.getPassengerId() != null, CrmFlightBooking::getPassengerId, bo.getPassengerId()) .like(StringUtils.isNotBlank(bo.getPassengerName()), CrmFlightBooking::getPassengerName, diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyDetailServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyDetailServiceImpl.java index d9e3959a..08290ad9 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyDetailServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyDetailServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -72,7 +73,7 @@ public class CrmGiftApplyDetailServiceImpl implements ICrmGiftApplyDetailService Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmGiftApplyDetail.class) .selectAll(CrmGiftApplyDetail.class) - .eq(CrmGiftApplyDetail::getDelFlag, "0") + .eq(CrmGiftApplyDetail::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getApplicationId() != null, CrmGiftApplyDetail::getApplicationId, bo.getApplicationId()) .eq(bo.getGiftId() != null, CrmGiftApplyDetail::getGiftId, bo.getGiftId()) .eq(StringUtils.isNotBlank(bo.getGiftCode()), CrmGiftApplyDetail::getGiftCode, bo.getGiftCode()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyServiceImpl.java index 5823f6d9..a0318f41 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyServiceImpl.java @@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -119,7 +120,7 @@ public class CrmGiftApplyServiceImpl implements ICrmGiftApplyService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmGiftApply.class) .selectAll(CrmGiftApply.class) - .eq(CrmGiftApply::getDelFlag, "0") + .eq(CrmGiftApply::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(StringUtils.isNotBlank(bo.getApplicationCode()), CrmGiftApply::getApplicationCode, bo.getApplicationCode()) .eq(bo.getApplicantId() != null, CrmGiftApply::getApplicantId, bo.getApplicantId()) .like(StringUtils.isNotBlank(bo.getApplicantName()), CrmGiftApply::getApplicantName, bo.getApplicantName()) @@ -231,7 +232,7 @@ public class CrmGiftApplyServiceImpl implements ICrmGiftApplyService { // 编号唯一性校验 Boolean exists = baseMapper.exists( Wrappers.lambdaQuery(CrmGiftApply.class) - .eq(CrmGiftApply::getDelFlag, "0") + .eq(CrmGiftApply::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(CrmGiftApply::getApplicationCode, entity.getApplicationCode()) .ne(entity.getGiftApplyId() != null, CrmGiftApply::getGiftApplyId, entity.getGiftApplyId()) ); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftInfoServiceImpl.java index a6dcfffa..f3c02445 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -80,7 +81,7 @@ public class CrmGiftInfoServiceImpl implements ICrmGiftInfoService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmGiftInfo.class) .selectAll(CrmGiftInfo.class) - .eq(CrmGiftInfo::getDelFlag, "0") + .eq(CrmGiftInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(StringUtils.isNotBlank(bo.getGiftCode()), CrmGiftInfo::getGiftCode, bo.getGiftCode()) .like(StringUtils.isNotBlank(bo.getGiftName()), CrmGiftInfo::getGiftName, bo.getGiftName()) .eq(StringUtils.isNotBlank(bo.getSpecification()), CrmGiftInfo::getSpecification, bo.getSpecification()) @@ -133,7 +134,7 @@ public class CrmGiftInfoServiceImpl implements ICrmGiftInfoService { Boolean codeExists = baseMapper.exists( Wrappers.lambdaQuery(CrmGiftInfo.class) .eq(CrmGiftInfo::getGiftCode, entity.getGiftCode()) - .eq(CrmGiftInfo::getDelFlag, "0") + .eq(CrmGiftInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .ne(entity.getGiftId() != null, CrmGiftInfo::getGiftId, entity.getGiftId()) ); if (Boolean.TRUE.equals(codeExists)) { @@ -145,7 +146,7 @@ public class CrmGiftInfoServiceImpl implements ICrmGiftInfoService { Wrappers.lambdaQuery(CrmGiftInfo.class) .eq(CrmGiftInfo::getGiftName, entity.getGiftName()) .eq(StringUtils.isNotBlank(entity.getSpecification()), CrmGiftInfo::getSpecification, entity.getSpecification()) - .eq(CrmGiftInfo::getDelFlag, "0") + .eq(CrmGiftInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .ne(entity.getGiftId() != null, CrmGiftInfo::getGiftId, entity.getGiftId()) ); if (Boolean.TRUE.equals(comboExists)) { diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftIssueRecordServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftIssueRecordServiceImpl.java index 900993a4..a8e9a01b 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftIssueRecordServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftIssueRecordServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -79,7 +80,7 @@ public class CrmGiftIssueRecordServiceImpl implements ICrmGiftIssueRecordService Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmGiftIssueRecord.class) .selectAll(CrmGiftIssueRecord.class) - .eq(CrmGiftIssueRecord::getDelFlag, "0") + .eq(CrmGiftIssueRecord::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getApplicationId() != null, CrmGiftIssueRecord::getApplicationId, bo.getApplicationId()) .eq(StringUtils.isNotBlank(bo.getApplicationCode()), CrmGiftIssueRecord::getApplicationCode, bo.getApplicationCode()) .eq(bo.getDetailId() != null, CrmGiftIssueRecord::getDetailId, bo.getDetailId()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmMailingApplyServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmMailingApplyServiceImpl.java index 280e48f6..3b01e6ea 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmMailingApplyServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmMailingApplyServiceImpl.java @@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -92,7 +93,7 @@ public class CrmMailingApplyServiceImpl implements ICrmMailingApplyService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmMailingApply.class) .selectAll(CrmMailingApply.class) - .eq(CrmMailingApply::getDelFlag, "0") + .eq(CrmMailingApply::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(StringUtils.isNotBlank(bo.getMailingApplyCode()), CrmMailingApply::getMailingApplyCode, bo.getMailingApplyCode()) .eq(bo.getApplicationDate() != null, CrmMailingApply::getApplicationDate, bo.getApplicationDate()) .eq(bo.getHandlerId() != null, CrmMailingApply::getHandlerId, bo.getHandlerId()) @@ -172,7 +173,7 @@ public class CrmMailingApplyServiceImpl implements ICrmMailingApplyService { } Boolean exists = baseMapper.existsCrmMailingApply( Wrappers.lambdaQuery(CrmMailingApply.class) - .eq(CrmMailingApply::getDelFlag, "0") + .eq(CrmMailingApply::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(entity.getTenantId() != null, CrmMailingApply::getTenantId, entity.getTenantId()) .eq(CrmMailingApply::getMailingApplyCode, entity.getMailingApplyCode()) .ne(entity.getMailingApplyId() != null, CrmMailingApply::getMailingApplyId, entity.getMailingApplyId()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmPaymentAccountServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmPaymentAccountServiceImpl.java index 74747061..edb79ea5 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmPaymentAccountServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmPaymentAccountServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.crm.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -72,7 +73,7 @@ public class CrmPaymentAccountServiceImpl implements ICrmPaymentAccountService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmPaymentAccount.class) .selectAll(CrmPaymentAccount.class) - .eq(CrmPaymentAccount::getDelFlag, "0") + .eq(CrmPaymentAccount::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getCustomerId() != null, CrmPaymentAccount::getCustomerId, bo.getCustomerId()) .eq(StringUtils.isNotBlank(bo.getAccountType()), CrmPaymentAccount::getAccountType, bo.getAccountType()) .like(StringUtils.isNotBlank(bo.getAccountName()), CrmPaymentAccount::getAccountName, bo.getAccountName()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java index 1abad5b0..4585062e 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java @@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -87,7 +88,7 @@ public class CrmQuoteInfoServiceImpl implements ICrmQuoteInfoService { // 关联查询子表明细 MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmQuoteMaterial.class) .selectAll(CrmQuoteMaterial.class) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) // 联表基础物料与销售物料，带出物料编码/名称等业务字段 .select(BaseMaterialInfo::getMaterialCode) .select(BaseMaterialInfo::getMaterialName) @@ -135,7 +136,7 @@ public class CrmQuoteInfoServiceImpl implements ICrmQuoteInfoService { MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmQuoteInfo.class) // 主表全部字段 .selectAll(CrmQuoteInfo.class) - .eq(CrmQuoteInfo::getDelFlag, "0") + .eq(CrmQuoteInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getQuoteId() != null, CrmQuoteInfo::getQuoteId, bo.getQuoteId()) // 客户方联系人（CrmCustomerContact，别名：CustomerContact） .selectAs("CustomerContact", CrmCustomerContact::getContactName, CrmQuoteInfo::getCustomerContactRealName) @@ -410,7 +411,7 @@ public class CrmQuoteInfoServiceImpl implements ICrmQuoteInfoService { // 销售物料名称使用解析后的产品名称 relationMaterialBo.setSaleMaterialName(resolvedProductName); // 设置有效标志为启用 - relationMaterialBo.setActiveFlag("1"); + relationMaterialBo.setActiveFlag(DataConstants.ACTIVE_FLAG_YES); // 这里按“物料 + 客户 + 报价产品名称”补建销售物料关联，避免标准物料改名后仍然丢失客户侧展示名称。 // 调用服务插入新的关联销售物料记录 baseRelationMaterialService.insertByBo(relationMaterialBo); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteMaterialServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteMaterialServiceImpl.java index 39c5eaa9..b156e924 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteMaterialServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteMaterialServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -73,7 +74,7 @@ public class CrmQuoteMaterialServiceImpl implements ICrmQuoteMaterialService { private MPJLambdaWrapper buildQueryWrapper(CrmQuoteMaterialBo bo) { MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmQuoteMaterial.class) .selectAll(CrmQuoteMaterial.class) - .eq(CrmQuoteMaterial::getDelFlag, "0") + .eq(CrmQuoteMaterial::getDelFlag, DataConstants.DEL_FLAG_NORMAL) // 这里显式挑选主表业务字段，而不是 selectAll 主表： // 目的是把“页面展示字段”和“导出字段”控制在同一口径，避免 quoteId、模板ID 这类技术字段混进明细页。 .selectAs(CrmQuoteInfo::getQuoteCode, CrmQuoteMaterialVo::getQuoteCode) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmSupplierInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmSupplierInfoServiceImpl.java index ae902e85..07f94a28 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmSupplierInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmSupplierInfoServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.crm.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -90,7 +91,7 @@ public class CrmSupplierInfoServiceImpl implements ICrmSupplierInfoService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmSupplierInfo.class) .selectAll(CrmSupplierInfo.class) - .eq(CrmSupplierInfo::getDelFlag, "0") + .eq(CrmSupplierInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .like(StringUtils.isNotBlank(bo.getSupplierName()), CrmSupplierInfo::getSupplierName, bo.getSupplierName()) .like(StringUtils.isNotBlank(bo.getMnemonicName()), CrmSupplierInfo::getMnemonicName, bo.getMnemonicName()) .eq(StringUtils.isNotBlank(bo.getSupplierType()), CrmSupplierInfo::getSupplierType, bo.getSupplierType()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ContractLedgerReportServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ContractLedgerReportServiceImpl.java index 48b0aa9c..00241de6 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ContractLedgerReportServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ContractLedgerReportServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.oa.erp.service.impl; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -28,7 +29,7 @@ public class ContractLedgerReportServiceImpl implements IContractLedgerReportSer private MPJLambdaWrapper buildQueryWrapper(ContractLedgerReportVo bo) { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractInfo.class); - lqw.eq(ErpContractInfo::getDelFlag, "0"); + lqw.eq(ErpContractInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL); if (bo.getContractIdList() != null && !bo.getContractIdList().isEmpty()) { lqw.in(ErpContractInfo::getContractId, bo.getContractIdList()); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesLaborCostsServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesLaborCostsServiceImpl.java index 740e809f..eea20e93 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesLaborCostsServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesLaborCostsServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.oa.erp.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -77,7 +78,7 @@ public class ErpAfterSalesLaborCostsServiceImpl Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpAfterSalesLaborCosts.class) .selectAll(ErpAfterSalesLaborCosts.class) - .eq(ErpAfterSalesLaborCosts::getDelFlag, "0") + .eq(ErpAfterSalesLaborCosts::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getAfterSalesId() != null, ErpAfterSalesLaborCosts::getAfterSalesId, bo.getAfterSalesId()) .eq(bo.getLaborId() != null, ErpAfterSalesLaborCosts::getLaborId, bo.getLaborId()) .like(StringUtils.isNotBlank(bo.getLaborName()), ErpAfterSalesLaborCosts::getLaborName, bo.getLaborName()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesMaterialCostsServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesMaterialCostsServiceImpl.java index d91a4367..f8eb0cd8 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesMaterialCostsServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesMaterialCostsServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.oa.erp.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -77,7 +78,7 @@ public class ErpAfterSalesMaterialCostsServiceImpl Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpAfterSalesMaterialCosts.class) .selectAll(ErpAfterSalesMaterialCosts.class) - .eq(ErpAfterSalesMaterialCosts::getDelFlag, "0") + .eq(ErpAfterSalesMaterialCosts::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getAfterSalesId() != null, ErpAfterSalesMaterialCosts::getAfterSalesId, bo.getAfterSalesId()) .eq(bo.getMaterialId() != null, ErpAfterSalesMaterialCosts::getMaterialId, bo.getMaterialId()) .eq(StringUtils.isNotBlank(bo.getProductCode()), ErpAfterSalesMaterialCosts::getProductCode, bo.getProductCode()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java index 8d2983e5..0d32dd2a 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; @@ -137,7 +138,7 @@ public class ErpAfterSalesServiceImpl implements IErpAfterSalesService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpAfterSales.class) .selectAll(ErpAfterSales.class) - .eq(ErpAfterSales::getDelFlag, "0") + .eq(ErpAfterSales::getDelFlag, DataConstants.DEL_FLAG_NORMAL) // 按指定ID列表过滤（用于导出选中数据） .in(StringUtils.isNotBlank(bo.getAfterSalesIds()), ErpAfterSales::getAfterSalesId, StringUtils.isNotBlank(bo.getAfterSalesIds()) ? List.of(bo.getAfterSalesIds().split(",")) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpBudgetInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpBudgetInfoServiceImpl.java index fdc9c0f1..4be9406d 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpBudgetInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpBudgetInfoServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -755,7 +756,7 @@ public class ErpBudgetInfoServiceImpl extends AbstractWorkflowService luw = new LambdaUpdateWrapper<>(); // luw.set(ObjectUtil.isNull(config.getPrefix()), SysOssConfig::getPrefix, ""); luw.set(ErpBudgetInfo::getBudgetVersion, null); - luw.set(ErpBudgetInfo::getDelFlag, "1"); + luw.set(ErpBudgetInfo::getDelFlag, DataConstants.DEL_FLAG_DELETED); luw.set(ErpBudgetInfo::getUpdateBy, LoginHelper.getUserId()); luw.set(ErpBudgetInfo::getUpdateTime, new Date()); luw.eq(ErpBudgetInfo::getBudgetId, erpBudgetInfo.getBudgetId()); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeInfoServiceImpl.java index 28dffe4e..920ff3e8 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeInfoServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -73,7 +74,7 @@ public class ErpContractChangeInfoServiceImpl implements IErpContractChangeInfoS Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractChangeInfo.class) .selectAll(ErpContractChangeInfo.class) - .eq(ErpContractChangeInfo::getDelFlag, "0") + .eq(ErpContractChangeInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getContractChangeId() != null, ErpContractChangeInfo::getContractChangeId, bo.getContractChangeId()) .eq(StringUtils.isNotBlank(bo.getContractFlag()), ErpContractChangeInfo::getContractFlag, bo.getContractFlag()) .eq(StringUtils.isNotBlank(bo.getCustomerContractCode()), ErpContractChangeInfo::getCustomerContractCode, bo.getCustomerContractCode()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeMaterialServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeMaterialServiceImpl.java index 78ece7eb..fbbfe4b2 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeMaterialServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeMaterialServiceImpl.java @@ -1,10 +1,11 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; - import org.dromara.common.mybatis.core.page.TableDataInfo; - import org.dromara.common.mybatis.core.page.PageQuery; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -39,23 +40,23 @@ public class ErpContractChangeMaterialServiceImpl implements IErpContractChangeM * @return 合同变更物料 */ @Override - public ErpContractChangeMaterialVo queryById(Long changeMaterialId){ + public ErpContractChangeMaterialVo queryById(Long changeMaterialId) { return baseMapper.selectVoById(changeMaterialId); } - /** - * 分页查询合同变更物料列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 合同变更物料分页列表 - */ - @Override - public TableDataInfo queryPageList(ErpContractChangeMaterialBo bo, PageQuery pageQuery) { - MPJLambdaWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } + /** + * 分页查询合同变更物料列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 合同变更物料分页列表 + */ + @Override + public TableDataInfo queryPageList(ErpContractChangeMaterialBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } /** * 查询符合条件的合同变更物料列表 @@ -72,23 +73,22 @@ public class ErpContractChangeMaterialServiceImpl implements IErpContractChangeM private MPJLambdaWrapper buildQueryWrapper(ErpContractChangeMaterialBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractChangeMaterial.class) - .selectAll(ErpContractChangeMaterial.class) - .eq(ErpContractChangeMaterial::getDelFlag, "0") - .eq(bo.getContractChangeId() != null, ErpContractChangeMaterial::getContractChangeId, bo.getContractChangeId()) - .eq(StringUtils.isNotBlank(bo.getMaterialFlag()), ErpContractChangeMaterial::getMaterialFlag, bo.getMaterialFlag()) - .like(StringUtils.isNotBlank(bo.getProductName()), ErpContractChangeMaterial::getProductName, bo.getProductName()) - .eq(StringUtils.isNotBlank(bo.getSpecificationDescription()), ErpContractChangeMaterial::getSpecificationDescription, bo.getSpecificationDescription()) - .eq(bo.getMaterialId() != null, ErpContractChangeMaterial::getMaterialId, bo.getMaterialId()) - .eq(bo.getRelationMaterialId() != null, ErpContractChangeMaterial::getRelationMaterialId, bo.getRelationMaterialId()) - .eq(bo.getAmount() != null, ErpContractChangeMaterial::getAmount, bo.getAmount()) - .eq(bo.getUnitId() != null, ErpContractChangeMaterial::getUnitId, bo.getUnitId()) - .eq(bo.getBeforePrice() != null, ErpContractChangeMaterial::getBeforePrice, bo.getBeforePrice()) - .eq(bo.getTaxRate() != null, ErpContractChangeMaterial::getTaxRate, bo.getTaxRate()) - .eq(bo.getIncludingPrice() != null, ErpContractChangeMaterial::getIncludingPrice, bo.getIncludingPrice()) - .eq(bo.getSubtotal() != null, ErpContractChangeMaterial::getSubtotal, bo.getSubtotal()) - .eq(bo.getSortOrder() != null, ErpContractChangeMaterial::getSortOrder, bo.getSortOrder()) - .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractChangeMaterial::getActiveFlag, bo.getActiveFlag()) -; + .selectAll(ErpContractChangeMaterial.class) + .eq(ErpContractChangeMaterial::getDelFlag, DataConstants.DEL_FLAG_NORMAL) + .eq(bo.getContractChangeId() != null, ErpContractChangeMaterial::getContractChangeId, bo.getContractChangeId()) + .eq(StringUtils.isNotBlank(bo.getMaterialFlag()), ErpContractChangeMaterial::getMaterialFlag, bo.getMaterialFlag()) + .like(StringUtils.isNotBlank(bo.getProductName()), ErpContractChangeMaterial::getProductName, bo.getProductName()) + .eq(StringUtils.isNotBlank(bo.getSpecificationDescription()), ErpContractChangeMaterial::getSpecificationDescription, bo.getSpecificationDescription()) + .eq(bo.getMaterialId() != null, ErpContractChangeMaterial::getMaterialId, bo.getMaterialId()) + .eq(bo.getRelationMaterialId() != null, ErpContractChangeMaterial::getRelationMaterialId, bo.getRelationMaterialId()) + .eq(bo.getAmount() != null, ErpContractChangeMaterial::getAmount, bo.getAmount()) + .eq(bo.getUnitId() != null, ErpContractChangeMaterial::getUnitId, bo.getUnitId()) + .eq(bo.getBeforePrice() != null, ErpContractChangeMaterial::getBeforePrice, bo.getBeforePrice()) + .eq(bo.getTaxRate() != null, ErpContractChangeMaterial::getTaxRate, bo.getTaxRate()) + .eq(bo.getIncludingPrice() != null, ErpContractChangeMaterial::getIncludingPrice, bo.getIncludingPrice()) + .eq(bo.getSubtotal() != null, ErpContractChangeMaterial::getSubtotal, bo.getSubtotal()) + .eq(bo.getSortOrder() != null, ErpContractChangeMaterial::getSortOrder, bo.getSortOrder()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractChangeMaterial::getActiveFlag, bo.getActiveFlag()); return lqw; } @@ -125,7 +125,7 @@ public class ErpContractChangeMaterialServiceImpl implements IErpContractChangeM /** * 保存前的数据校验 */ - private void validEntityBeforeSave(ErpContractChangeMaterial entity){ + private void validEntityBeforeSave(ErpContractChangeMaterial entity) { //TODO 做一些数据校验,如唯一约束 } @@ -138,7 +138,7 @@ public class ErpContractChangeMaterialServiceImpl implements IErpContractChangeM */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangePaymentMethodServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangePaymentMethodServiceImpl.java index 2ed342c7..22a8126d 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangePaymentMethodServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangePaymentMethodServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -73,7 +74,7 @@ public class ErpContractChangePaymentMethodServiceImpl implements IErpContractCh Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractChangePaymentMethod.class) .selectAll(ErpContractChangePaymentMethod.class) - .eq(ErpContractChangePaymentMethod::getDelFlag, "0") + .eq(ErpContractChangePaymentMethod::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getContractChangeId() != null, ErpContractChangePaymentMethod::getContractChangeId, bo.getContractChangeId()) .eq(bo.getSortOrder() != null, ErpContractChangePaymentMethod::getSortOrder, bo.getSortOrder()) .eq(bo.getPaymentStageId() != null, ErpContractChangePaymentMethod::getPaymentStageId, bo.getPaymentStageId()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeServiceImpl.java index b0e11b21..99a386f7 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.map.MapUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.tenant.helper.TenantHelper; @@ -151,7 +152,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { private MPJLambdaWrapper buildQueryWrapper(ErpContractChangeBo bo) { return JoinWrappers.lambda(ErpContractChange.class) .selectAll(ErpContractChange.class) - .eq(ErpContractChange::getDelFlag, "0") + .eq(ErpContractChange::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getContractId() != null, ErpContractChange::getContractId, bo.getContractId()) .eq(StringUtils.isNotBlank(bo.getChangeCode()), ErpContractChange::getChangeCode, bo.getChangeCode()) .eq(StringUtils.isNotBlank(bo.getChangeType()), ErpContractChange::getChangeType, bo.getChangeType()) @@ -444,7 +445,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { e.setChangeStatus(StringUtils.isNotBlank(bo.getChangeStatus()) ? bo.getChangeStatus() : "1"); e.setFlowStatus(bo.getFlowStatus()); e.setRemark(bo.getRemark()); - e.setActiveFlag(StringUtils.isNotBlank(bo.getActiveFlag()) ? bo.getActiveFlag() : "1"); + e.setActiveFlag(StringUtils.isNotBlank(bo.getActiveFlag()) ? bo.getActiveFlag() : DataConstants.ACTIVE_FLAG_YES); e.setContractCode(bo.getContractCode()); e.setContractName(bo.getContractName()); e.setOriginalCustomerName(bo.getOriginalCustomerName()); @@ -527,7 +528,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { ErpContractInfo info = contractInfoMapper.selectById(contractId); if (info != null) { info.setContractStatus(OAStatusEnum.INVALID.getStatus()); - info.setActiveFlag("0"); + info.setActiveFlag(DataConstants.ACTIVE_FLAG_NO); contractInfoMapper.updateById(info); } } @@ -574,7 +575,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { ErpContractInfo originalInactive = new ErpContractInfo(); originalInactive.setContractId(originalContractId); originalInactive.setContractStatus(OAStatusEnum.INVALID.getStatus()); - originalInactive.setActiveFlag("0"); + originalInactive.setActiveFlag(DataConstants.ACTIVE_FLAG_NO); contractInfoMapper.updateById(originalInactive); for (ErpProjectContracts oldLink : oldLinks) { projectContractsMapper.deleteById(oldLink.getProjectContractsId()); @@ -638,7 +639,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { cm.setRelationMaterialId(m.getRelationMaterialId()); cm.setUnitId(m.getUnitId()); cm.setRemark(m.getRemark()); - cm.setActiveFlag(StringUtils.isNotBlank(m.getActiveFlag()) ? m.getActiveFlag() : "1"); + cm.setActiveFlag(StringUtils.isNotBlank(m.getActiveFlag()) ? m.getActiveFlag() : DataConstants.ACTIVE_FLAG_YES); cm.setAmount(m.getAmount()); cm.setBeforePrice(m.getBeforePrice()); cm.setTaxRate(m.getTaxRate()); @@ -662,7 +663,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { cpm.setPaymentAmount(p.getPaymentAmount()); cpm.setPaymentDescription(p.getPaymentDescription()); cpm.setRemark(p.getRemark()); - cpm.setActiveFlag(StringUtils.isNotBlank(p.getActiveFlag()) ? p.getActiveFlag() : "1"); + cpm.setActiveFlag(StringUtils.isNotBlank(p.getActiveFlag()) ? p.getActiveFlag() : DataConstants.ACTIVE_FLAG_YES); return cpm; } } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java index 119ac18c..e15502b2 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java @@ -16,6 +16,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -129,7 +130,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { MPJLambdaWrapper infoLqw = JoinWrappers.lambda(ErpContractInfo.class) .selectAll(ErpContractInfo.class) .eq(contractId != null, ErpContractInfo::getContractId, contractId) - .eq("t.del_flag", "0"); + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL); List infoList = baseMapper.selectCustomErpContractInfoVoList(infoLqw, true); ErpContractInfoVo contractInfoVo = infoList.isEmpty() ? null : infoList.get(0); if (contractInfoVo == null) { @@ -138,7 +139,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractMaterial.class) .selectAll(ErpContractMaterial.class) .eq(contractId != null, ErpContractMaterial::getContractId, contractId) - .eq("t.del_flag", "0"); + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL); List contractMaterialList = contractMaterialMapper .selectCustomErpContractMaterialVoList(lqw); for (int i = 0; i < contractMaterialList.size(); i++) { @@ -149,7 +150,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { MPJLambdaWrapper paymentLqw = JoinWrappers.lambda(ErpContractPaymentMethod.class) .selectAll(ErpContractPaymentMethod.class) .eq(contractId != null, ErpContractPaymentMethod::getContractId, contractId) - .eq(ErpContractPaymentMethod::getDelFlag, "0"); + .eq(ErpContractPaymentMethod::getDelFlag, DataConstants.DEL_FLAG_NORMAL); List contractPaymentMethodList = contractPaymentMethodMapper.selectCustomErpContractPaymentMethodVoList(paymentLqw); contractInfoVo.setContractPaymentMethodList(contractPaymentMethodList); // 查询关联的付款账户并格式化为付款账户信息字符串 @@ -239,50 +240,41 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { private MPJLambdaWrapper buildQueryWrapper(ErpContractInfoBo bo) { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractInfo.class) - .selectAll(ErpContractInfo.class) - .eq(StringUtils.isNotBlank(bo.getContractFlag()), ErpContractInfo::getContractFlag, - bo.getContractFlag()) - .eq(StringUtils.isNotBlank(bo.getContractCode()), ErpContractInfo::getContractCode, - bo.getContractCode()) - .eq(StringUtils.isNotBlank(bo.getCustomerContractCode()), ErpContractInfo::getCustomerContractCode, - bo.getCustomerContractCode()) - .like(StringUtils.isNotBlank(bo.getContractName()), ErpContractInfo::getContractName, - bo.getContractName()) - .eq(StringUtils.isNotBlank(bo.getContractCategory()), ErpContractInfo::getContractCategory, - bo.getContractCategory()) - .eq(StringUtils.isNotBlank(bo.getContractType()), ErpContractInfo::getContractType, - bo.getContractType()) - .eq(StringUtils.isNotBlank(bo.getBusinessDirection()), ErpContractInfo::getBusinessDirection, - bo.getBusinessDirection()) - .eq(bo.getContractDeptId() != null, ErpContractInfo::getContractDeptId, bo.getContractDeptId()) - .eq(bo.getContractDate() != null, ErpContractInfo::getContractDate, bo.getContractDate()) - .eq(StringUtils.isNotBlank(bo.getContractTerritorialFlag()), ErpContractInfo::getContractTerritorialFlag, bo.getContractTerritorialFlag()) - .eq(StringUtils.isNotBlank(bo.getContractTerritorialCountry()), ErpContractInfo::getContractTerritorialCountry, bo.getContractTerritorialCountry()) - .eq(StringUtils.isNotBlank(bo.getSettlementCurrency()), ErpContractInfo::getSettlementCurrency, bo.getSettlementCurrency()) - .eq(bo.getRmbExchangeRate() != null, ErpContractInfo::getRmbExchangeRate, bo.getRmbExchangeRate()) - .apply(StringUtils.isNotBlank(bo.getOneCustomerName()), - "c1.customer_name LIKE CONCAT('%', {0}, '%')", bo.getOneCustomerName()) - .eq(bo.getTotalPrice() != null, ErpContractInfo::getTotalPrice, bo.getTotalPrice()) - .eq(StringUtils.isNotBlank(bo.getContractStatus()), ErpContractInfo::getContractStatus, - bo.getContractStatus()) - .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpContractInfo::getFlowStatus, bo.getFlowStatus()) - .eq(bo.getTemplateId() != null, ErpContractInfo::getTemplateId, bo.getTemplateId()) - .eq(StringUtils.isNotBlank(bo.getOssId()), ErpContractInfo::getOssId, bo.getOssId()) - .eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpContractInfo::getPaymentMethod, - bo.getPaymentMethod()) - .eq(bo.getSignatureAppendix() != null, ErpContractInfo::getSignatureAppendix, bo.getSignatureAppendix()) - .eq(bo.getTaxRate() != null, ErpContractInfo::getTaxRate, bo.getTaxRate()) - .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractInfo::getActiveFlag, bo.getActiveFlag()) - .eq(bo.getContractManagerId() != null, ErpContractInfo::getContractManagerId, bo.getContractManagerId()) - .eq(StringUtils.isNotBlank(bo.getCapitalizedAmount()), ErpContractInfo::getCapitalizedAmount, - bo.getCapitalizedAmount()) - .eq(StringUtils.isNotBlank(bo.getContractTemplateFlag()), ErpContractInfo::getContractTemplateFlag, - bo.getContractTemplateFlag()) - .eq(StringUtils.isNotBlank(bo.getIsFrameworkContract()), ErpContractInfo::getIsFrameworkContract, bo.getIsFrameworkContract()) - .eq(bo.getFrameworkContractId() != null, ErpContractInfo::getFrameworkContractId, bo.getFrameworkContractId()) - .eq(bo.getFrameworkValidPeriod() != null, ErpContractInfo::getFrameworkValidPeriod, bo.getFrameworkValidPeriod()) - .eq("t.del_flag", "0") - .eq("t.active_flag", "1"); + .selectAll(ErpContractInfo.class); + lqw.eq(StringUtils.isNotBlank(bo.getContractFlag()), ErpContractInfo::getContractFlag, bo.getContractFlag()); + lqw.like(StringUtils.isNotBlank(bo.getContractCode()), ErpContractInfo::getContractCode, bo.getContractCode()); + lqw.like(StringUtils.isNotBlank(bo.getCustomerContractCode()), ErpContractInfo::getCustomerContractCode, bo.getCustomerContractCode()); + lqw.like(StringUtils.isNotBlank(bo.getContractName()), ErpContractInfo::getContractName, bo.getContractName()); + lqw.eq(StringUtils.isNotBlank(bo.getContractCategory()), ErpContractInfo::getContractCategory, bo.getContractCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getContractType()), ErpContractInfo::getContractType, bo.getContractType()); + lqw.eq(StringUtils.isNotBlank(bo.getBusinessDirection()), ErpContractInfo::getBusinessDirection, bo.getBusinessDirection()); + lqw.eq(bo.getContractDeptId() != null, ErpContractInfo::getContractDeptId, bo.getContractDeptId()); + lqw.eq(bo.getContractDate() != null, ErpContractInfo::getContractDate, bo.getContractDate()); + lqw.eq(StringUtils.isNotBlank(bo.getContractTerritorialFlag()), ErpContractInfo::getContractTerritorialFlag, bo.getContractTerritorialFlag()); + lqw.eq(StringUtils.isNotBlank(bo.getContractTerritorialCountry()), ErpContractInfo::getContractTerritorialCountry, bo.getContractTerritorialCountry()); + lqw.eq(StringUtils.isNotBlank(bo.getSettlementCurrency()), ErpContractInfo::getSettlementCurrency, bo.getSettlementCurrency()); + lqw.eq(bo.getRmbExchangeRate() != null, ErpContractInfo::getRmbExchangeRate, bo.getRmbExchangeRate()); + if (StringUtils.isNotBlank(bo.getOneCustomerName())) { + lqw.apply("c1.customer_name LIKE CONCAT('%', {0}, '%')", bo.getOneCustomerName()); + } + lqw.eq(bo.getTotalPrice() != null, ErpContractInfo::getTotalPrice, bo.getTotalPrice()); + lqw.eq(StringUtils.isNotBlank(bo.getContractStatus()), ErpContractInfo::getContractStatus, bo.getContractStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpContractInfo::getFlowStatus, bo.getFlowStatus()); + lqw.eq(bo.getTemplateId() != null, ErpContractInfo::getTemplateId, bo.getTemplateId()); + lqw.eq(StringUtils.isNotBlank(bo.getOssId()), ErpContractInfo::getOssId, bo.getOssId()); + lqw.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpContractInfo::getPaymentMethod, bo.getPaymentMethod()); + lqw.eq(bo.getSignatureAppendix() != null, ErpContractInfo::getSignatureAppendix, bo.getSignatureAppendix()); + lqw.eq(bo.getTaxRate() != null, ErpContractInfo::getTaxRate, bo.getTaxRate()); + lqw.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractInfo::getActiveFlag, bo.getActiveFlag()); + lqw.eq(bo.getContractManagerId() != null, ErpContractInfo::getContractManagerId, bo.getContractManagerId()); + lqw.eq(StringUtils.isNotBlank(bo.getCapitalizedAmount()), ErpContractInfo::getCapitalizedAmount, bo.getCapitalizedAmount()); + lqw.eq(StringUtils.isNotBlank(bo.getContractTemplateFlag()), ErpContractInfo::getContractTemplateFlag, bo.getContractTemplateFlag()); + lqw.eq(StringUtils.isNotBlank(bo.getIsFrameworkContract()), ErpContractInfo::getIsFrameworkContract, bo.getIsFrameworkContract()); + lqw.eq(bo.getFrameworkContractId() != null, ErpContractInfo::getFrameworkContractId, bo.getFrameworkContractId()); + lqw.eq(bo.getFrameworkValidPeriod() != null, ErpContractInfo::getFrameworkValidPeriod, bo.getFrameworkValidPeriod()); + lqw.eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL); + lqw.eq("t.active_flag", DataConstants.ACTIVE_FLAG_YES); + applyContractDataScope(lqw); return lqw; } @@ -432,7 +424,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { MPJLambdaWrapper paymentLqw = JoinWrappers.lambda(ErpContractPaymentMethod.class) .selectAll(ErpContractPaymentMethod.class) .eq(bo.getContractId() != null, ErpContractPaymentMethod::getContractId, bo.getContractId()) - .eq(ErpContractPaymentMethod::getDelFlag, "0"); + .eq(ErpContractPaymentMethod::getDelFlag, DataConstants.DEL_FLAG_NORMAL); List oldPaymentList = contractPaymentMethodMapper.selectCustomErpContractPaymentMethodVoList(paymentLqw); if (contractPaymentMethodList != null && !contractPaymentMethodList.isEmpty()) { Set newPaymentMethodIds = new HashSet<>(); @@ -502,7 +494,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { if (entity != null && StringUtils.isNotBlank(entity.getContractCode())) { LambdaQueryWrapper lqw = new LambdaQueryWrapper() .eq(ErpContractInfo::getContractCode, entity.getContractCode()) - .eq(ErpContractInfo::getDelFlag, "0") + .eq(ErpContractInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .ne(entity.getContractId() != null, ErpContractInfo::getContractId, entity.getContractId()); Long cnt = baseMapper.selectCount(lqw); if (cnt != null && cnt > 0) { diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterialServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterialServiceImpl.java index 9a6e88ba..74452560 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterialServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterialServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -86,7 +87,7 @@ public class ErpContractMaterialServiceImpl implements IErpContractMaterialServi .eq(bo.getIncludingPrice() != null, ErpContractMaterial::getIncludingPrice, bo.getIncludingPrice()) .eq(bo.getSubtotal() != null, ErpContractMaterial::getSubtotal, bo.getSubtotal()) .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractMaterial::getActiveFlag, bo.getActiveFlag()) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .orderByAsc(ErpContractMaterial::getContractMaterialId); return lqw; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java index a23eb66c..d14e7b4b 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -171,7 +172,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectInfo.class) .eq(ErpProjectInfo::getProjectId, projectId) .eq(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER) - .eq("t.del_flag", "0"); + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL); List list = projectInfoMapper.selectCustomErpProjectInfoVoList(lqw, true); return !list.isEmpty() ? list.get(0) : null; } @@ -292,7 +293,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { .eq(StringUtils.isNotBlank(bo.getOrderInvoiceStatus()), ErpProjectInfo::getOrderInvoiceStatus, bo.getOrderInvoiceStatus()) .like(StringUtils.isNotBlank(bo.getContractCode()), "c.contract_code", bo.getContractCode()) .like(StringUtils.isNotBlank(bo.getContractName()), "c.contract_name", bo.getContractName()) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .orderByDesc(ErpProjectInfo::getCreateTime); applyContractOrderDataScope(lqw); return lqw; @@ -305,7 +306,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { // contract_id -> project_id（若一合同关联多个项目，这里取第一条；如需更严格可调整为一对多） List pcs = projectContractsMapper.selectList(new LambdaQueryWrapper() .in(ErpProjectContracts::getContractId, contractIds) - .eq(ErpProjectContracts::getDelFlag, "0") + .eq(ErpProjectContracts::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .orderByAsc(ErpProjectContracts::getSortOrder) .orderByAsc(ErpProjectContracts::getProjectContractsId)); @@ -329,7 +330,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { List projects = projectInfoMapper.selectList(new LambdaQueryWrapper() .select(ErpProjectInfo::getProjectId, ErpProjectInfo::getManagerId) .in(ErpProjectInfo::getProjectId, projectIds) - .eq(ErpProjectInfo::getDelFlag, "0")); + .eq(ErpProjectInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL)); Map projectId2ManagerId = projects.stream() .filter(p -> p.getProjectId() != null) @@ -664,7 +665,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { // 查询是否已存在项目计划 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ErpProjectPlan::getProjectId, projectId); - queryWrapper.eq(ErpProjectPlan::getDelFlag, "0"); + queryWrapper.eq(ErpProjectPlan::getDelFlag, DataConstants.DEL_FLAG_NORMAL); queryWrapper.orderByDesc(ErpProjectPlan::getCreateTime); queryWrapper.last("LIMIT 1"); List existingPlans = projectPlanMapper.selectList(queryWrapper); @@ -858,7 +859,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { return projectInfoMapper.selectList(Wrappers.lambdaQuery() .eq(ErpProjectInfo::getContractId, contractId) .eq(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER) - .eq(ErpProjectInfo::getDelFlag, "0")); + .eq(ErpProjectInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL)); } /** @@ -867,7 +868,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { private String resolveInvoiceStatus(Long contractId) { List invoices = finInvoiceInfoMapper.selectList(Wrappers.lambdaQuery() .eq(ErpFinInvoiceInfo::getContractId, contractId) - .eq(ErpFinInvoiceInfo::getDelFlag, "0")); + .eq(ErpFinInvoiceInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL)); if (CollUtil.isEmpty(invoices)) { return OrderInvoiceStatusConstant.NOT_INVOICED; } @@ -942,7 +943,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { private boolean hasPurchasingInProgress(Long bizProjectId, Long contractId) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery() .eq(ErpProjectPurchase::getProjectId, bizProjectId) - .eq(ErpProjectPurchase::getDelFlag, "0") + .eq(ErpProjectPurchase::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .and(w -> w.eq(ErpProjectPurchase::getProjectPurchaseStatus, OAStatusEnum.APPROVING.getStatus()) .or() .eq(ErpProjectPurchase::getFlowStatus, BusinessStatusEnum.WAITING.getStatus())); @@ -971,7 +972,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { } List relations = projectContractsMapper.selectList(Wrappers.lambdaQuery() .eq(ErpProjectContracts::getContractId, contractId) - .eq(ErpProjectContracts::getDelFlag, "0") + .eq(ErpProjectContracts::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .orderByAsc(ErpProjectContracts::getSortOrder) .orderByAsc(ErpProjectContracts::getProjectContractsId)); if (CollUtil.isEmpty(relations)) { @@ -987,7 +988,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { List projects = projectInfoMapper.selectList(Wrappers.lambdaQuery() .in(ErpProjectInfo::getProjectId, projectIds) .ne(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER) - .eq(ErpProjectInfo::getDelFlag, "0") + .eq(ErpProjectInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .last("limit 1")); return CollUtil.isEmpty(projects) ? null : projects.get(0).getProjectId(); } @@ -1019,7 +1020,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { } ErpProjectContracts relation = projectContractsMapper.selectOne(Wrappers.lambdaQuery() .eq(ErpProjectContracts::getProjectId, projectId) - .eq(ErpProjectContracts::getDelFlag, "0") + .eq(ErpProjectContracts::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .last("limit 1"), false); return relation == null ? null : relation.getContractId(); } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentMethodServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentMethodServiceImpl.java index 79aa09bf..1c590ad4 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentMethodServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractPaymentMethodServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -75,7 +76,7 @@ public class ErpContractPaymentMethodServiceImpl implements IErpContractPaymentM Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractPaymentMethod.class) .selectAll(ErpContractPaymentMethod.class) - .eq(ErpContractPaymentMethod::getDelFlag, "0") + .eq(ErpContractPaymentMethod::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getContractId() != null, ErpContractPaymentMethod::getContractId, bo.getContractId()) .eq(bo.getSortOrder() != null, ErpContractPaymentMethod::getSortOrder, bo.getSortOrder()) .eq(bo.getPaymentStageId() != null, ErpContractPaymentMethod::getPaymentStageId, bo.getPaymentStageId()) @@ -162,7 +163,7 @@ public class ErpContractPaymentMethodServiceImpl implements IErpContractPaymentM .selectAll(ErpContractPaymentMethod.class) .select(BasePaymentStage::getStageName) .leftJoin(BasePaymentStage.class,BasePaymentStage::getPaymentStageId,ErpContractPaymentMethod::getPaymentStageId) - .eq(ErpContractPaymentMethod::getDelFlag, "0") + .eq(ErpContractPaymentMethod::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getContractId() != null, ErpContractPaymentMethod::getContractId, bo.getContractId()) .eq(bo.getSortOrder() != null, ErpContractPaymentMethod::getSortOrder, bo.getSortOrder()) .eq(bo.getPaymentStageId() != null, ErpContractPaymentMethod::getPaymentStageId, bo.getPaymentStageId()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountInstallmentDetailServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountInstallmentDetailServiceImpl.java index 8d1d86fd..b530bb58 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountInstallmentDetailServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountInstallmentDetailServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -149,8 +150,8 @@ public class ErpFinAccountInstallmentDetailServiceImpl implements IErpFinAccount .leftJoin(ErpContractPaymentMethod.class, on -> on .eq(ErpContractPaymentMethod::getContractId, ErpFinAccountInstallmentDetail::getContractId) .eq(ErpContractPaymentMethod::getPaymentStageId, ErpFinAccountInstallmentDetail::getPaymentStageId) - .eq(ErpContractPaymentMethod::getDelFlag, "0")) - .eq(ErpFinAccountInstallmentDetail::getDelFlag, "0") + .eq(ErpContractPaymentMethod::getDelFlag, DataConstants.DEL_FLAG_NORMAL)) + .eq(ErpFinAccountInstallmentDetail::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getAccountInstallmentId() != null, ErpFinAccountInstallmentDetail::getAccountInstallmentId, bo.getAccountInstallmentId()) .eq(bo.getProjectId() != null, ErpFinAccountInstallmentDetail::getProjectId, bo.getProjectId()) .eq(StringUtils.isNotBlank(bo.getProjectCode()), ErpFinAccountInstallmentDetail::getProjectCode, bo.getProjectCode()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountInstallmentServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountInstallmentServiceImpl.java index 87d44b17..3eca7826 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountInstallmentServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountInstallmentServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; @@ -445,7 +446,7 @@ public class ErpFinAccountInstallmentServiceImpl implements IErpFinAccountInstal private void refreshContractOrderPaymentStatus(Long installmentId) { List details = detailMapper.selectList(Wrappers.lambdaQuery() .eq(ErpFinAccountInstallmentDetail::getAccountInstallmentId, installmentId) - .eq(ErpFinAccountInstallmentDetail::getDelFlag, "0")); + .eq(ErpFinAccountInstallmentDetail::getDelFlag, DataConstants.DEL_FLAG_NORMAL)); if (CollUtil.isEmpty(details)) { return; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountReceivableStageServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountReceivableStageServiceImpl.java index c98d8478..90fd9415 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountReceivableStageServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinAccountReceivableStageServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -183,7 +184,7 @@ public class ErpFinAccountReceivableStageServiceImpl implements IErpFinAccountRe .selectAll(ErpContractPaymentMethod.class) .select(BasePaymentStage::getStageName) .leftJoin(BasePaymentStage.class, BasePaymentStage::getPaymentStageId, ErpContractPaymentMethod::getPaymentStageId) - .eq(ErpContractPaymentMethod::getDelFlag, "0") + .eq(ErpContractPaymentMethod::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getContractId() != null, ErpContractPaymentMethod::getContractId, bo.getContractId()) .orderByAsc(ErpContractPaymentMethod::getSortOrder); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinInvoiceInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinInvoiceInfoServiceImpl.java index 653642a9..0f94b8fc 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinInvoiceInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinInvoiceInfoServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -136,7 +137,7 @@ public class ErpFinInvoiceInfoServiceImpl extends AbstractWorkflowService params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpFinInvoiceInfo.class) .selectAll(ErpFinInvoiceInfo.class) - .eq(ErpFinInvoiceInfo::getDelFlag, "0") + .eq(ErpFinInvoiceInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .like(StringUtils.isNotBlank(bo.getProjectCode()), ErpFinInvoiceInfo::getProjectCode, bo.getProjectCode()) .like(StringUtils.isNotBlank(bo.getProjectName()), ErpFinInvoiceInfo::getProjectName, bo.getProjectName()) .eq(StringUtils.isNotBlank(bo.getInvoiceCategory()), ErpFinInvoiceInfo::getInvoiceCategory, bo.getInvoiceCategory()) @@ -261,7 +262,7 @@ public class ErpFinInvoiceInfoServiceImpl extends AbstractWorkflowService qw = Wrappers.lambdaQuery(ErpFinInvoiceInfo.class) .eq(ErpFinInvoiceInfo::getContractId, entity.getContractId()) - .eq(ErpFinInvoiceInfo::getDelFlag, "0") + .eq(ErpFinInvoiceInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .ne(ErpFinInvoiceInfo::getInvoiceStatus, OAStatusEnum.INVALID.getStatus()); if (entity.getInvoiceId() != null) { qw.ne(ErpFinInvoiceInfo::getInvoiceId, entity.getInvoiceId()); @@ -349,7 +350,7 @@ public class ErpFinInvoiceInfoServiceImpl extends AbstractWorkflowService luw = new LambdaUpdateWrapper<>(); // luw.set(ObjectUtil.isNull(config.getPrefix()), SysOssConfig::getPrefix, ""); - luw.set(ErpFinInvoiceInfo::getDelFlag, "1"); + luw.set(ErpFinInvoiceInfo::getDelFlag, DataConstants.DEL_FLAG_DELETED); luw.set(ErpFinInvoiceInfo::getUpdateBy, LoginHelper.getUserId()); luw.set(ErpFinInvoiceInfo::getUpdateTime, new Date()); luw.eq(ErpFinInvoiceInfo::getInvoiceId, id); @@ -371,7 +372,7 @@ public class ErpFinInvoiceInfoServiceImpl extends AbstractWorkflowService lqw = JoinWrappers.lambda(ErpContractPaymentMethod.class) .selectAll(ErpContractPaymentMethod.class) .eq(contractId != null, ErpContractPaymentMethod::getContractId, contractId) - .eq(ErpContractPaymentMethod::getDelFlag, "0") + .eq(ErpContractPaymentMethod::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .orderByAsc(ErpContractPaymentMethod::getSortOrder); List erpContractPaymentMethodVoList = erpContractPaymentMethodMapper.selectCustomErpContractPaymentMethodVoList(lqw); return erpContractPaymentMethodVoList; diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java index 818e2ee6..2f47ca3e 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java @@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -117,7 +118,7 @@ public class ErpProjectAcceptanceServiceImpl implements IErpProjectAcceptanceSer Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectAcceptance.class) .selectAll(ErpProjectAcceptance.class) - .eq(ErpProjectAcceptance::getDelFlag, "0") + .eq(ErpProjectAcceptance::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getProjectId() != null, ErpProjectAcceptance::getProjectId, bo.getProjectId()) .eq(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectAcceptance::getProjectCode, bo.getProjectCode()) .like(StringUtils.isNotBlank(bo.getProjectName()), ErpProjectAcceptance::getProjectName, bo.getProjectName()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeBudgetServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeBudgetServiceImpl.java index e99d253c..79746d53 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeBudgetServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeBudgetServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -73,7 +74,7 @@ public class ErpProjectChangeBudgetServiceImpl implements IErpProjectChangeBudge Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectChangeBudget.class) .selectAll(ErpProjectChangeBudget.class) - .eq(ErpProjectChangeBudget::getDelFlag, "0") + .eq(ErpProjectChangeBudget::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getProjectChangeId() != null, ErpProjectChangeBudget::getProjectChangeId, bo.getProjectChangeId()) .eq(bo.getBudgetDetailId() != null, ErpProjectChangeBudget::getBudgetDetailId, bo.getBudgetDetailId()) .like(StringUtils.isNotBlank(bo.getSubjectName()), ErpProjectChangeBudget::getSubjectName, bo.getSubjectName()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeProgressServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeProgressServiceImpl.java index 101eac47..f426e6b6 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeProgressServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeProgressServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -73,7 +74,7 @@ public class ErpProjectChangeProgressServiceImpl implements IErpProjectChangePro Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectChangeProgress.class) .selectAll(ErpProjectChangeProgress.class) - .eq(ErpProjectChangeProgress::getDelFlag, "0") + .eq(ErpProjectChangeProgress::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getProjectChangeId() != null, ErpProjectChangeProgress::getProjectChangeId, bo.getProjectChangeId()) .eq(bo.getPlanStageId() != null, ErpProjectChangeProgress::getPlanStageId, bo.getPlanStageId()) .like(StringUtils.isNotBlank(bo.getMilestoneName()), ErpProjectChangeProgress::getMilestoneName, bo.getMilestoneName()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java index 1112921e..8561d1db 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java @@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -87,7 +88,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { // 查询预算变更明细列表 MPJLambdaWrapper budgetLqw = JoinWrappers.lambda(ErpProjectChangeBudget.class) .selectAll(ErpProjectChangeBudget.class) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .eq(projectChangeId != null, ErpProjectChangeBudget::getProjectChangeId, projectChangeId); List budgetList = changeBudgetMapper.selectList(budgetLqw); projectChangeVo.setBudgetList(budgetList); @@ -97,7 +98,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { .selectAll(ErpProjectChangeProgress.class) .selectAs(ErpProjectPlanStage::getProjectPhases, ErpProjectChangeProgress::getProjectPhases) .leftJoin(ErpProjectPlanStage.class, ErpProjectPlanStage::getPlanStageId, ErpProjectChangeProgress::getPlanStageId) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .eq(projectChangeId != null, ErpProjectChangeProgress::getProjectChangeId, projectChangeId) .orderByAsc(ErpProjectChangeProgress::getSortOrder); List progressList = changeProgressMapper.selectList(progressLqw); @@ -154,7 +155,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectChange.class) .selectAll(ErpProjectChange.class) - .eq(ErpProjectChange::getDelFlag, "0") + .eq(ErpProjectChange::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getProjectId() != null, ErpProjectChange::getProjectId, bo.getProjectId()) .eq(StringUtils.isNotBlank(bo.getProjectChangeCode()), ErpProjectChange::getProjectChangeCode, bo.getProjectChangeCode()) .eq(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectChange::getProjectCode, bo.getProjectCode()) @@ -213,7 +214,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { add.setProjectChangeStatus("1"); // 暂存 } if (StringUtils.isBlank(add.getActiveFlag())) { - add.setActiveFlag("1"); + add.setActiveFlag(DataConstants.ACTIVE_FLAG_YES); } boolean flag = baseMapper.insert(add) > 0; @@ -478,7 +479,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { // 设置默认状态 vo.setProjectChangeStatus("1"); // 暂存 - vo.setActiveFlag("1");//默认激活 + vo.setActiveFlag(DataConstants.ACTIVE_FLAG_YES);//默认激活 return vo; } @@ -559,7 +560,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { ErpProjectPlan projectPlan = projectPlanMapper.selectOne( Wrappers.lambdaQuery() .eq(ErpProjectPlan::getProjectId, projectId) - .eq(ErpProjectPlan::getDelFlag, "0") + .eq(ErpProjectPlan::getDelFlag, DataConstants.DEL_FLAG_NORMAL) ); if (projectPlan == null) { throw new ServiceException("该项目尚未创建项目计划，无法发起项目变更"); @@ -640,7 +641,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { // 第二步：通过项目ID查询该项目的所有变更记录 LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ErpProjectChange.class) .eq(ErpProjectChange::getProjectId, projectId) - .eq(ErpProjectChange::getDelFlag, "0") + .eq(ErpProjectChange::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .orderByDesc(ErpProjectChange::getCreateTime); List list = baseMapper.selectList(lqw); @@ -654,13 +655,13 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { vo.setBudgetList(changeBudgetMapper.selectList( Wrappers.lambdaQuery(ErpProjectChangeBudget.class) .eq(ErpProjectChangeBudget::getProjectChangeId, entity.getProjectChangeId()) - .eq(ErpProjectChangeBudget::getDelFlag, "0") + .eq(ErpProjectChangeBudget::getDelFlag, DataConstants.DEL_FLAG_NORMAL) )); vo.setProgressList(changeProgressMapper.selectList( Wrappers.lambdaQuery(ErpProjectChangeProgress.class) .eq(ErpProjectChangeProgress::getProjectChangeId, entity.getProjectChangeId()) - .eq(ErpProjectChangeProgress::getDelFlag, "0") + .eq(ErpProjectChangeProgress::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .orderByAsc(ErpProjectChangeProgress::getSortOrder) )); @@ -686,7 +687,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { // 查询该项目的所有非草稿的变更记录（按照变更次数/创建时间正序，便于组装历史变更轴） LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ErpProjectChange.class) .eq(ErpProjectChange::getProjectId, projectId) - .eq(ErpProjectChange::getDelFlag, "0") + .eq(ErpProjectChange::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .ne(ErpProjectChange::getProjectChangeStatus, "1") // 排除暂存状态 .orderByAsc(ErpProjectChange::getChangeNumber) // 升序排列，第1次在前面 .orderByAsc(ErpProjectChange::getCreateTime); @@ -706,7 +707,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { vo.setBudgetList(changeBudgetMapper.selectList( Wrappers.lambdaQuery(ErpProjectChangeBudget.class) .eq(ErpProjectChangeBudget::getProjectChangeId, vo.getProjectChangeId()) - .eq(ErpProjectChangeBudget::getDelFlag, "0") + .eq(ErpProjectChangeBudget::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .orderByAsc(ErpProjectChangeBudget::getSortOrder) )); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectContractsServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectContractsServiceImpl.java index d276a8d0..bf2bf002 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectContractsServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectContractsServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -81,7 +82,7 @@ public class ErpProjectContractsServiceImpl implements IErpProjectContractsServi public BigDecimal sumProjectLinkedContractTotalPrice(Long projectId) { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectContracts.class); lqw.eq(ErpProjectContracts::getProjectId, projectId); - lqw.eq("t.del_flag", "0"); + lqw.eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL); List links = baseMapper.selectCustomErpProjectContractsVoList(lqw); if (CollUtil.isEmpty(links)) { return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP); @@ -114,7 +115,7 @@ public class ErpProjectContractsServiceImpl implements IErpProjectContractsServi .eq(bo.getContractId() != null, ErpProjectContracts::getContractId, bo.getContractId()) .eq(bo.getSortOrder() != null, ErpProjectContracts::getSortOrder, bo.getSortOrder()) .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectContracts::getActiveFlag, bo.getActiveFlag()) - .eq("t.del_flag", "0"); + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL); return lqw; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java index e03364ee..89c44fa3 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java @@ -13,6 +13,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -90,7 +91,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { public ErpProjectInfoVo queryById(Long projectId) { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectInfo.class) .eq(ErpProjectInfo::getProjectId, projectId) - .eq("t.del_flag", "0"); + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL); List list = baseMapper.selectCustomErpProjectInfoVoList(lqw, true); return !list.isEmpty() ? list.get(0) : null; } @@ -149,7 +150,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { .eq(bo.getParentProjectId() != null, ErpProjectInfo::getParentProjectId, bo.getParentProjectId()) .eq(StringUtils.isNotBlank(bo.getSubProjectFlag()), ErpProjectInfo::getSubProjectFlag, bo.getSubProjectFlag()) .ne(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .orderByDesc(ErpProjectInfo::getCreateTime); return lqw; } @@ -276,7 +277,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { if (StringUtils.isNotBlank(entity.getProjectCode())) { LambdaQueryWrapper lqw = new LambdaQueryWrapper() .eq(ErpProjectInfo::getProjectCode, entity.getProjectCode()) - .eq(ErpProjectInfo::getDelFlag, "0") + .eq(ErpProjectInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .ne(entity.getProjectId() != null, ErpProjectInfo::getProjectId, entity.getProjectId()); Long cnt = baseMapper.selectCount(lqw); if (cnt != null && cnt > 0) { @@ -450,7 +451,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { .like(StringUtils.isNotBlank(bo.getProjectName()), ErpProjectInfo::getProjectName, bo.getProjectName()) .eq(StringUtils.isNotBlank(bo.getProjectStatus()), ErpProjectInfo::getProjectStatus, bo.getProjectStatus()) .ne(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .and(w -> { if (StringUtils.isNotBlank(bo.getProjectCategory()) && bo.getProjectCategory().equals(ProjectCategoryEnum.MARKET.getCode())) { @@ -560,7 +561,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { // 关联表里维护的是项目补充关联的合同，按排序字段读取，保证草稿展示和用户维护顺序一致 List projectContracts = projectContractsMapper.selectList(Wrappers.lambdaQuery() .eq(ErpProjectContracts::getProjectId, projectInfo.getProjectId()) - .eq(ErpProjectContracts::getDelFlag, "0") + .eq(ErpProjectContracts::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .orderByAsc(ErpProjectContracts::getSortOrder) .orderByAsc(ErpProjectContracts::getProjectContractsId)); if (CollUtil.isNotEmpty(projectContracts)) { @@ -867,7 +868,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { Wrappers.lambdaQuery() .select(ErpProjectContracts::getProjectId) .eq(ErpProjectContracts::getContractId, contractId) - .eq(ErpProjectContracts::getDelFlag, "0") + .eq(ErpProjectContracts::getDelFlag, DataConstants.DEL_FLAG_NORMAL) ).stream() .map(ErpProjectContracts::getProjectId) .filter(Objects::nonNull) @@ -878,7 +879,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { } MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectInfo.class) .selectAll(ErpProjectInfo.class) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .in(ErpProjectInfo::getProjectId, relatedProjectIds) .orderByDesc(ErpProjectInfo::getCreateTime); return baseMapper.selectCustomErpProjectInfoVoList(lqw); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java index 0f38ac02..82d55dfb 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java @@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -96,7 +97,7 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService { .selectAll(ErpProjectPlanStage.class) .selectAs(BasePaymentStage::getStageName, ErpProjectPlanStageVo::getPaymentStageName) .leftJoin(BasePaymentStage.class, BasePaymentStage::getPaymentStageId, ErpProjectPlanStage::getPaymentStageId) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .eq(projectPlanId != null, ErpProjectPlanStage::getProjectPlanId, projectPlanId) .orderByAsc(ErpProjectPlanStage::getSortOrder); List planStageList = planStageMapper.selectVoList(lqw); @@ -136,7 +137,7 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectPlan.class) .selectAll(ErpProjectPlan.class) - .eq(ErpProjectPlan::getDelFlag, "0") + .eq(ErpProjectPlan::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getProjectId() != null, ErpProjectPlan::getProjectId, bo.getProjectId()) .eq(StringUtils.isNotBlank(bo.getProjectPlanCode()), ErpProjectPlan::getProjectPlanCode, bo.getProjectPlanCode()) .eq(bo.getManagerId() != null, ErpProjectPlan::getManagerId, bo.getManagerId()) @@ -274,7 +275,7 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService { } MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectPlan.class) .eq(ErpProjectPlan::getProjectId, projectId) - .eq(ErpProjectPlan::getDelFlag, "0"); + .eq(ErpProjectPlan::getDelFlag, DataConstants.DEL_FLAG_NORMAL); // 更新时排除自身ID if (entity.getProjectPlanId() != null) { lqw.ne(ErpProjectPlan::getProjectPlanId, entity.getProjectPlanId()); @@ -383,7 +384,7 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService { .selectAll(ErpProjectPlanStage.class) .selectAs(BasePaymentStage::getStageName, ErpProjectPlanStageVo::getPaymentStageName) .leftJoin(BasePaymentStage.class, BasePaymentStage::getPaymentStageId, ErpProjectPlanStage::getPaymentStageId) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .eq(ErpProjectPlanStage::getProjectPlanId, projectPlanId) .orderByAsc(ErpProjectPlanStage::getSortOrder); List list = planStageMapper.selectVoList(lqw); @@ -430,7 +431,7 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService { List contractOrders = projectInfoMapper.selectList(Wrappers.lambdaQuery() .eq(ErpProjectInfo::getContractId, contractId) .eq(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER) - .eq(ErpProjectInfo::getDelFlag, "0")); + .eq(ErpProjectInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL)); if (CollUtil.isEmpty(contractOrders)) { return; } @@ -446,7 +447,7 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService { } ErpProjectPlan plan = baseMapper.selectOne(Wrappers.lambdaQuery() .eq(ErpProjectPlan::getProjectId, projectId) - .eq(ErpProjectPlan::getDelFlag, "0") + .eq(ErpProjectPlan::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .orderByDesc(ErpProjectPlan::getCreateTime) .last("limit 1"), false); if (plan == null) { @@ -465,7 +466,7 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService { List stages = planStageMapper.selectList( Wrappers.lambdaQuery(ErpProjectPlanStage.class) .eq(ErpProjectPlanStage::getProjectPlanId, projectPlanId) - .eq(ErpProjectPlanStage::getDelFlag, "0")); + .eq(ErpProjectPlanStage::getDelFlag, DataConstants.DEL_FLAG_NORMAL)); BigDecimal sumRate = stages.stream() .map(s -> s.getActualRepaymentRate() != null ? s.getActualRepaymentRate() : BigDecimal.ZERO) .reduce(BigDecimal.ZERO, BigDecimal::add) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanStageServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanStageServiceImpl.java index 4d0fa423..03629c16 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanStageServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanStageServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -76,7 +77,7 @@ public class ErpProjectPlanStageServiceImpl implements IErpProjectPlanStageServi .selectAll(ErpProjectPlanStage.class) .selectAs(BasePaymentStage::getStageName, ErpProjectPlanStageVo::getPaymentStageName) .leftJoin(BasePaymentStage.class, BasePaymentStage::getPaymentStageId, ErpProjectPlanStage::getPaymentStageId) - .eq(ErpProjectPlanStage::getDelFlag, "0") + .eq(ErpProjectPlanStage::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getProjectId() != null, ErpProjectPlanStage::getProjectId, bo.getProjectId()) .eq(bo.getProjectPlanId() != null, ErpProjectPlanStage::getProjectPlanId, bo.getProjectPlanId()) .eq(StringUtils.isNotBlank(bo.getProjectPhases()), ErpProjectPlanStage::getProjectPhases, bo.getProjectPhases()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseMaterialServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseMaterialServiceImpl.java index becfc56f..57793451 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseMaterialServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseMaterialServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -73,7 +74,7 @@ public class ErpProjectPurchaseMaterialServiceImpl implements IErpProjectPurchas Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectPurchaseMaterial.class) .selectAll(ErpProjectPurchaseMaterial.class) - .eq(ErpProjectPurchaseMaterial::getDelFlag, "0") + .eq(ErpProjectPurchaseMaterial::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getProjectPurchaseId() != null, ErpProjectPurchaseMaterial::getProjectPurchaseId, bo.getProjectPurchaseId()) .eq(bo.getRelationDetailsId() != null, ErpProjectPurchaseMaterial::getRelationDetailsId, bo.getRelationDetailsId()) .eq(StringUtils.isNotBlank(bo.getSpareFlag()), ErpProjectPurchaseMaterial::getSpareFlag, bo.getSpareFlag()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java index 5c5c67b5..e828c517 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java @@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -91,7 +92,7 @@ public class ErpProjectPurchaseServiceImpl implements IErpProjectPurchaseService ErpProjectPurchaseVo erpProjectPurchaseVo = list.get(0); MPJLambdaWrapper lqwM = JoinWrappers.lambda(ErpProjectPurchaseMaterial.class) .selectAll(ErpProjectPurchaseMaterial.class) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .eq(ErpProjectPurchaseMaterial::getProjectPurchaseId, erpProjectPurchaseVo.getProjectPurchaseId()); List voList = purchaseMaterialMapper.selectCustomErpProjectPurchaseMaterialVoList(lqwM); erpProjectPurchaseVo.setPurchaseMaterialList(voList); @@ -128,7 +129,7 @@ public class ErpProjectPurchaseServiceImpl implements IErpProjectPurchaseService Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectPurchase.class) .selectAll(ErpProjectPurchase.class) - .eq(ErpProjectPurchase::getDelFlag, "0") + .eq(ErpProjectPurchase::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getProjectId() != null, ErpProjectPurchase::getProjectId, bo.getProjectId()) .like(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectPurchase::getProjectCode, bo.getProjectCode()) .eq(bo.getManagerId() != null, ErpProjectPurchase::getManagerId, bo.getManagerId()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java index 7bf2298c..53206d10 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java @@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.OAStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -98,7 +99,7 @@ public class ErpProjectReceivingServiceImpl implements IErpProjectReceivingServi Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectReceiving.class) .selectAll(ErpProjectReceiving.class) - .eq(ErpProjectReceiving::getDelFlag, "0") + .eq(ErpProjectReceiving::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectReceiving::getProjectCode, bo.getProjectCode()) .like(StringUtils.isNotBlank(bo.getProjectName()), ErpProjectReceiving::getProjectName, bo.getProjectName()) .eq(bo.getManagerId() != null, ErpProjectReceiving::getManagerId, bo.getManagerId()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java index 59e14a63..9e2c97a6 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -99,7 +100,7 @@ public class ErpProjectReportServiceImpl implements IErpProjectReportService { .eq(bo.getSortOrder() != null, ErpProjectReport::getSortOrder, bo.getSortOrder()) .eq(StringUtils.isNotBlank(bo.getOssId()), ErpProjectReport::getOssId, bo.getOssId()) .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectReport::getActiveFlag, bo.getActiveFlag()) - .eq("t.del_flag", "0") + .eq("t.del_flag", DataConstants.DEL_FLAG_NORMAL) .like(StringUtils.isNotBlank(bo.getMilestonePlan()), ErpProjectReport::getMilestonePlan, bo.getMilestonePlan()) .like(StringUtils.isNotBlank(bo.getProjectName()), ErpProjectReport::getProjectName, bo.getProjectName()) .like(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectReport::getProjectCode, bo.getProjectCode()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetDeptServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetDeptServiceImpl.java index b3885fc3..bb0b7513 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetDeptServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.oa.erp.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -76,7 +77,7 @@ public class ErpTimesheetDeptServiceImpl Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpTimesheetDept.class) .selectAll(ErpTimesheetDept.class) - .eq(ErpTimesheetDept::getDelFlag, "0") + .eq(ErpTimesheetDept::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getTimesheetId() != null, ErpTimesheetDept::getTimesheetId, bo.getTimesheetId()) .eq(bo.getSortOrder() != null, ErpTimesheetDept::getSortOrder, bo.getSortOrder()) .eq(StringUtils.isNotBlank(bo.getWorkDescription()), ErpTimesheetDept::getWorkDescription, bo.getWorkDescription()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java index 7f9f05e7..84fa631f 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; @@ -130,7 +131,7 @@ public class ErpTimesheetInfoServiceImpl implements IErpTimesheetInfoService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpTimesheetInfo.class) .selectAll(ErpTimesheetInfo.class) - .eq(ErpTimesheetInfo::getDelFlag, "0") + .eq(ErpTimesheetInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL) // 按指定ID列表过滤（用于导出选中数据） .in(StringUtils.isNotBlank(bo.getTimesheetIds()), ErpTimesheetInfo::getTimesheetId, StringUtils.isNotBlank(bo.getTimesheetIds()) ? List.of(bo.getTimesheetIds().split(",")) : null) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocDetailServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocDetailServiceImpl.java index 5f594c85..622e6e30 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocDetailServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocDetailServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -73,7 +74,7 @@ public class ErpTimesheetPreAllocDetailServiceImpl implements IErpTimesheetPreAl Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpTimesheetPreAllocDetail.class) .selectAll(ErpTimesheetPreAllocDetail.class) - .eq(ErpTimesheetPreAllocDetail::getDelFlag, "0") + .eq(ErpTimesheetPreAllocDetail::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getAllocId() != null, ErpTimesheetPreAllocDetail::getAllocId, bo.getAllocId()) .eq(bo.getSortOrder() != null, ErpTimesheetPreAllocDetail::getSortOrder, bo.getSortOrder()) .eq(bo.getOriginalProjectId() != null, ErpTimesheetPreAllocDetail::getOriginalProjectId, bo.getOriginalProjectId()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocServiceImpl.java index 38891c72..ae63f565 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocServiceImpl.java @@ -6,6 +6,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -52,8 +53,6 @@ import java.util.regex.Pattern; @RequiredArgsConstructor @Service public class ErpTimesheetPreAllocServiceImpl implements IErpTimesheetPreAllocService { - - private static final String DEL_FLAG_NORMAL = "0"; private static final String PRE_PROJECT_CATEGORY = "4"; private static final Set TARGET_PROJECT_CATEGORIES = Set.of("1", "2"); private static final String STATUS_NOT_ALLOCATED = "0"; @@ -88,7 +87,7 @@ public class ErpTimesheetPreAllocServiceImpl implements IErpTimesheetPreAllocSer @Override public PreAllocDetailVo queryDetailById(Long allocId) { ErpTimesheetPreAlloc alloc = baseMapper.selectById(allocId); - if (alloc == null || !DEL_FLAG_NORMAL.equals(alloc.getDelFlag())) { + if (alloc == null || !DataConstants.DEL_FLAG_NORMAL.equals(alloc.getDelFlag())) { throw new ServiceException("预投工时分配单不存在"); } Long deptId = requireDeptId(); @@ -157,14 +156,14 @@ public class ErpTimesheetPreAllocServiceImpl implements IErpTimesheetPreAllocSer .leftJoin(ErpTimesheetPreAlloc.class, ErpTimesheetPreAlloc::getAllocId, ErpTimesheetPreAllocDetail::getAllocId) .in(ErpTimesheetPreAllocDetail::getAllocId, allocIds) - .eq(ErpTimesheetPreAllocDetail::getDelFlag, "0")); + .eq(ErpTimesheetPreAllocDetail::getDelFlag, DataConstants.DEL_FLAG_NORMAL)); } private MPJLambdaWrapper buildQueryWrapper(ErpTimesheetPreAllocBo bo) { Long deptId = LoginHelper.getDeptId(); return JoinWrappers.lambda(ErpTimesheetPreAlloc.class) .selectAll(ErpTimesheetPreAlloc.class) - .eq(ErpTimesheetPreAlloc::getDelFlag, DEL_FLAG_NORMAL) + .eq(ErpTimesheetPreAlloc::getDelFlag, DataConstants.DEL_FLAG_NORMAL) // .eq(deptId != null, ErpTimesheetPreAlloc::getCreateDept, deptId) .eq(StringUtils.isNotBlank(bo.getAllocCode()), ErpTimesheetPreAlloc::getAllocCode, bo.getAllocCode()) .eq(StringUtils.isNotBlank(bo.getMonthCode()), ErpTimesheetPreAlloc::getMonthCode, bo.getMonthCode()) @@ -323,7 +322,7 @@ public class ErpTimesheetPreAllocServiceImpl implements IErpTimesheetPreAllocSer } List allocList = baseMapper.selectList(Wrappers.lambdaQuery() .in(ErpTimesheetPreAlloc::getAllocId, ids) - .eq(ErpTimesheetPreAlloc::getDelFlag, DEL_FLAG_NORMAL)); + .eq(ErpTimesheetPreAlloc::getDelFlag, DataConstants.DEL_FLAG_NORMAL)); if (allocList.size() != ids.size()) { throw new ServiceException("部分预投工时分配单不存在或已删除"); } @@ -377,7 +376,7 @@ public class ErpTimesheetPreAllocServiceImpl implements IErpTimesheetPreAllocSer private ErpProjectInfo getProject(Long projectId, String errorMessage) { ErpProjectInfo project = projectInfoMapper.selectById(projectId); - if (project == null || !DEL_FLAG_NORMAL.equals(project.getDelFlag())) { + if (project == null || !DataConstants.DEL_FLAG_NORMAL.equals(project.getDelFlag())) { throw new ServiceException(errorMessage); } return project; @@ -400,7 +399,7 @@ public class ErpTimesheetPreAllocServiceImpl implements IErpTimesheetPreAllocSer .eq(ErpTimesheetPreAlloc::getMonthCode, monthCode) .eq(ErpTimesheetPreAlloc::getProjectId, projectId) .eq(ErpTimesheetPreAlloc::getCreateDept, deptId) - .eq(ErpTimesheetPreAlloc::getDelFlag, DEL_FLAG_NORMAL)); + .eq(ErpTimesheetPreAlloc::getDelFlag, DataConstants.DEL_FLAG_NORMAL)); if (allocList.size() > 1) { throw new ServiceException("当前部门该月份该预投项目存在多张有效分配单，请先修正数据"); } @@ -413,7 +412,7 @@ public class ErpTimesheetPreAllocServiceImpl implements IErpTimesheetPreAllocSer return keyAlloc; } ErpTimesheetPreAlloc idAlloc = baseMapper.selectById(allocId); - if (idAlloc == null || !DEL_FLAG_NORMAL.equals(idAlloc.getDelFlag())) { + if (idAlloc == null || !DataConstants.DEL_FLAG_NORMAL.equals(idAlloc.getDelFlag())) { throw new ServiceException("预投工时分配单不存在"); } if (keyAlloc != null && !Objects.equals(keyAlloc.getAllocId(), allocId)) { @@ -516,7 +515,7 @@ public class ErpTimesheetPreAllocServiceImpl implements IErpTimesheetPreAllocSer List detailList = preAllocDetailMapper .selectList(Wrappers.lambdaQuery() .eq(ErpTimesheetPreAllocDetail::getAllocId, allocId) - .eq(ErpTimesheetPreAllocDetail::getDelFlag, DEL_FLAG_NORMAL) + .eq(ErpTimesheetPreAllocDetail::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .orderByAsc(ErpTimesheetPreAllocDetail::getSortOrder) .orderByAsc(ErpTimesheetPreAllocDetail::getAllocDetailId)); List targetVos = new ArrayList<>(); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetProjectServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetProjectServiceImpl.java index 22677fff..f5e84e8a 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetProjectServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetProjectServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.oa.erp.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -76,7 +77,7 @@ public class ErpTimesheetProjectServiceImpl Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpTimesheetProject.class) .selectAll(ErpTimesheetProject.class) - .eq(ErpTimesheetProject::getDelFlag, "0") + .eq(ErpTimesheetProject::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getTimesheetId() != null, ErpTimesheetProject::getTimesheetId, bo.getTimesheetId()) .eq(bo.getSortOrder() != null, ErpTimesheetProject::getSortOrder, bo.getSortOrder()) .eq(bo.getProjectId() != null, ErpTimesheetProject::getProjectId, bo.getProjectId()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetStandardMonthServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetStandardMonthServiceImpl.java index 7cdfabbf..03d91e95 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetStandardMonthServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetStandardMonthServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -73,7 +74,7 @@ public class ErpTimesheetStandardMonthServiceImpl implements IErpTimesheetStanda Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpTimesheetStandardMonth.class) .selectAll(ErpTimesheetStandardMonth.class) - .eq(ErpTimesheetStandardMonth::getDelFlag, "0") + .eq(ErpTimesheetStandardMonth::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(StringUtils.isNotBlank(bo.getMonthCode()), ErpTimesheetStandardMonth::getMonthCode, bo.getMonthCode()) .eq(StringUtils.isNotBlank(bo.getMonthLabel()), ErpTimesheetStandardMonth::getMonthLabel, bo.getMonthLabel()) .eq(bo.getStartDate() != null, ErpTimesheetStandardMonth::getStartDate, bo.getStartDate()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryDetailServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryDetailServiceImpl.java index ce49e1a7..f518007e 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryDetailServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryDetailServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.oa.erp.service.impl; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -76,7 +77,7 @@ public class ErpTimesheetSummaryDetailServiceImpl implements IErpTimesheetSummar .selectAs(ErpTimesheetSummary::getSummaryCode, ErpTimesheetSummaryDetailVo::getSummaryCode) .selectAs(ErpTimesheetSummary::getMonthCode, ErpTimesheetSummaryDetailVo::getMonthCode) .leftJoin(ErpTimesheetSummary.class, ErpTimesheetSummary::getSummaryId, ErpTimesheetSummaryDetail::getSummaryId) - .eq(ErpTimesheetSummaryDetail::getDelFlag, "0") + .eq(ErpTimesheetSummaryDetail::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(bo.getSummaryId() != null, ErpTimesheetSummaryDetail::getSummaryId, bo.getSummaryId()) .eq(StringUtils.isNotBlank(bo.getSummaryCode()), ErpTimesheetSummary::getSummaryCode, bo.getSummaryCode()) .eq(StringUtils.isNotBlank(bo.getMonthCode()), ErpTimesheetSummary::getMonthCode, bo.getMonthCode()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryServiceImpl.java index e79fd83f..3e85cb2e 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryServiceImpl.java @@ -5,6 +5,7 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.api.RemoteCodeRuleService; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -98,7 +99,7 @@ public class ErpTimesheetSummaryServiceImpl implements IErpTimesheetSummaryServi private MPJLambdaWrapper buildQueryWrapper(ErpTimesheetSummaryBo bo) { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpTimesheetSummary.class) .selectAll(ErpTimesheetSummary.class) - .eq(ErpTimesheetSummary::getDelFlag, "0") + .eq(ErpTimesheetSummary::getDelFlag, DataConstants.DEL_FLAG_NORMAL) .eq(StringUtils.isNotBlank(bo.getSummaryCode()), ErpTimesheetSummary::getSummaryCode, bo.getSummaryCode()) .eq(StringUtils.isNotBlank(bo.getMonthCode()), ErpTimesheetSummary::getMonthCode, bo.getMonthCode()) @@ -248,7 +249,7 @@ public class ErpTimesheetSummaryServiceImpl implements IErpTimesheetSummaryServi .eq(ErpTimesheetSummary::getDeptId, entity.getDeptId()) .eq(ErpTimesheetSummary::getMonthCode, entity.getMonthCode()) .ne(entity.getSummaryId() != null, ErpTimesheetSummary::getSummaryId, entity.getSummaryId()) - .eq(ErpTimesheetSummary::getDelFlag, "0")); + .eq(ErpTimesheetSummary::getDelFlag, DataConstants.DEL_FLAG_NORMAL)); if (exists) { throw new ServiceException("该部门 " + entity.getMonthCode() + " 月份的工时汇总已存在，请勿重复操作"); } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ProjectLedgerReportServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ProjectLedgerReportServiceImpl.java index 0495e347..bfdcb132 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ProjectLedgerReportServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ProjectLedgerReportServiceImpl.java @@ -4,6 +4,7 @@ import lombok.RequiredArgsConstructor; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import org.dromara.common.core.constant.DataConstants; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -30,7 +31,7 @@ public class ProjectLedgerReportServiceImpl implements IProjectLedgerReportServi private MPJLambdaWrapper buildQueryWrapper(ProjectLedgerReportVo bo) { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectInfo.class); - lqw.eq(ErpProjectInfo::getDelFlag, "0"); + lqw.eq(ErpProjectInfo::getDelFlag, DataConstants.DEL_FLAG_NORMAL); lqw.ne(ErpProjectInfo::getProjectCategory, "9"); if (bo.getParams() != null && bo.getParams().get("projectIds") != null && StringUtils.isNotBlank(bo.getParams().get("projectIds").toString())) { @@ -45,7 +46,9 @@ public class ProjectLedgerReportServiceImpl implements IProjectLedgerReportServi lqw.eq(bo.getDeptId() != null, ErpProjectInfo::getDeptId, bo.getDeptId()); lqw.eq(bo.getProjectTypeId() != null, ErpProjectInfo::getProjectTypeId, bo.getProjectTypeId()); // 项目阶段过滤 (联查关联表) - lqw.apply(StringUtils.isNotBlank(bo.getProjectPhases()), "EXISTS (SELECT 1 FROM erp_project_plan_stage s WHERE s.project_id = t.project_id AND s.project_phases = {0} AND s.del_flag = '0')", bo.getProjectPhases()); + lqw.apply(StringUtils.isNotBlank(bo.getProjectPhases()), + "EXISTS (SELECT 1 FROM erp_project_plan_stage s WHERE s.project_id = t.project_id AND s.project_phases = {0} AND s.del_flag = {1})", + bo.getProjectPhases(), DataConstants.DEL_FLAG_NORMAL); lqw.orderByDesc(ErpProjectInfo::getCreateTime); return lqw;