调整

xiangpei

2024-12-12 4b3f6bd762fc742aa29d8e6b75f4fc54ef6d22ad

调整

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

@@ -85,7 +85,7 @@


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


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

@@ -3,7 +3,9 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.validation.annotation.Validated;

import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.List;

@@ -11,7 +13,9 @@
@AllArgsConstructor
@NoArgsConstructor
public class ProjectPlanInfoRequest {
    private Integer projectPlanRecordId;
    private Long projectPlanRecordId;
    private BigDecimal actualInvest;

    @NotEmpty(message = "请输入要添加的计划项")
    private List<ProjectPlanInfoItem> addList;
}

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

@@ -24,6 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Date;
@@ -135,14 +136,13 @@
    @Transactional(rollbackFor = Exception.class)
    @Override
    public Result addPlanInfo(ProjectPlanInfoRequest request) {
        if (request.getAddList() == null || request.getAddList().isEmpty()) {{
        if (CollectionUtils.isEmpty(request.getAddList())) {{
            return Result.error("请选择要添加的计划项");
        }}
        // 删除原有记录
        new LambdaUpdateChainWrapper<>(baseMapper)
                .eq(ProjectPlanInfo::getProjectPlanRecordId, request.getProjectPlanRecordId())
                .set(ProjectPlanInfo::getDeleted, 1)
                .update();
                .remove();
        // 批量插入新记录
        List<ProjectPlanInfo> list = new ArrayList<>();
        request.getAddList().forEach(item -> {
@@ -153,12 +153,9 @@
            projectPlanInfo.setProgressStatus(0); // 计划项进度为未开始
            projectPlanInfo.setStartTime(item.getStartTime()); // 计划项开始时间
            projectPlanInfo.setEndTime(item.getEndTime()); // 计划项结束时间
            projectPlanInfo.setDeleted(0);// 未删除
            list.add(projectPlanInfo);
        });
        list.stream().forEach(i -> {
            baseMapper.insert(i);
        });
        this.saveBatch(list);
        // 更新计划记录的投资,以及上报状态
        new LambdaUpdateChainWrapper<>(projectPlanRecordMapper)
                .eq(ProjectPlanRecord::getId, request.getProjectPlanRecordId())
@@ -168,13 +165,11 @@

        // 新增一条审核记录
        ProjectPlanExamineRecord item = new ProjectPlanExamineRecord();
        item.setProjectPlanRecordId(request.getProjectPlanRecordId().longValue());
        item.setProjectPlanRecordId(request.getProjectPlanRecordId());
        item.setEventType(0); // 计划上报
        item.setGmtCreate(new Date());  // 创建时间
        item.setDeleted(0); // 未删除
        list.stream().forEach(i -> {
            item.setProjectPlanInfoId(i.getId().longValue());
            projectPlanExamineRecordMapper.insertOne(item);
            item.setProjectPlanInfoId(i.getId());
            projectPlanExamineRecordMapper.insert(item);
        });
        return Result.ok("添加成功");
    }

 system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyId.java

@@ -13,7 +13,7 @@

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Integer id;
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

}

 system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyIdAndDeleted.java

@@ -17,8 +17,8 @@

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Integer id;
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @TableField(value = "deleted", fill = FieldFill.INSERT)
    private Integer deleted;