project_management-java.git

			@@ -818,7 +818,7 @@
			entity.setCreateBy(userId);
			entity.setUpdateBy(userId);
			//如果是储备项目(未开工项目)不需要审核
			if ("0".equals(entity.getProjectPhase())) {
			if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
			entity.setUsedStatus(ProjectConstant.PASS);
			}
			// 管理员修改的直接通过
			@@ -863,7 +863,7 @@
			Long userId = SecurityUtils.getUserId();
			entity.setUpdateBy(userId);
			//如果是储备项目(未开工项目)不需要审核
			if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
			if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
			entity.setUsedStatus(ProjectConstant.PASS);
			}
			// 管理员修改的直接通过

			@@ -135,7 +135,7 @@
			<if test="query.projectPhase !=null and query.projectPhase!='' and query.projectPhase!=6 and query.projectPhase!=5">
			and TPI.project_phase = #{query.projectPhase}
			</if>
			<if test="query.projectPhase != 6 and query.projectPhase != 5 ">
			<if test="query.projectPhase != null and query.projectPhase != 5 ">
			and TPI.used_status = 2
			</if>
			<if test="query.fundType !=null and query.fundType!=''">
			@@ -159,7 +159,7 @@
			<if test="query.projectPhase == 3">
			and (TPI.project_status = 'working' or TPI.project_status = 'stop')
			</if>
			<if test="query.projectPhase == 6">
			<if test="query.projectPhase == null">
			<if test="query.role != null and query.role == 1">
			and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
			</if>

	business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	business/src/main/resources/mapper/ProjectInfoMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史