diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/AmountApprovalManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/AmountApprovalManage.java index 9cbdd43..9332ae3 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/AmountApprovalManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/AmountApprovalManage.java @@ -7,12 +7,10 @@ import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hz.pm.api.common.exception.ReturnException; import com.hz.pm.api.common.helper.UserInfoHelper; -import com.hz.pm.api.common.model.constant.BizConst; import com.hz.pm.api.common.util.DecimalUtil; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.utils.DataScopeUtil; @@ -26,7 +24,7 @@ import com.hz.pm.api.projectlib.model.req.ProjectListReq; import com.hz.pm.api.projectlib.model.req.SubmitAmountApprovalReq; import com.hz.pm.api.projectlib.model.vo.AmountApprovalProgressStatisticsVO; import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO; -import com.hz.pm.api.projectlib.service.INdProjectApprovalAmountService; +import com.hz.pm.api.projectlib.service.IProjectApprovalAmountService; import com.hz.pm.api.projectlib.service.IProjectService; import com.hz.pm.api.user.helper.MhUnitCache; import com.hz.pm.api.user.security.model.UserFullInfoDTO; @@ -35,7 +33,6 @@ import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.util.CollUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.assertj.core.error.ElementsShouldBeExactly; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -58,7 +55,7 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class AmountApprovalManage { - private final INdProjectApprovalAmountService projectApprovalAmountService; + private final IProjectApprovalAmountService projectApprovalAmountService; private final IProjectService projectService; private final UserInfoHelper userInfoHelper; private final MhUnitCache mhUnitCache; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java index cb82946..d510c04 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.NumberUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -15,7 +14,6 @@ import com.github.xiaoymin.knife4j.core.util.StrUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.hz.pm.api.common.compare.CompareUtils; -import com.hz.pm.api.common.enumeration.CommonEnum; import com.hz.pm.api.common.enumeration.ProjectProcessType; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.common.model.constant.BizConst; @@ -37,7 +35,6 @@ import com.hz.pm.api.filemanage.service.INdProjectApplyBorrowService; import com.hz.pm.api.meeting.entity.domain.MeetingInnerProject; import com.hz.pm.api.meeting.entity.dto.ProjectReviewResultDTO; import com.hz.pm.api.meeting.service.IMeetingInnerProjectService; -import com.hz.pm.api.performance.model.dto.ProjectCoreBusinessDTO; import com.hz.pm.api.performance.model.entity.ProjectCoreBusinessIndicators; import com.hz.pm.api.performance.service.IProjectCoreBusinessIndicatorsService; import com.hz.pm.api.portrait.model.entity.ProjectTag; @@ -150,7 +147,7 @@ public class ProjectLibManage { private final IMhProjectService mhProjectService; private final ProjectReviewManage projectReviewManage; private final IMeetingInnerProjectService meetingInnerProjectService; - private final INdProjectApprovalAmountService projectApprovalAmountService; + private final IProjectApprovalAmountService projectApprovalAmountService; public PageVo projectLibList(ProjectListReq req) { LambdaQueryWrapper query = ProjectManageUtil.projectQuery(req); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/NdProjectApprovalAmountMapper.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectApprovalAmountMapper.java similarity index 73% rename from hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/NdProjectApprovalAmountMapper.java rename to hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectApprovalAmountMapper.java index d55e41f..2fca3e9 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/NdProjectApprovalAmountMapper.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectApprovalAmountMapper.java @@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author WendyYang * @since 2024-10-09 */ -public interface NdProjectApprovalAmountMapper extends BaseMapper { +public interface ProjectApprovalAmountMapper extends BaseMapper { } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/NdProjectApprovalAmountMapper.xml b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectApprovalAmountMapper.xml similarity index 65% rename from hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/NdProjectApprovalAmountMapper.xml rename to hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectApprovalAmountMapper.xml index 99467ba..cf3e7ad 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/NdProjectApprovalAmountMapper.xml +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectApprovalAmountMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/INdProjectApprovalAmountService.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/IProjectApprovalAmountService.java similarity index 92% rename from hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/INdProjectApprovalAmountService.java rename to hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/IProjectApprovalAmountService.java index f7143b0..8e9e53b 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/INdProjectApprovalAmountService.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/IProjectApprovalAmountService.java @@ -16,7 +16,7 @@ import java.util.List; * @author WendyYang * @since 2024-10-09 */ -public interface INdProjectApprovalAmountService extends IService { +public interface IProjectApprovalAmountService extends IService { default ProjectApprovalAmount getByProjectCode(String projectCode) { Wrapper query = Wrappers.lambdaQuery(ProjectApprovalAmount.class) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/impl/NdProjectApprovalAmountServiceImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/impl/ProjectApprovalAmountServiceImpl.java similarity index 51% rename from hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/impl/NdProjectApprovalAmountServiceImpl.java rename to hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/impl/ProjectApprovalAmountServiceImpl.java index 22af02d..abcd2b4 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/impl/NdProjectApprovalAmountServiceImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/impl/ProjectApprovalAmountServiceImpl.java @@ -1,8 +1,8 @@ package com.hz.pm.api.projectlib.service.impl; import com.hz.pm.api.projectlib.entity.ProjectApprovalAmount; -import com.hz.pm.api.projectlib.mapper.NdProjectApprovalAmountMapper; -import com.hz.pm.api.projectlib.service.INdProjectApprovalAmountService; +import com.hz.pm.api.projectlib.mapper.ProjectApprovalAmountMapper; +import com.hz.pm.api.projectlib.service.IProjectApprovalAmountService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; * @since 2024-10-09 */ @Service -public class NdProjectApprovalAmountServiceImpl extends ServiceImpl implements INdProjectApprovalAmountService { +public class ProjectApprovalAmountServiceImpl extends ServiceImpl implements IProjectApprovalAmountService { }