commit

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/runnable/SceneEvaluationComputeRunnable.java

@@ -319,8 +319,8 @@ public class SceneEvaluationComputeRunnable implements Runnable {
                     JSONObject evaluationJsonObj = JSONObject.parseObject(projectEntity.getEvaluationJsonMsg());
                     evaluationJsonObj.put("complexityEvaluationStatus", sceneEvaluationStatusPO.getEvaluationStatus());
                     evaluationJsonObj.put("complexityEvaluationErrorMsg", sceneEvaluationStatusPO.getEvaluationErrorMsg());
-                    evaluationJsonObj.put("complexityStartEvaluationTime", sdf.format(sceneEvaluationStatusPO.getStartEvaluationTime()));
-                    evaluationJsonObj.put("complexityEndEvaluationTime", sdf.format(sceneEvaluationStatusPO.getEndEvaluationTime()));
+                    evaluationJsonObj.put("complexityStartEvaluationTime", sceneEvaluationStatusPO.getStartEvaluationTime() == null ? null : sdf.format(sceneEvaluationStatusPO.getStartEvaluationTime()));
+                    evaluationJsonObj.put("complexityEndEvaluationTime", sceneEvaluationStatusPO.getEndEvaluationTime() == null ? null : sdf.format(sceneEvaluationStatusPO.getEndEvaluationTime()));
                     sceneEvaluationStatusMapper.updateManualProjectEvaluationStatus(sceneEvaluationStatusPO.getId(), evaluationJsonObj.toString());
                 }
             }
@@ -331,8 +331,8 @@ public class SceneEvaluationComputeRunnable implements Runnable {
                 JSONObject evaluationJsonObj = JSONObject.parseObject(projectEntity.getEvaluationJsonMsg());
                 evaluationJsonObj.put("riskEvaluationStatus", sceneEvaluationStatusPO.getEvaluationStatus());
                 evaluationJsonObj.put("riskEvaluationErrorMsg", sceneEvaluationStatusPO.getEvaluationErrorMsg());
-                evaluationJsonObj.put("riskStartEvaluationTime", sdf.format(sceneEvaluationStatusPO.getStartEvaluationTime()));
-                evaluationJsonObj.put("riskEndEvaluationTime", sdf.format(sceneEvaluationStatusPO.getEndEvaluationTime()));
+                evaluationJsonObj.put("riskStartEvaluationTime", sceneEvaluationStatusPO.getStartEvaluationTime() == null ? null : sdf.format(sceneEvaluationStatusPO.getStartEvaluationTime()));
+                evaluationJsonObj.put("riskEndEvaluationTime", sceneEvaluationStatusPO.getEndEvaluationTime() == null ? null : sdf.format(sceneEvaluationStatusPO.getEndEvaluationTime()));
                 sceneEvaluationStatusMapper.updateManualProjectEvaluationStatus(sceneEvaluationStatusPO.getId(), evaluationJsonObj.toString());
             }
         }