去掉挣值分析

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -671,21 +671,21 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             updateProjectBaseCostData(projectBaseCostData, project.getId());
 
                             //创建项目涉及到基线成本数据，要填写到快照表中
-                            EarningSnapshot snapshot = new EarningSnapshot();
-                            snapshot.setProjectId(project.getId());
-                            snapshot.setContractAmount(project.getContractAmount());
-                            snapshot.setCostData(projectBaseCostData);
-                            snapshot.setCreatorId(user.getId());
-                            snapshot.setCreatorName(user.getName());
-                            snapshot.setCostTotal(budget);
-
-                            if (project.getContractAmount() == null || project.getContractAmount() == 0 ) {
-                                //无需处理
-                            } else {
-                                snapshot.setProfit(project.getContractAmount() - budget);
-                                snapshot.setProfitPercent(100.0*(project.getContractAmount() - budget)/project.getContractAmount());
-                                earningSnapshotMapper.insert(snapshot);
-                            }
+//                            EarningSnapshot snapshot = new EarningSnapshot();
+//                            snapshot.setProjectId(project.getId());
+//                            snapshot.setContractAmount(project.getContractAmount());
+//                            snapshot.setCostData(projectBaseCostData);
+//                            snapshot.setCreatorId(user.getId());
+//                            snapshot.setCreatorName(user.getName());
+//                            snapshot.setCostTotal(budget);
+
+//                            if (project.getContractAmount() == null || project.getContractAmount() == 0 ) {
+//                                //无需处理
+//                            } else {
+//                                snapshot.setProfit(project.getContractAmount() - budget);
+//                                snapshot.setProfitPercent(100.0*(project.getContractAmount() - budget)/project.getContractAmount());
+//                                earningSnapshotMapper.insert(snapshot);
+//                            }
                         }
                         if (projectKeyNodesData != null) {
                             updateProjectKeyNodesData(projectKeyNodesData, project.getId());
@@ -1917,25 +1917,27 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
             }
             projectBasecostList.add(cost);
-            totalBudget += cost.getBaseAmount();
+            if (cost.getBaseAmount() != null) {
+                totalBudget += cost.getBaseAmount();
+            }
         }
         projectBasecostMapper.delete(new QueryWrapper<ProjectBasecost>().eq("project_id", project.getId()));
         projectBasecostService.saveBatch(projectBasecostList);
         project.setBudget(totalBudget);
         projectMapper.updateById(project);
         //增加基线快照
-        User user = userMapper.selectById(request.getHeader("Token"));
-        EarningSnapshot record = new EarningSnapshot();
-        record.setProjectId(project.getId());
-        record.setCreatorId(user.getId());
-        record.setRemark(remark);
-        record.setCreatorName(user.getName());
-        record.setContractAmount(project.getContractAmount());
-        record.setCostData(baseCostData);
-        record.setCostTotal(project.getBudget());
-        record.setProfit(project.getContractAmount() - totalBudget);
-        record.setProfitPercent(100.0*(project.getContractAmount() - totalBudget)/project.getContractAmount());
-        earningSnapshotMapper.insert(record);
+//        User user = userMapper.selectById(request.getHeader("Token"));
+//        EarningSnapshot record = new EarningSnapshot();
+//        record.setProjectId(project.getId());
+//        record.setCreatorId(user.getId());
+//        record.setRemark(remark);
+//        record.setCreatorName(user.getName());
+//        record.setContractAmount(project.getContractAmount());
+//        record.setCostData(baseCostData);
+//        record.setCostTotal(project.getBudget());
+//        record.setProfit(project.getContractAmount() - totalBudget);
+//        record.setProfitPercent(100.0*(project.getContractAmount() - totalBudget)/project.getContractAmount());
+//        earningSnapshotMapper.insert(record);
         return new HttpRespMsg();
     }