bug修改

无关风月

1 天以前 f6760448428b0a11aebab4ee281023532e4f61d7

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectMainController.java

@@ -114,7 +114,7 @@
                .eq(ProjectInvestment::getProjectId, id)
                .eq(ProjectInvestment::getInvestmentType, 2)
                .last("limit 1").one();
        projectMain.setProjectInvestment1(projectInvestment2);
        projectMain.setProjectInvestment2(projectInvestment2);
        return R.ok(projectMain);
    }
    @Log(title = "储备项目-删除", businessType = BusinessType.DELETE)
@@ -136,11 +136,13 @@
    @Log(title = "项目阶段-添加事项", businessType = BusinessType.INSERT)
    @PostMapping(value = "/addSettleItem")
    public R<Boolean> addSettleItem(@RequestBody ProjectSettleItem entity) {
        if (StringUtils.hasLength(entity.getFileUrl())){
            entity.setStatus(3);
        }else{
            if (entity.getSettleTime().isBefore(LocalDate.now())) {
                entity.setStatus(2);
        if (entity.getStatus()==null){
            if (StringUtils.hasLength(entity.getFileUrl())){
                entity.setStatus(3);
            }else{
                if (entity.getSettleTime().isBefore(LocalDate.now())) {
                    entity.setStatus(2);
                }
            }
        }
        projectSettleItemService.save(entity);