business/src/main/java/com/ycl/controller/PlanController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
business/src/main/resources/mapper/PlanMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
business/src/main/java/com/ycl/controller/PlanController.java
@@ -62,7 +62,7 @@ @GetMapping("/page") @ApiOperation(value = "分页", notes = "分页") @PreAuthorize("hasAuthority('plan:page')") // @PreAuthorize("hasAuthority('plan:page')") public Result page(PlanQuery query) { return planService.page(query); } business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
@@ -1,22 +1,21 @@ package com.ycl.controller; import com.ycl.common.group.Update; import com.ycl.common.group.Add; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import lombok.RequiredArgsConstructor; import java.util.List; import org.springframework.validation.annotation.Validated; import javax.validation.constraints.NotEmpty; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.ycl.service.ProjectPlanExamineRecordService; import com.ycl.common.base.Result; import com.ycl.common.group.Add; import com.ycl.common.group.Update; import com.ycl.domain.form.ProjectPlanExamineRecordForm; import com.ycl.domain.query.ProjectPlanExamineRecordQuery; import com.ycl.service.ProjectPlanExamineRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotEmpty; import java.util.List; /** * 项目审核记录表 前端控制器 * business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java
New file @@ -0,0 +1,22 @@ package com.ycl.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor public class ProjectPlanResponseVO { private Integer id; private String projectName; private Integer reportStatus; private String projectCode; private Integer projectType; private Integer projectPhase; private Integer monthStatus; private Integer seasonStatus; private Integer yearStatus; private Integer projectStatus; private Integer investType; } business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.common.base.Result; import com.ycl.domain.entity.Plan; import com.ycl.domain.vo.ProjectPlanResponseVO; import com.ycl.framework.utils.PageUtil; import com.ycl.mapper.PlanMapper; import com.ycl.service.PlanService; @@ -87,7 +88,7 @@ */ @Override public Result page(PlanQuery query) { IPage<PlanVO> page = PageUtil.getPage(query, PlanVO.class); IPage<ProjectPlanResponseVO> page = PageUtil.getPage(query, ProjectPlanResponseVO.class); baseMapper.getPage(page, query); return Result.ok().data(page.getRecords()).total(page.getTotal()); } business/src/main/resources/mapper/PlanMapper.xml
@@ -13,6 +13,21 @@ <result column="gmt_update_time" property="gmtUpdateTime" /> </resultMap> <!-- 分页条件查询项目计划记录映射结果 --> <resultMap id="PageResultMap" type="com.ycl.domain.vo.ProjectPlanResponseVO"> <id property="id" column="id" /> <result property="projectName" column="project_name" /> <result property="reportStatus" column="report_status" /> <result property="projectCode" column="project_code" /> <result property="projectType" column="project_type" /> <result property="projectPhase" column="project_phase" /> <result property="monthStatus" column="month_status" /> <result property="seasonStatus" column="season_status" /> <result property="yearStatus" column="year_status" /> <result property="projectStatus" column="project_status" /> <result property="investType" column="invest_type" /> </resultMap> @@ -36,20 +51,27 @@ </select> <select id="getPage" resultMap="BaseResultMap"> SELECT TP.project_info_id, TP.report_status, TP.month_status, TP.season_status, TP.year_status, TP.gmt_create_time, TP.gmt_update_time, TP.id FROM t_plan TP <select id="getPage" resultMap="PageResultMap"> SELECT DISTINCT pi.id, pi.project_name, p.report_status, pi.project_code, pi.project_type, pi.project_phase, IFNULL((select report_status from t_project_plan_record WHERE plan_time_flag = 0 AND project_info_id = pi.id ORDER BY create_time DESC LIMIT 1),1) as month_status, IFNULL((select report_status from t_project_plan_record WHERE plan_time_flag = 1 AND project_info_id = pi.id ORDER BY create_time DESC LIMIT 1),1) as season_status, IFNULL((select report_status from t_project_plan_record WHERE plan_time_flag = 2 AND project_info_id = pi.id ORDER BY create_time DESC LIMIT 1),1) as year_status, pi.project_status, pi.invest_type FROM t_plan AS p INNER JOIN t_project_info AS pi ON p.project_info_id = pi.id INNER JOIN t_project_plan_record AS ppr ON p.id = ppr.plan_id WHERE TP.deleted = 0 p.deleted = 0 </select> </mapper>