【CHG】修改实验报告

railway-business/src/main/java/com/railway/business/safetool/domain/BaseSafetyTool.java

@@ -32,10 +32,6 @@ public class BaseSafetyTool extends BaseEntity {
   @ApiModelProperty(value = "车间id")
   private Long deptId;
 
-  @ApiModelProperty(value = "导出Excel序号")
-  @Excel(name = "序号")
-  private Integer seq;
-
   @ApiModelProperty(value = "车间名称")
   @Excel(name = "车间名称")
   private String deptName;
@@ -81,6 +77,18 @@ public class BaseSafetyTool extends BaseEntity {
   @Excel(name = "数量")
   private Integer amount;
 
+  @ApiModelProperty(value = "导出Excel序号")
+  @Excel(name = "序号")
+  private Integer seq;
+
+  @ApiModelProperty(value = "实验电压")
+  @Excel(name = "实验电压")
+  private String testVoltage;
+
+  @ApiModelProperty(value = "实验时长（分钟）")
+  @Excel(name = "实验时长（分钟）")
+  private Integer testDuration;
+
   @ApiModelProperty(value = "试验周期")
   private Integer testCycle;
 

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecExperimentServiceImpl.java

@@ -106,6 +106,9 @@ public class SecExperimentServiceImpl implements ISecExperimentService {
   @Override
   public int setExperimentState(SecExpEndParmVo param) {
     SecExperiment secExperiment = secExperimentMapper.getInfo(param.getId());
+    if(null == secExperiment){
+      return 0;
+    }
     secExperiment.setState(TestStateEnum.ALREADY.getCode());
     Date expDate = new Date();
     secExperiment.setExpDate(expDate);

railway-business/src/main/resources/mapper/safetool/BaseSafetyToolMapper.xml

@@ -435,7 +435,8 @@
 
   <select id="listByExperimentId" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, t2.voltage_level as elec_level
+    <include refid="Base_Column_List"/>,
+    t2.voltage_level as elec_level, t2.test_voltage, t2.test_duration
     FROM base_safety_tool t
     left join sec_experiment_tool t1 on t.tool_id = t1.tool_id
     left join base_tool_standard t2 on t.tool_type = t2.tool_type