Parcourir la source

王耀栋--评测等级bug修改

wangyaodong il y a 3 ans
Parent
commit
40b3a874e6

+ 3 - 0
simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -3297,6 +3297,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 simulationMptFirstTargetScorePo.setPId(param.getId()); //直接(子)任务表id
                 simulationMptFirstTargetScorePo.setTarget(v.getSublistId());
                 SimulationMptFirstTargetScorePo simulationMptFirstTargetScorePo1 = simulationMptFirstTargetScoreMapper.selectFirstTargetScore(simulationMptFirstTargetScorePo);
+                if(simulationMptFirstTargetScorePo1 == null){
+                    continue;
+                }
                 Double score = simulationMptFirstTargetScorePo1.getScore();
 
                 totalScore += score*(weightDouble/100);

+ 3 - 0
simulation-resource-server/src/main/resources/mapper/project/SimulationAutomaticProjectMapper.xml

@@ -69,6 +69,7 @@
         operation_cycle,
         parallelism,
         rule_view,
+        max_simulation_time,
         is_choice_gpu,
         automatic_run_times,
         last_run_time,
@@ -94,6 +95,7 @@
         #{operationCycle,jdbcType=VARCHAR},
         #{parallelism,jdbcType=VARCHAR},
         #{ruleView,jdbcType=VARCHAR},
+        #{maxSimulationTime},
         #{isChoiceGpu,jdbcType=VARCHAR},
         #{automaticRunTimes,jdbcType=BIGINT},
         #{lastRunTime,jdbcType=TIMESTAMP},
@@ -119,6 +121,7 @@
         operation_cycle = #{operationCycle,jdbcType=VARCHAR},
         parallelism = #{parallelism,jdbcType=VARCHAR},
         rule_view = #{ruleView,jdbcType=VARCHAR},
+        max_simulation_time = #{maxSimulationTime},
         is_choice_gpu = #{isChoiceGpu,jdbcType=VARCHAR},
         modify_time = #{modifyTime,jdbcType=TIMESTAMP},
         modify_user_id = #{modifyUserId,jdbcType=VARCHAR}