Merge remote-tracking branch 'origin/master'

xiangpei

2024-11-26 4c88b75c1bac1d332f8057cce9d587a120560e9b

Merge remote-tracking branch 'origin/master'

 business/src/main/java/com/ycl/controller/FlowableTypeController.java

New file
@@ -0,0 +1,72 @@
package com.ycl.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.common.base.Result;
import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
import com.ycl.domain.entity.FlowableType;
import com.ycl.domain.form.PlanForm;
import com.ycl.domain.query.PlanQuery;
import com.ycl.domain.vo.PlanVO;
import com.ycl.framework.utils.PageUtil;
import com.ycl.service.FlowableTypeService;
import com.ycl.service.PlanService;
import com.ycl.system.domain.base.AbsQuery;
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;

/**
 * 工作流分类 前端控制器
 */
@Validated
@RequiredArgsConstructor
@Api(value = "工作流分类", tags = "工作流分类管理")
@RestController
@RequestMapping("/flowable_type")
public class FlowableTypeController {

    private final FlowableTypeService flowableTypeService;

    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
//    @PreAuthorize("hasAuthority('flowableType:add')")
    public Result add(@RequestBody @Validated(Add.class) FlowableType form) {
        flowableTypeService.save(form);
        return Result.ok();
    }

    @PutMapping
    @ApiOperation(value = "修改", notes = "修改")
//    @PreAuthorize("hasAuthority('flowableType:edit')")
    public Result update(@RequestBody @Validated(Update.class) FlowableType form) {
        flowableTypeService.updateById(form);
        return Result.ok();
    }

    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
//    @PreAuthorize("hasAuthority('flowableType:del')")
    public Result removeById(@PathVariable("id") String id) {
        flowableTypeService.removeById(id);
        return Result.ok();
    }


    @GetMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
//    @PreAuthorize("hasAuthority('flowableType:page')")
    public Result page(AbsQuery query) {
        IPage<FlowableType> page = PageUtil.getPage(query, FlowableType.class);
        flowableTypeService.page(page);
        return Result.ok().data(page.getRecords()).total(page.getTotal());
    }

}

 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/controller/ProjectPlanRecordController.java

@@ -6,6 +6,7 @@
import com.ycl.common.group.Update;
import com.ycl.domain.form.ProjectPlanRecordForm;
import com.ycl.domain.query.ProjectPlanRecordQuery;
import com.ycl.domain.vo.ProjectPlanRecordAddRequest;
import com.ycl.service.ProjectPlanRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,8 +35,8 @@

    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    @PreAuthorize("hasAuthority('projectPlanRecord:add')")
    public Result add(@RequestBody @Validated(Add.class) ProjectPlanRecordForm form) {
//    @PreAuthorize("hasAuthority('projectPlanRecord:add')")
    public Result add(@RequestBody @Validated(Add.class) ProjectPlanRecordAddRequest form) {
        return projectPlanRecordService.add(form);
    }

@@ -67,9 +68,9 @@
        return projectPlanRecordService.page(query);
    }

    @GetMapping("/{id}")
    @PostMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    @PreAuthorize("hasAuthority('projectPlanRecord:detail')")
//    @PreAuthorize("hasAuthority('projectPlanRecord:detail')")
    public Result detail(@PathVariable("id") Integer id) {
        return projectPlanRecordService.detail(id);
    }

 business/src/main/java/com/ycl/domain/entity/FlowableType.java

New file
@@ -0,0 +1,39 @@
package com.ycl.domain.entity;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;

import java.time.LocalDateTime;

/**
 * 流程分类
 */
@Data
@TableName("t_flowable_type")
public class FlowableType extends AbsEntity {

    private static final long serialVersionUID = 1L;

    @TableField(value = "name")
    private String name;

    @TableField(value = "parent_id")
    private Integer parentId;

    @TableField(value = "level")
    private Integer level;

    @TableField(value = "leaf")
    private Boolean leaf;

    @TableField(value = "create_by")
    private String createBy;

    @TableField(value = "update_by")
    private String updateBy;


}

 business/src/main/java/com/ycl/domain/entity/Plan.java

@@ -38,14 +38,4 @@
    @TableField("year_status")
    /** 年度（0：已上报，1：未上报） */
    private Integer yearStatus;

    @TableField("gmt_create_time")
    /** 创建时间 */
    private LocalDateTime gmtCreateTime;

    @TableField("gmt_update_time")
    /** 修改时间 */
    private LocalDateTime gmtUpdateTime;


}

 business/src/main/java/com/ycl/domain/entity/ProjectPlanExamineRecord.java

@@ -67,13 +67,4 @@
    /** 延期结束时间 */
    private LocalDateTime delayEndTime;

    @TableField("gmt_create_time")
    /** 创建时间 */
    private LocalDateTime gmtCreateTime;

    @TableField("gmt_update_time")
    /** 修改时间 */
    private LocalDateTime gmtUpdateTime;


}

 business/src/main/java/com/ycl/domain/entity/ProjectPlanRecord.java

@@ -1,11 +1,13 @@
package com.ycl.domain.entity;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * 项目计划记录
@@ -39,6 +41,10 @@
    /** 月度/季度/年度  0/1/2 */
    private Integer planTimeFlag;

    @TableField("create_time")
    /** 创建时间 */
    private Date createTime;

    @TableField("report_status")
    /** 上报状态 已上报/未上报  0/1 */
    private Integer reportStatus;
@@ -47,5 +53,12 @@
    /** 投资 */
    private BigDecimal actualInvest;

    @TableField(exist = false)
    private Date gmtCreate;

    @TableField(exist = false)
    private Date gmtUpdate;

    @TableField(exist = false)
    private Integer deleted;
}

 business/src/main/java/com/ycl/domain/vo/PlanVO.java

@@ -42,14 +42,6 @@
    @ApiModelProperty("年度（0：已上报，1：未上报）")
    private Integer yearStatus;

    /** 创建时间 */
    @ApiModelProperty("创建时间")
    private Date gmtCreateTime;

    /** 修改时间 */
    @ApiModelProperty("修改时间")
    private Date gmtUpdateTime;

    public static PlanVO getVoByEntity(@NonNull Plan entity, PlanVO vo) {
        if(vo == null) {
            vo = new PlanVO();

 business/src/main/java/com/ycl/domain/vo/ProjectPlanExamineRecordVO.java

@@ -68,14 +68,6 @@
    @ApiModelProperty("延期结束时间")
    private Date delayEndTime;

    /** 创建时间 */
    @ApiModelProperty("创建时间")
    private Date gmtCreateTime;

    /** 修改时间 */
    @ApiModelProperty("修改时间")
    private Date gmtUpdateTime;

    public static ProjectPlanExamineRecordVO getVoByEntity(@NonNull ProjectPlanExamineRecord entity, ProjectPlanExamineRecordVO vo) {
        if(vo == null) {
            vo = new ProjectPlanExamineRecordVO();

 business/src/main/java/com/ycl/domain/vo/ProjectPlanRecordAddRequest.java

New file
@@ -0,0 +1,16 @@
package com.ycl.domain.vo;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProjectPlanRecordAddRequest {
    // 项目计划记录ID
    private Integer id;
    // 项目计划ID
    private Long projectInfoId;
    private Integer planTimeFlag;
}

 business/src/main/java/com/ycl/domain/vo/ProjectPlanRecordResponseVO.java

New file
@@ -0,0 +1,16 @@
package com.ycl.domain.vo;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProjectPlanRecordResponseVO {
    private List<ProjetPlanRecordItem> monthRecords;
    private List<ProjetPlanRecordItem> seasonRecords;
    private List<ProjetPlanRecordItem> yearRecords;
}

 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/domain/vo/ProjetPlanRecordItem.java

New file
@@ -0,0 +1,29 @@
package com.ycl.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.Date;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProjetPlanRecordItem {
    // 项目计划记录id
    private Integer id;
    // 项目名称
    private String projectName;
    // 项目代码
    private String projectCode;
    // 计划期
    private Integer planTime;
    // 计划期标志
    private Integer planTimeFlag;
    // 创建时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;
    // 上报状态
    private Integer reportStatus;
}

 business/src/main/java/com/ycl/mapper/FlowableTypeMapper.java

New file
@@ -0,0 +1,11 @@
package com.ycl.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.domain.entity.FlowableType;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface FlowableTypeMapper extends BaseMapper<FlowableType> {


}

 business/src/main/java/com/ycl/mapper/ProjectPlanRecordMapper.java

@@ -7,6 +7,8 @@
import com.ycl.domain.vo.ProjectPlanRecordVO;
import com.ycl.domain.form.ProjectPlanRecordForm;
import java.util.List;

import com.ycl.domain.vo.ProjetPlanRecordItem;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -31,4 +33,11 @@
    */
    IPage getPage(IPage page, @Param("query") ProjectPlanRecordQuery query);


    /**
     *  根据项目id和标志查询计划列表
     */
    List<ProjetPlanRecordItem> selectPlanList(@Param("id") Integer id, @Param("flag") Integer flag);

    void insertItem(ProjectPlanRecord item);
}

 business/src/main/java/com/ycl/service/FlowableTypeService.java

New file
@@ -0,0 +1,12 @@
package com.ycl.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.common.base.Result;
import com.ycl.domain.entity.FlowableType;

import java.util.List;

public interface FlowableTypeService extends IService<FlowableType> {


}

 business/src/main/java/com/ycl/service/ProjectPlanRecordService.java

@@ -5,6 +5,8 @@
import com.ycl.domain.entity.ProjectPlanRecord;
import com.ycl.domain.form.ProjectPlanRecordForm;
import com.ycl.domain.query.ProjectPlanRecordQuery;
import com.ycl.domain.vo.ProjectPlanRecordAddRequest;
import com.ycl.domain.vo.ProjetPlanRecordItem;

import java.util.List;

@@ -18,10 +20,10 @@

    /**
     * 添加
     * @param form
     * @param request
     * @return
     */
    Result add(ProjectPlanRecordForm form);
    Result add(ProjectPlanRecordAddRequest request);

    /**
     * 修改

 business/src/main/java/com/ycl/service/impl/FlowableTypeServiceImpl.java

New file
@@ -0,0 +1,23 @@
package com.ycl.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
import com.ycl.domain.entity.FlowableType;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.FlowableTypeMapper;
import com.ycl.service.FlowableTypeService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;

import java.util.List;
import java.util.stream.Collectors;


@Service
@RequiredArgsConstructor
public class FlowableTypeServiceImpl extends ServiceImpl<FlowableTypeMapper, FlowableType> implements FlowableTypeService {

}

 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/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java

@@ -1,9 +1,17 @@
package com.ycl.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.common.base.Result;
import com.ycl.common.utils.DateUtils;
import com.ycl.domain.entity.Plan;
import com.ycl.domain.entity.ProjectPlanRecord;
import com.ycl.domain.vo.ProjectPlanRecordAddRequest;
import com.ycl.domain.vo.ProjectPlanRecordResponseVO;
import com.ycl.domain.vo.ProjetPlanRecordItem;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.PlanMapper;
import com.ycl.mapper.ProjectPlanRecordMapper;
import com.ycl.service.ProjectPlanRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +23,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;

import java.time.LocalDate;
import java.util.List;
import java.util.stream.Collectors;

@@ -28,17 +37,81 @@
@RequiredArgsConstructor
public class ProjectPlanRecordServiceImpl extends ServiceImpl<ProjectPlanRecordMapper, ProjectPlanRecord> implements ProjectPlanRecordService {

    private static final Integer MONTH_FLAG = 0;
    private static final Integer SEASON_FLAG = 1;
    private static final Integer YEAR_FLAG = 2;

    private final ProjectPlanRecordMapper projectPlanRecordMapper;
    private final PlanMapper planMapper;

    /**
     * 添加
     * @param form
     * @param request
     * @return
     */
    @Override
    public Result add(ProjectPlanRecordForm form) {
        ProjectPlanRecord entity = ProjectPlanRecordForm.getEntityByForm(form, null);
        baseMapper.insert(entity);
    public Result add(ProjectPlanRecordAddRequest request) {
        ProjectPlanRecord item = new ProjectPlanRecord();
        // 查询项目计划id
        item.setPlanId(new LambdaQueryChainWrapper<>(planMapper).eq(Plan::getProjectInfoId, request.getProjectInfoId()).one().getId().longValue());
        // 判断标志位是否为0，如果为0，则为月度计划，1为季度计划，2为年度计划
        if (request.getPlanTimeFlag() == MONTH_FLAG) {
            // 判断id是否为0
            if (request.getId() == 0) {
                // 新增月度计划
                item.setProjectInfoId(request.getProjectInfoId());
                item.setPlanTime(LocalDate.now().getMonthValue());
                item.setPlanTimeFlag(MONTH_FLAG);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
            } else {
                // 新增月度计划
                item = baseMapper.selectById(request.getId());
                item.setId(null);
                Integer planTime = item.getPlanTime();
                item.setPlanTime(planTime == 12 ? 1 : planTime + 1);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
                item.setActualInvest(null);
            }
        } else if (request.getPlanTimeFlag() == SEASON_FLAG) {
            // 判断id是否为0
            if (request.getId() == 0) {
                // 新增季度计划
                item.setProjectInfoId(request.getProjectInfoId());
                item.setPlanTime(1);
                item.setPlanTimeFlag(SEASON_FLAG);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
            } else {
                // 新增季度计划
                item = baseMapper.selectById(request.getId());
                item.setId(null);
                item.setPlanTime(item.getPlanTime() + 1);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
                item.setActualInvest(null);
            }
        }else {
            // 判断id是否为0
            if (request.getId() == 0) {
                // 新增年度计划
                item.setProjectInfoId(request.getProjectInfoId());
                item.setPlanTime(LocalDate.now().getYear());
                item.setPlanTimeFlag(YEAR_FLAG);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
            } else {
                // 新增年计划
                item = baseMapper.selectById(request.getId());
                item.setId(null);
                item.setPlanTime(item.getPlanTime() + 1);
                item.setCreateTime(DateUtils.getNowDate());
                item.setReportStatus(1);
                item.setActualInvest(null);
            }
        }
        baseMapper.insertItem(item);
        return Result.ok("添加成功");
    }

@@ -99,8 +172,13 @@
     */
    @Override
    public Result detail(Integer id) {
        ProjectPlanRecordVO vo = baseMapper.getById(id);
        Assert.notNull(vo, "记录不存在");
        ProjectPlanRecordResponseVO vo = new ProjectPlanRecordResponseVO();
        // 获取月度计划
        vo.setMonthRecords(baseMapper.selectPlanList(id, MONTH_FLAG));
        // 获取季度计划
        vo.setSeasonRecords(baseMapper.selectPlanList(id, SEASON_FLAG));
        // 获取年度计划
        vo.setYearRecords(baseMapper.selectPlanList(id, YEAR_FLAG));
        return Result.ok().data(vo);
    }


 business/src/main/resources/mapper/FlowableTypeMapper.xml

New file
@@ -0,0 +1,57 @@
<?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">
<mapper namespace="com.ycl.mapper.FlowableTypeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.domain.entity.FlowableType">
        <result column="id" property="id" />
        <result column="name" property="name" />
        <result column="parent_id" property="parentId" />
        <result column="level" property="level" />
        <result column="leaf" property="leaf" />
        <result column="create_by" property="createBy"/>
        <result column="update_by" property="updateBy"/>
        <result column="gmt_create_time" property="gmtCreateTime" />
        <result column="gmt_update_time" property="gmtUpdateTime" />
    </resultMap>







    <select id="getById" 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
        WHERE
            TP.id = #{id} AND TP.deleted = 0
    </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
        WHERE
            TP.deleted = 0
    </select>

</mapper>

 business/src/main/resources/mapper/PlanMapper.xml

@@ -9,8 +9,23 @@
        <result column="month_status" property="monthStatus" />
        <result column="season_status" property="seasonStatus" />
        <result column="year_status" property="yearStatus" />
        <result column="gmt_create_time" property="gmtCreateTime" />
        <result column="gmt_update_time" property="gmtUpdateTime" />
        <result column="gmt_create" property="gmtCreate" />
        <result column="gmt_update" property="gmtUpdate" />
    </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>

 business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml

@@ -16,8 +16,8 @@
        <result column="event_type" property="eventType" />
        <result column="delay_start_time" property="delayStartTime" />
        <result column="delay_end_time" property="delayEndTime" />
        <result column="gmt_create_time" property="gmtCreateTime" />
        <result column="gmt_update_time" property="gmtUpdateTime" />
        <result column="gmt_create" property="gmtCreate" />
        <result column="gmt_update" property="gmtUpdate" />
    </resultMap>



 business/src/main/resources/mapper/ProjectPlanRecordMapper.xml

@@ -14,10 +14,37 @@
        <result column="actual_invest" property="actualInvest" />
    </resultMap>





    <resultMap id="ProjetPlanRecordItem" type="com.ycl.domain.vo.ProjetPlanRecordItem">
        <id property="id" column="id" />
        <result column="project_name" property="projectName" />
        <result column="project_code" property="projectCode" />
        <result column="plan_time" property="planTime" />
        <result column="plan_time_flag" property="planTimeFlag" />
        <result column="create_time" property="createTime" />
        <result column="report_status" property="reportStatus" />
    </resultMap>
    <insert id="insertItem">
        INSERT INTO t_project_plan_record (
            project_info_id,
            plan_id,
            engineering_info_id,
            plan_time,
            plan_time_flag,
            create_time,
            report_status,
            actual_invest
        )
        VALUES (
            #{projectInfoId},
            #{planId},
            #{engineeringInfoId},
            #{planTime},
            #{planTimeFlag},
            #{createTime},
            #{reportStatus},
            #{actualInvest}
        )
    </insert>


    <select id="getById" resultMap="BaseResultMap">
@@ -55,4 +82,21 @@
            TPPR.deleted = 0
    </select>


    <select id="selectPlanList" resultMap="ProjetPlanRecordItem">
        SELECT
            ppr.id,
            pi.project_name,
            pi.project_code,
            ppr.plan_time,
            ppr.plan_time_flag,
            ppr.create_time,
            ppr.report_status
        FROM t_project_plan_record AS ppr
                 LEFT JOIN t_project_info AS pi ON pi.id = ppr.project_info_id
        WHERE
            ppr.plan_time_flag = #{flag}
          AND pi.id = #{id}
    </select>

</mapper>