zero 1 year ago
parent
commit
edd5407b79

+ 3 - 2
src/main/java/cn/cslg/pas/service/business/ReportProjectService.java

@@ -354,9 +354,9 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
         }
         reportProject.setProjectId(project.getId());
         //根据是否直接完成设置报告的状态
-        if (reportProjectDTO.getIfFinish() == null) {
+        if (reportProjectDTO.getIfFinish() == null || !reportProjectDTO.getIfFinish()) {
             reportProject.setStatus(2);
-        } else if (reportProjectDTO.getIfFinish() == true) {
+        } else if (reportProjectDTO.getIfFinish()) {
             reportProject.setStatus(3);
         }
         reportProject.insert();
@@ -543,6 +543,7 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
                 FollowUp followUp = new FollowUp();
                 BeanUtils.copyProperties(item, followUp);
                 followUp.setCreateId(userId);
+                followUp.setProjectId(project.getId());
                 followUps.add(followUp);
             });
             followUpService.saveBatch(followUps);