@@ -7,12 +7,10 @@ import cn.hutool.core.util.ObjUtil; | |||||
import cn.hutool.core.util.StrUtil; | import cn.hutool.core.util.StrUtil; | ||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; | import com.baomidou.mybatisplus.core.conditions.Wrapper; | ||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 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.core.toolkit.Wrappers; | ||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | ||||
import com.hz.pm.api.common.exception.ReturnException; | import com.hz.pm.api.common.exception.ReturnException; | ||||
import com.hz.pm.api.common.helper.UserInfoHelper; | 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.common.util.DecimalUtil; | ||||
import com.hz.pm.api.datascope.model.DataScopeDTO; | import com.hz.pm.api.datascope.model.DataScopeDTO; | ||||
import com.hz.pm.api.datascope.utils.DataScopeUtil; | 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.req.SubmitAmountApprovalReq; | ||||
import com.hz.pm.api.projectlib.model.vo.AmountApprovalProgressStatisticsVO; | import com.hz.pm.api.projectlib.model.vo.AmountApprovalProgressStatisticsVO; | ||||
import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO; | 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.projectlib.service.IProjectService; | ||||
import com.hz.pm.api.user.helper.MhUnitCache; | import com.hz.pm.api.user.helper.MhUnitCache; | ||||
import com.hz.pm.api.user.security.model.UserFullInfoDTO; | 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 com.ningdatech.basic.util.CollUtils; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||
import org.assertj.core.error.ElementsShouldBeExactly; | |||||
import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
@@ -58,7 +55,7 @@ import java.util.stream.Collectors; | |||||
@RequiredArgsConstructor | @RequiredArgsConstructor | ||||
public class AmountApprovalManage { | public class AmountApprovalManage { | ||||
private final INdProjectApprovalAmountService projectApprovalAmountService; | |||||
private final IProjectApprovalAmountService projectApprovalAmountService; | |||||
private final IProjectService projectService; | private final IProjectService projectService; | ||||
private final UserInfoHelper userInfoHelper; | private final UserInfoHelper userInfoHelper; | ||||
private final MhUnitCache mhUnitCache; | private final MhUnitCache mhUnitCache; | ||||
@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; | |||||
import cn.hutool.core.bean.copier.CopyOptions; | import cn.hutool.core.bean.copier.CopyOptions; | ||||
import cn.hutool.core.collection.CollUtil; | import cn.hutool.core.collection.CollUtil; | ||||
import cn.hutool.core.lang.Assert; | import cn.hutool.core.lang.Assert; | ||||
import cn.hutool.core.util.ArrayUtil; | |||||
import cn.hutool.core.util.NumberUtil; | import cn.hutool.core.util.NumberUtil; | ||||
import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; | 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.Lists; | ||||
import com.google.common.collect.Maps; | import com.google.common.collect.Maps; | ||||
import com.hz.pm.api.common.compare.CompareUtils; | 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.enumeration.ProjectProcessType; | ||||
import com.hz.pm.api.common.helper.UserInfoHelper; | import com.hz.pm.api.common.helper.UserInfoHelper; | ||||
import com.hz.pm.api.common.model.constant.BizConst; | 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.domain.MeetingInnerProject; | ||||
import com.hz.pm.api.meeting.entity.dto.ProjectReviewResultDTO; | import com.hz.pm.api.meeting.entity.dto.ProjectReviewResultDTO; | ||||
import com.hz.pm.api.meeting.service.IMeetingInnerProjectService; | 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.model.entity.ProjectCoreBusinessIndicators; | ||||
import com.hz.pm.api.performance.service.IProjectCoreBusinessIndicatorsService; | import com.hz.pm.api.performance.service.IProjectCoreBusinessIndicatorsService; | ||||
import com.hz.pm.api.portrait.model.entity.ProjectTag; | import com.hz.pm.api.portrait.model.entity.ProjectTag; | ||||
@@ -150,7 +147,7 @@ public class ProjectLibManage { | |||||
private final IMhProjectService mhProjectService; | private final IMhProjectService mhProjectService; | ||||
private final ProjectReviewManage projectReviewManage; | private final ProjectReviewManage projectReviewManage; | ||||
private final IMeetingInnerProjectService meetingInnerProjectService; | private final IMeetingInnerProjectService meetingInnerProjectService; | ||||
private final INdProjectApprovalAmountService projectApprovalAmountService; | |||||
private final IProjectApprovalAmountService projectApprovalAmountService; | |||||
public PageVo<ProjectLibListItemVO> projectLibList(ProjectListReq req) { | public PageVo<ProjectLibListItemVO> projectLibList(ProjectListReq req) { | ||||
LambdaQueryWrapper<Project> query = ProjectManageUtil.projectQuery(req); | LambdaQueryWrapper<Project> query = ProjectManageUtil.projectQuery(req); | ||||
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; | |||||
* @author WendyYang | * @author WendyYang | ||||
* @since 2024-10-09 | * @since 2024-10-09 | ||||
*/ | */ | ||||
public interface NdProjectApprovalAmountMapper extends BaseMapper<ProjectApprovalAmount> { | |||||
public interface ProjectApprovalAmountMapper extends BaseMapper<ProjectApprovalAmount> { | |||||
} | } |
@@ -1,5 +1,5 @@ | |||||
<?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||||
<mapper namespace="com.hz.pm.api.projectlib.mapper.NdProjectApprovalAmountMapper"> | |||||
<mapper namespace="com.hz.pm.api.projectlib.mapper.ProjectApprovalAmountMapper"> | |||||
</mapper> | </mapper> |
@@ -16,7 +16,7 @@ import java.util.List; | |||||
* @author WendyYang | * @author WendyYang | ||||
* @since 2024-10-09 | * @since 2024-10-09 | ||||
*/ | */ | ||||
public interface INdProjectApprovalAmountService extends IService<ProjectApprovalAmount> { | |||||
public interface IProjectApprovalAmountService extends IService<ProjectApprovalAmount> { | |||||
default ProjectApprovalAmount getByProjectCode(String projectCode) { | default ProjectApprovalAmount getByProjectCode(String projectCode) { | ||||
Wrapper<ProjectApprovalAmount> query = Wrappers.lambdaQuery(ProjectApprovalAmount.class) | Wrapper<ProjectApprovalAmount> query = Wrappers.lambdaQuery(ProjectApprovalAmount.class) |
@@ -1,8 +1,8 @@ | |||||
package com.hz.pm.api.projectlib.service.impl; | package com.hz.pm.api.projectlib.service.impl; | ||||
import com.hz.pm.api.projectlib.entity.ProjectApprovalAmount; | 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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; | |||||
* @since 2024-10-09 | * @since 2024-10-09 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class NdProjectApprovalAmountServiceImpl extends ServiceImpl<NdProjectApprovalAmountMapper, ProjectApprovalAmount> implements INdProjectApprovalAmountService { | |||||
public class ProjectApprovalAmountServiceImpl extends ServiceImpl<ProjectApprovalAmountMapper, ProjectApprovalAmount> implements IProjectApprovalAmountService { | |||||
} | } |