完成计划项编辑上报

luohairen

2024-11-26 f791f8b1781e8209422c9d604695720e415826db

完成计划项编辑上报

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

@@ -4,8 +4,10 @@
import com.ycl.common.base.Result;
import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
import com.ycl.domain.entity.ProjectPlanInfo;
import com.ycl.domain.form.ProjectPlanInfoForm;
import com.ycl.domain.query.ProjectPlanInfoQuery;
import com.ycl.domain.vo.ProjectPlanInfoRequest;
import com.ycl.service.ProjectPlanInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,7 +36,7 @@

    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    @PreAuthorize("hasAuthority('projectPlanInfo:add')")
//    @PreAuthorize("hasAuthority('projectPlanInfo:add')")
    public Result add(@RequestBody @Validated(Add.class) ProjectPlanInfoForm form) {
        return projectPlanInfoService.add(form);
    }
@@ -69,7 +71,7 @@

    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    @PreAuthorize("hasAuthority('projectPlanInfo:detail')")
//    @PreAuthorize("hasAuthority('projectPlanInfo:detail')")
    public Result detail(@PathVariable("id") Integer id) {
        return projectPlanInfoService.detail(id);
    }
@@ -80,4 +82,15 @@
    public Result list() {
        return projectPlanInfoService.all();
    }


    @PostMapping("/addPlanInfo")
    public Result addPlanInfo(@RequestBody ProjectPlanInfoRequest request) {
        return projectPlanInfoService.addPlanInfo(request);
    }

    @PostMapping("/savePlanInfo")
    public Result savePlanInfo(@RequestBody ProjectPlanInfo item) {
        return projectPlanInfoService.savePlanInfo(item);
    }
}

 business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.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.time.LocalDateTime;
import java.util.Date;

/**
 * 项目计划项
@@ -33,11 +35,20 @@

    @TableField("start_time")
    /** 计划开始时间 */
    private LocalDateTime startTime;
    private Date startTime;

    @TableField("end_time")
    /** 计划完成时间 */
    private LocalDateTime endTime;
    private Date endTime;

    /** 创建时间 */
    @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/ProjectPlanInfoItem.java

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

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

import java.util.Date;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProjectPlanInfoItem {
    private String title;
    private Date startTime;
    private Date endTime;
}

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

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

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

import java.math.BigDecimal;
import java.util.List;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProjectPlanInfoRequest {
    private Integer projectPlanRecordId;
    private BigDecimal actualInvest;
    private List<ProjectPlanInfoItem> addList;
}

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

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

import com.ycl.domain.entity.ProjectPlanInfo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.math.BigDecimal;
import java.util.List;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProjectPlanInfoResponseVO {
    private List<ProjectPlanInfo> list;
    private BigDecimal actualInvest;
}

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

@@ -31,4 +31,7 @@
    */
    IPage getPage(IPage page, @Param("query") ProjectPlanInfoQuery query);

    void batchInsert(@Param("list") List<ProjectPlanInfo> list);

    void insertOne(ProjectPlanInfo item);
}

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

@@ -5,6 +5,7 @@
import com.ycl.domain.entity.ProjectPlanInfo;
import com.ycl.domain.form.ProjectPlanInfoForm;
import com.ycl.domain.query.ProjectPlanInfoQuery;
import com.ycl.domain.vo.ProjectPlanInfoRequest;

import java.util.List;

@@ -59,8 +60,20 @@
    Result detail(Integer id);

    /**
     * 列表
     * 新增计划项
     * @return
     */
    Result all();

    /**
     * 新增计划项
     * @return
     */
    Result addPlanInfo(ProjectPlanInfoRequest request);

    /**
     * 保存计划项
     * @return
     */
    Result savePlanInfo(ProjectPlanInfo item);
}

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

@@ -1,20 +1,27 @@
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
import com.ycl.domain.entity.ProjectPlanInfo;
import com.ycl.domain.entity.ProjectPlanRecord;
import com.ycl.domain.form.ProjectPlanInfoForm;
import com.ycl.domain.query.ProjectPlanInfoQuery;
import com.ycl.domain.vo.ProjectPlanInfoRequest;
import com.ycl.domain.vo.ProjectPlanInfoResponseVO;
import com.ycl.domain.vo.ProjectPlanInfoVO;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.ProjectPlanInfoMapper;
import com.ycl.mapper.ProjectPlanRecordMapper;
import com.ycl.service.ProjectPlanInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;

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

@@ -29,6 +36,7 @@
public class ProjectPlanInfoServiceImpl extends ServiceImpl<ProjectPlanInfoMapper, ProjectPlanInfo> implements ProjectPlanInfoService {

    private final ProjectPlanInfoMapper projectPlanInfoMapper;
    private final ProjectPlanRecordMapper projectPlanRecordMapper;

    /**
     * 添加
@@ -99,8 +107,9 @@
     */
    @Override
    public Result detail(Integer id) {
        ProjectPlanInfoVO vo = baseMapper.getById(id);
        Assert.notNull(vo, "记录不存在");
        ProjectPlanInfoResponseVO vo = new ProjectPlanInfoResponseVO();
        vo.setList(new LambdaQueryChainWrapper<>(baseMapper).eq(ProjectPlanInfo::getProjectPlanRecordId, id).list());
        vo.setActualInvest(new LambdaQueryChainWrapper<>(projectPlanRecordMapper).eq(ProjectPlanRecord::getId, id).one().getActualInvest());
        return Result.ok().data(vo);
    }

@@ -116,4 +125,48 @@
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    @Override
    public Result addPlanInfo(ProjectPlanInfoRequest request) {
        if (request.getAddList() == null || request.getAddList().isEmpty()) {{
            return Result.error("请选择要添加的计划项");
        }}
        // 删除原有记录
        new LambdaUpdateChainWrapper<>(baseMapper).eq(ProjectPlanInfo::getProjectPlanRecordId, request.getProjectPlanRecordId()).remove();
        // 批量插入新记录
        List<ProjectPlanInfo> list = new ArrayList<>();
        request.getAddList().forEach(item -> {
            ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
            projectPlanInfo.setProjectPlanRecordId(request.getProjectPlanRecordId().longValue());
            projectPlanInfo.setTitle(item.getTitle());
            projectPlanInfo.setProgressStatus(0);
            projectPlanInfo.setStartTime(item.getStartTime());
            projectPlanInfo.setEndTime(item.getEndTime());
            list.add(projectPlanInfo);
        });
        baseMapper.batchInsert(list);
        // 更新计划记录的投资,以及上报状态
        new LambdaUpdateChainWrapper<>(projectPlanRecordMapper)
                .eq(ProjectPlanRecord::getId, request.getProjectPlanRecordId())
                .set(ProjectPlanRecord::getActualInvest, request.getActualInvest())
                .set(ProjectPlanRecord::getReportStatus, 0)
                .update();
        return Result.ok("添加成功");
    }

    @Override
    public Result savePlanInfo(ProjectPlanInfo item) {
        item.setProgressStatus(0);
        // 判断id是否存在，存在则更新，不存在则新增
        if (item.getId() == null) {
            baseMapper.insertOne(item);
        } else {
            new LambdaUpdateChainWrapper<>(baseMapper).eq(ProjectPlanInfo::getId, item.getId())
                    .set(ProjectPlanInfo::getTitle, item.getTitle())
                    .set(ProjectPlanInfo::getStartTime, item.getStartTime())
                    .set(ProjectPlanInfo::getEndTime, item.getEndTime())
                    .update();
        }
        return Result.ok("保存成功");
    }
}

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

@@ -10,11 +10,18 @@
        <result column="start_time" property="startTime" />
        <result column="end_time" property="endTime" />
    </resultMap>





    <insert id="batchInsert">
        insert into t_project_plan_info(project_plan_record_id, title, progress_status, start_time, end_time)
        values
        <foreach collection="list" item="item" separator=",">
            (#{item.projectPlanRecordId}, #{item.title}, #{item.progressStatus}, #{item.startTime}, #{item.endTime})
        </foreach>
    </insert>
    <insert id="insertOne">
        insert into t_project_plan_info(project_plan_record_id, title, progress_status, start_time, end_time)
        values
        (#{projectPlanRecordId}, #{title}, #{progressStatus}, #{startTime}, #{endTime})
    </insert>


    <select id="getById" resultMap="BaseResultMap">