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/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/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/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/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/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); }
@@ -9,8 +9,8 @@ <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> <!-- 分页条件查询项目计划记录映射结果 --> 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>
@@ -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>
