Merge remote-tracking branch 'origin/dev' into dev

railway-admin/src/main/java/com/railway/web/controller/business/safetool/BaseSafetyToolController.java

@@ -113,7 +113,6 @@ public class BaseSafetyToolController extends BaseController {
     BaseSafetyTool validate = new BaseSafetyTool();
     validate.setToolCode(baseSafetyTool.getToolCode());
     validate.setState(ToolStateEnum.NORMAL.getCode());
-    validate.setTestResult(ToolStateEnum.NORMAL.getCode());
     List<BaseSafetyTool> list = baseSafetyToolService.getList(validate);
     if (list.size() == 1 && list.get(0).getToolId().equals(baseSafetyTool.getToolId())) {
       return toAjax(baseSafetyToolService.replaceTool(baseSafetyTool));

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

@@ -68,11 +68,31 @@ public class BaseSafetyTool extends BaseEntity {
   @Length(max = 10, message = "【电压等级】长度必须介于 {min} 和 {max} 之间")
   private String elecLevel;
 
-  @ApiModelProperty(value = "单位")
+  @ApiModelProperty(value = "计量单位")
   @Excel(name = "单位")
   @Length(max = 10, message = "【单位】长度必须介于 {min} 和 {max} 之间")
   private String unit;
 
+  @ApiModelProperty(value = "数量")
+  @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 = "电压等级")
+  @Excel(name = "电压等级")
+  private String voltageLevel;
+
   @ApiModelProperty(value = "试验周期")
   private Integer testCycle;
 

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

@@ -131,7 +131,9 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
   @Override
   public BaseSafetyTool getInfoByQcode(String qcode) {
     BaseSafetyTool tool = safetyToolMapper.getInfoByQcode(qcode);
-    setBaseSafetyTool(tool);
+    if(null != tool){
+      setBaseSafetyTool(tool);
+    }
     return tool;
   }
 

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);
@@ -117,7 +120,10 @@ public class SecExperimentServiceImpl implements ISecExperimentService {
     List<BaseSafetyTool> toolList = toolMapper.listByExperimentId(secExperiment.getId());
     reportVo.setTotal(toolList.size());
     List<Integer> toolCycleList = new ArrayList<>();
+    int seq = 1;
     for (BaseSafetyTool tool : toolList) {
+      tool.setSeq(seq++);
+      tool.setAmount(1);
       toolCycleList.add(tool.getTestCycle());
       ExpReportDetailVo detail = detailMap.get(tool.getToolType());
       if (null == detail) {

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

@@ -35,6 +35,9 @@
     <result column="create_time" property="createTime"/>
     <result column="update_by" property="updateBy"/>
     <result column="update_time" property="updateTime"/>
+    <result column="test_voltage" property="testVoltage"/>
+    <result column="test_duration" property="testDuration"/>
+    <result column="voltage_level" property="voltageLevel"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -435,9 +438,11 @@
 
   <select id="listByExperimentId" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>,
+    t2.tool_name, t2.voltage_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
     where t1.exp_id=#{experimentId}
   </select>
 

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

@@ -70,7 +70,7 @@
     left join sys_dept d1 on s.dept_id = d1.dept_id
     left join sys_dept d2 on s.lab_id = d2.dept_id
     left join sys_dict_data d3 on d3.dict_type = 'tool_type' and d3.dict_value = t.tool_type
-    WHERE s.del_flag = '0' and t.del_flag = '0' and t.state = '1'
+    WHERE s.del_flag = '0' and t.del_flag = '0'
     and s.id=#{id}
   </select>
 
@@ -175,16 +175,24 @@
       <if test="scheduledTime!=null and scheduledTime!=''">
         and e.scheduled_time =#{scheduledTime}
       </if>
+      <if test="state!=null and state!=''">
+        and e.state=#{state}
+      </if>
     </where>
     order by e.end_time
-    <if test="isAsc!=null and isAsc!=''">
-      <if test="isAsc == '1'.toString()">
-        asc
-      </if>
-      <if test="isAsc == '0'.toString()">
+    <choose>
+      <when test="isAsc!=null and isAsc!=''">
+        <if test="isAsc == '1'.toString()">
+          asc
+        </if>
+        <if test="isAsc == '0'.toString()">
+          desc
+        </if>
+      </when>
+      <otherwise>
         desc
-      </if>
-    </if>
+      </otherwise>
+    </choose>
   </select>
 
   <resultMap id="listExperimentResultMap" type="com.railway.business.safetool.domain.SecExperiment">

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

@@ -158,14 +158,19 @@
     </where>
     group by s.id
     order by s.scheduled_time
-    <if test="isAsc!=null and isAsc!=''">
-      <if test="isAsc == '1'.toString()">
-        asc
-      </if>
-      <if test="isAsc == '0'.toString()">
+    <choose>
+      <when test="isAsc!=null and isAsc!=''">
+        <if test="isAsc == '1'.toString()">
+          asc
+        </if>
+        <if test="isAsc == '0'.toString()">
+          desc
+        </if>
+      </when>
+      <otherwise>
         desc
-      </if>
-    </if>
+      </otherwise>
+    </choose>
   </select>
 
   <resultMap id="BaseResultMap"