【CHG】增加安全工具所属计划或实验记录

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

@@ -9,130 +9,138 @@ import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+
 /**
  * 安全工具-基础数据
+ *
  * @author wuhonghao 2021-12-01
  */
 @Data
 @ApiModel("安全工具-基础数据")
 @EqualsAndHashCode(callSuper = true)
-public class BaseSafetyTool extends BaseEntity{
-
-    @ApiModelProperty(value = "主键", hidden = true)
-    private Long toolId;
-
-    @ApiModelProperty(value = "车间id")
-    private Long deptId;
-
-    @ApiModelProperty(value = "车间名称")
-    @Excel(name = "车间名称")
-    private String deptName;
-
-    @ApiModelProperty(value = "存放处所")
-    @Excel(name = "存放处所")
-    @Length(min = 1, max = 100, message = "【存放处所】长度必须介于 {min} 和 {max} 之间")
-    private String storePlace;
-
-    @ApiModelProperty(value = "名称")
-    @Excel(name = "工具名称")
-    @Length(max = 100, message = "【名称】长度必须介于 {min} 和 {max} 之间")
-    private String toolName;
-
-    @ApiModelProperty(value = "类型(名称字典)")
-    @Length(max = 10, message = "【类型(名称字典)】长度必须介于 {min} 和 {max} 之间")
-    private String toolType;
-
-    @ApiModelProperty(value = "编号")
-    @Excel(name = "工具编码")
-    @Length(min = 1, max = 50, message = "【编号】长度必须介于 {min} 和 {max} 之间")
-    private String toolCode;
-
-    @ApiModelProperty(value = "二维码编码")
-    @Length(min = 1, max = 64, message = "【二维码编码】长度必须介于 {min} 和 {max} 之间")
-    private String toolQcode;
-
-    @ApiModelProperty(value = "二维码URL")
-    @Length(max = 512, message = "【二维码URL】长度必须介于 0 和 {max} 之间")
-    private String qcodeUrl;
-
-    @ApiModelProperty(value = "电压等级")
-    @Excel(name = "电压等级")
-    @Length(max = 10, message = "【电压等级】长度必须介于 {min} 和 {max} 之间")
-    private String elecLevel;
-
-    @ApiModelProperty(value = "单位")
-    @Excel(name = "单位")
-    @Length(max = 10, message = "【单位】长度必须介于 {min} 和 {max} 之间")
-    private String unit;
-
-    @ApiModelProperty(value = "试验周期")
-    private Integer testCycle;
-
-    @ApiModelProperty(value = "试验周期")
-    @Excel(name = "试验周期")
-    private String testCycleText;
-
-    @ApiModelProperty(value = "上次试验日期")
-    @Excel(name = "上次试验日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date lastTestDate;
-
-    @ApiModelProperty(value = "下次试验日期")
-    @Excel(name = "下次试验日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date nextTestDate;
-
-    @ApiModelProperty(value = "试验结果(0:失败1：成功)")
-    @Excel(name = "试验结果")
-    @Length(max = 1, message = "【试验结果(0:失败1：成功)】长度必须介于 {min} 和 {max} 之间")
-    private String testResult;
-
-    @ApiModelProperty(value = "实际试验时间")
-    @Excel(name = "实际试验时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date testDate;
-
-    @ApiModelProperty(value = "试验结果描述")
-    @Length(max = 255, message = "【试验结果描述】长度必须介于 {min} 和 {max} 之间")
-    private String testResultDesc;
-
-    @ApiModelProperty(value = "状态 0：报废 1：正常")
-    @Excel(name = "状态")
-    @Length(min = 1, max = 1, message = "【状态 0：报废 1：正常】长度必须介于 {min} 和 {max} 之间")
-    private String state;
-
-    @ApiModelProperty(value = "报废原因")
-    @Excel(name = "报废原因")
-    @Length(max = 255, message = "【报废原因】长度必须介于 {min} 和 {max} 之间")
-    private String scrapReason;
-
-    @ApiModelProperty(value = "报废时间")
-    @Excel(name = "报废时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date scrapDate;
-
-    @ApiModelProperty(value = "报废操作人")
-    @Excel(name = "报废操作人")
-    @Length(max = 20, message = "【报废操作人】长度必须介于 {min} 和 {max} 之间")
-    private String scrapUser;
-
-    @ApiModelProperty(value = "替换工具id")
-    private Long replaceToolId;
-
-    @ApiModelProperty(value = "生产厂家")
-    @Excel(name = "生产厂家")
-    @Length(max = 100, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
-    private String produceFactory;
-
-    @ApiModelProperty(value = "生产日期")
-    @Excel(name = "生产日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date produceDate;
-
-    @ApiModelProperty(value = "del_flag")
-    private String delFlag;
-
-    public BaseSafetyTool() {
-    }
+public class BaseSafetyTool extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long toolId;
+
+  @ApiModelProperty(value = "送检计划id")
+  private Long scheduledId;
+
+  @ApiModelProperty(value = "送检记录id")
+  private Long expId;
+
+  @ApiModelProperty(value = "车间id")
+  private Long deptId;
+
+  @ApiModelProperty(value = "车间名称")
+  @Excel(name = "车间名称")
+  private String deptName;
+
+  @ApiModelProperty(value = "存放处所")
+  @Excel(name = "存放处所")
+  @Length(min = 1, max = 100, message = "【存放处所】长度必须介于 {min} 和 {max} 之间")
+  private String storePlace;
+
+  @ApiModelProperty(value = "名称")
+  @Excel(name = "工具名称")
+  @Length(max = 100, message = "【名称】长度必须介于 {min} 和 {max} 之间")
+  private String toolName;
+
+  @ApiModelProperty(value = "类型(名称字典)")
+  @Length(max = 10, message = "【类型(名称字典)】长度必须介于 {min} 和 {max} 之间")
+  private String toolType;
+
+  @ApiModelProperty(value = "编号")
+  @Excel(name = "工具编码")
+  @Length(min = 1, max = 50, message = "【编号】长度必须介于 {min} 和 {max} 之间")
+  private String toolCode;
+
+  @ApiModelProperty(value = "二维码编码")
+  @Length(min = 1, max = 64, message = "【二维码编码】长度必须介于 {min} 和 {max} 之间")
+  private String toolQcode;
+
+  @ApiModelProperty(value = "二维码URL")
+  @Length(max = 512, message = "【二维码URL】长度必须介于 0 和 {max} 之间")
+  private String qcodeUrl;
+
+  @ApiModelProperty(value = "电压等级")
+  @Excel(name = "电压等级")
+  @Length(max = 10, message = "【电压等级】长度必须介于 {min} 和 {max} 之间")
+  private String elecLevel;
+
+  @ApiModelProperty(value = "单位")
+  @Excel(name = "单位")
+  @Length(max = 10, message = "【单位】长度必须介于 {min} 和 {max} 之间")
+  private String unit;
+
+  @ApiModelProperty(value = "试验周期")
+  private Integer testCycle;
+
+  @ApiModelProperty(value = "试验周期")
+  @Excel(name = "试验周期")
+  private String testCycleText;
+
+  @ApiModelProperty(value = "上次试验日期")
+  @Excel(name = "上次试验日期")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date lastTestDate;
+
+  @ApiModelProperty(value = "下次试验日期")
+  @Excel(name = "下次试验日期")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date nextTestDate;
+
+  @ApiModelProperty(value = "试验结果(0:失败1：成功)")
+  @Excel(name = "试验结果")
+  @Length(max = 1, message = "【试验结果(0:失败1：成功)】长度必须介于 {min} 和 {max} 之间")
+  private String testResult;
+
+  @ApiModelProperty(value = "实际试验时间")
+  @Excel(name = "实际试验时间")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date testDate;
+
+  @ApiModelProperty(value = "试验结果描述")
+  @Length(max = 255, message = "【试验结果描述】长度必须介于 {min} 和 {max} 之间")
+  private String testResultDesc;
+
+  @ApiModelProperty(value = "状态 0：报废 1：正常")
+  @Excel(name = "状态")
+  @Length(min = 1, max = 1, message = "【状态 0：报废 1：正常】长度必须介于 {min} 和 {max} 之间")
+  private String state;
+
+  @ApiModelProperty(value = "报废原因")
+  @Excel(name = "报废原因")
+  @Length(max = 255, message = "【报废原因】长度必须介于 {min} 和 {max} 之间")
+  private String scrapReason;
+
+  @ApiModelProperty(value = "报废时间")
+  @Excel(name = "报废时间")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date scrapDate;
+
+  @ApiModelProperty(value = "报废操作人")
+  @Excel(name = "报废操作人")
+  @Length(max = 20, message = "【报废操作人】长度必须介于 {min} 和 {max} 之间")
+  private String scrapUser;
+
+  @ApiModelProperty(value = "替换工具id")
+  private Long replaceToolId;
+
+  @ApiModelProperty(value = "生产厂家")
+  @Excel(name = "生产厂家")
+  @Length(max = 100, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
+  private String produceFactory;
+
+  @ApiModelProperty(value = "生产日期")
+  @Excel(name = "生产日期")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date produceDate;
+
+  @ApiModelProperty(value = "del_flag")
+  private String delFlag;
+
+  public BaseSafetyTool() {
+  }
 
 }

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

@@ -49,13 +49,17 @@ public class SecExperiment extends BaseEntity {
   @JsonFormat(pattern = "yyyy-MM-dd")
   private Date expDate;
 
-  @ApiModelProperty(value = "状态，0待实验，1已实验")
-  @Length(min = 1, max = 1, message = "【状态，0待实验，1已实验】长度必须介于 {min} 和 {max} 之间")
-  private String state;
+  @ApiModelProperty(value = "实验人")
+  @Length(min = 1, max = 64, message = "【实验人】长度必须介于 {min} 和 {max} 之间")
+  private String expBy;
 
   @ApiModelProperty(value = "检测报告文件路径")
   private String expReport;
 
+  @ApiModelProperty(value = "状态，0待实验，1已实验")
+  @Length(min = 1, max = 1, message = "【状态，0待实验，1已实验】长度必须介于 {min} 和 {max} 之间")
+  private String state;
+
   @ApiModelProperty(value = "del_flag")
   @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
   private String delFlag;

railway-business/src/main/java/com/railway/business/safetool/mapper/SecExperimentMapper.java

@@ -42,6 +42,13 @@ public interface SecExperimentMapper {
 
     List<SecExpToolsVo> listSafetyTools(@Param("id") String id);
 
+    /**
+     * 根据工具ID列出相关的计划
+     * @param toolId 工具ID
+     * @return 计划列表
+     */
+    List<SecExperiment> listExperiment(@Param("toolId") Long toolId);
+
     /**
     * 查询列表
     */

railway-business/src/main/java/com/railway/business/safetool/mapper/SecScheduledMapper.java

@@ -1,10 +1,12 @@
 package com.railway.business.safetool.mapper;
 
 import com.github.pagehelper.Page;
+import com.railway.business.safetool.domain.SecExperiment;
 import com.railway.business.safetool.domain.SecScheduled;
 import com.railway.business.safetool.domain.vo.SecScheduledCountVo;
 import com.railway.business.safetool.domain.vo.SecScheduledListParmVo;
 import com.railway.business.safetool.domain.vo.SecScheduledToolListVo;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -45,4 +47,11 @@ public interface SecScheduledMapper {
     */
     Page<SecScheduledCountVo> getList(SecScheduledListParmVo secScheduled);
 
+    /**
+     * 根据工具ID列出相关的计划
+     * @param toolId 工具ID
+     * @return 计划列表
+     */
+    List<SecScheduled> listScheduled(@Param("toolId") Long toolId);
+
 }

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

@@ -1,7 +1,11 @@
 package com.railway.business.safetool.service.impl;
 
 import com.railway.business.safetool.domain.BaseSafetyTool;
+import com.railway.business.safetool.domain.SecExperiment;
+import com.railway.business.safetool.domain.SecScheduled;
 import com.railway.business.safetool.mapper.BaseSafetyToolMapper;
+import com.railway.business.safetool.mapper.SecExperimentMapper;
+import com.railway.business.safetool.mapper.SecScheduledMapper;
 import com.railway.business.safetool.service.IBaseSafetyToolService;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.domain.entity.SysUser;
@@ -46,18 +50,24 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
   private String localFilePath;
 
   private final ISysFileService sysFileService;
-  private final BaseSafetyToolMapper baseSafetyToolMapper;
+  private final BaseSafetyToolMapper safetyToolMapper;
+  private final SecExperimentMapper experimentMapper;
+  private final SecScheduledMapper scheduledMapper;
   private final SnowflakeClient snowflakeClient;
   private final ISysDictDataService dictDataService;
   private final ISysFileService fileService;
 
 
   public BaseSafetyToolServiceImpl(ISysFileService sysFileService,
-      BaseSafetyToolMapper baseSafetyToolMapper,
+      BaseSafetyToolMapper safetyToolMapper,
+      SecExperimentMapper experimentMapper,
+      SecScheduledMapper scheduledMapper,
       SnowflakeClient snowflakeClient,
       ISysDictDataService dictDataService, ISysFileService fileService) {
     this.sysFileService = sysFileService;
-    this.baseSafetyToolMapper = baseSafetyToolMapper;
+    this.safetyToolMapper = safetyToolMapper;
+    this.experimentMapper = experimentMapper;
+    this.scheduledMapper = scheduledMapper;
     this.snowflakeClient = snowflakeClient;
     this.dictDataService = dictDataService;
     this.fileService = fileService;
@@ -73,7 +83,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     baseSafetyTool.setCreateBy(SecurityUtils.getUsername());
     baseSafetyTool.setState("1");
     setTool(baseSafetyTool);
-    return baseSafetyToolMapper.insert(baseSafetyTool);
+    return safetyToolMapper.insert(baseSafetyTool);
   }
 
   /**
@@ -84,7 +94,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
   public int delete(Long[] toolIds) {
     int r = 0;
     for (Long toolId : toolIds) {
-      int j = baseSafetyToolMapper.delete(toolId);
+      int j = safetyToolMapper.delete(toolId);
       r = r + j;
     }
     return r;
@@ -98,7 +108,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
   public int update(BaseSafetyTool baseSafetyTool) {
     baseSafetyTool.setUpdateTime(new Date());
     baseSafetyTool.setUpdateBy(SecurityUtils.getUsername());
-    return baseSafetyToolMapper.update(baseSafetyTool);
+    return safetyToolMapper.update(baseSafetyTool);
   }
 
   /**
@@ -106,7 +116,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
    */
   @Override
   public BaseSafetyTool getInfo(Long toolId) {
-    return baseSafetyToolMapper.getInfo(toolId);
+    return safetyToolMapper.getInfo(toolId);
   }
 
   /**
@@ -114,7 +124,19 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
    */
   @Override
   public BaseSafetyTool getInfoByQcode(String qcode) {
-    return baseSafetyToolMapper.getInfoByQcode(qcode);
+    BaseSafetyTool tool = safetyToolMapper.getInfoByQcode(qcode);
+    if(null == tool){
+      return null;
+    }
+    List<SecScheduled> scheduledList = scheduledMapper.listScheduled(tool.getToolId());
+    if(CollectionUtils.isNotEmpty(scheduledList)){
+      tool.setScheduledId(scheduledList.get(0).getId());
+    }
+    List<SecExperiment> experimentList = experimentMapper.listExperiment(tool.getToolId());
+    if(CollectionUtils.isNotEmpty(experimentList)){
+      tool.setExpId(experimentList.get(0).getId());
+    }
+    return tool;
   }
 
   /**
@@ -126,7 +148,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     if (!SysUser.isAdmin(userId)) {
       baseSafetyTool.setDeptId(SecurityUtils.getDeptId());
     }
-    List<BaseSafetyTool> list = baseSafetyToolMapper.getList(baseSafetyTool);
+    List<BaseSafetyTool> list = safetyToolMapper.getList(baseSafetyTool);
     for(BaseSafetyTool tool : list){
       if(StringUtils.isEmpty(tool.getToolQcode()) || StringUtils.isEmpty(tool.getQcodeUrl())) {
         setTool(tool);
@@ -150,7 +172,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
    */
   @Override
   public AjaxResult export(Long[] ids) {
-    List<BaseSafetyTool> list = baseSafetyToolMapper.getListByIds(ids);
+    List<BaseSafetyTool> list = safetyToolMapper.getListByIds(ids);
     return export(list);
   }
 
@@ -223,7 +245,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     baseSafetyTool.setCreateTime(new Date());
     baseSafetyTool.setCreateBy(SecurityUtils.getUsername());
     baseSafetyTool.setState("1");
-    baseSafetyToolMapper.insert(baseSafetyTool);
+    safetyToolMapper.insert(baseSafetyTool);
 
     //将原安全工具状态设置为报废并记录替换ID
     BaseSafetyTool temp = new BaseSafetyTool();
@@ -233,7 +255,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     temp.setScrapUser(SecurityUtils.getUsername());
     temp.setReplaceToolId(baseSafetyTool.getToolId());
 
-    return baseSafetyToolMapper.update(temp);
+    return safetyToolMapper.update(temp);
   }
 
   /**
@@ -241,7 +263,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
    */
   @Override
   public void refresh() {
-    List<BaseSafetyTool> list = baseSafetyToolMapper.getList(new BaseSafetyTool());
+    List<BaseSafetyTool> list = safetyToolMapper.getList(new BaseSafetyTool());
     for(BaseSafetyTool tool : list){
       if(StringUtils.isEmpty(tool.getToolQcode()) || StringUtils.isEmpty(tool.getQcodeUrl())) {
         setTool(tool);

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

@@ -42,15 +42,15 @@
     t.dept_id,
     d.dept_name,
     t.store_place,
-    dict1.dict_label as tool_name,
+    dt1.dict_label as tool_name,
     t.tool_type,
     t.tool_code,
     t.tool_qcode,
     t.qcode_url,
     t.elec_level,
-    dict1.remark unit,
+    dt1.remark unit,
     t.test_cycle,
-    dict2.dict_label as test_cycle_text,
+    dt2.dict_label as test_cycle_text,
     t.last_test_date,
     t.next_test_date,
     t.test_result,
@@ -295,12 +295,9 @@
     <include refid="Base_Column_List"/>
     FROM base_safety_tool t
     LEFT JOIN sys_dept d on t.dept_id = d.dept_id
-    LEFT JOIN sys_dict_data dict1 ON (t.tool_type = dict1.dict_value AND dict1.dict_type =
-    'tool_type')
-    LEFT JOIN sys_dict_data dict2 ON (t.test_cycle = dict2.dict_value AND dict2.dict_type =
-    'test_cycle')
+    LEFT JOIN sys_dict_data dt1 ON (t.tool_type = dt1.dict_value AND dt1.dict_type = 'tool_type')
+    LEFT JOIN sys_dict_data dt2 ON (t.test_cycle = dt2.dict_value AND dt2.dict_type = 'test_cycle')
     WHERE t.del_flag='0' and t.tool_id = #{toolId}
-
   </select>
 
   <select id="getInfoByQcode" resultMap="BaseResultMap">
@@ -308,10 +305,8 @@
     <include refid="Base_Column_List"/>
     FROM base_safety_tool t
     LEFT JOIN sys_dept d on t.dept_id = d.dept_id
-    LEFT JOIN sys_dict_data dict1 ON (t.tool_type = dict1.dict_value AND dict1.dict_type =
-    'tool_type')
-    LEFT JOIN sys_dict_data dict2 ON (t.test_cycle = dict2.dict_value AND dict2.dict_type =
-    'test_cycle')
+    LEFT JOIN sys_dict_data dt1 ON (t.tool_type = dt1.dict_value AND dt1.dict_type = 'tool_type')
+    LEFT JOIN sys_dict_data dt2 ON (t.test_cycle = dt2.dict_value AND dt2.dict_type = 'test_cycle')
     WHERE t.del_flag='0' and t.tool_qcode = #{qcode}
   </select>
 
@@ -320,10 +315,8 @@
     <include refid="Base_Column_List"/>
     FROM base_safety_tool t
     LEFT JOIN sys_dept d on t.dept_id = d.dept_id
-    LEFT JOIN sys_dict_data dict1 ON (t.tool_type = dict1.dict_value AND dict1.dict_type =
-    'tool_type')
-    LEFT JOIN sys_dict_data dict2 ON (t.test_cycle = dict2.dict_value AND dict2.dict_type =
-    'test_cycle')
+    LEFT JOIN sys_dict_data dt1 ON (t.tool_type = dt1.dict_value AND dt1.dict_type = 'tool_type')
+    LEFT JOIN sys_dict_data dt2 ON (t.test_cycle = dt2.dict_value AND dt2.dict_type = 'test_cycle')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">
@@ -414,10 +407,8 @@
     <include refid="Base_Column_List"/>
     FROM base_safety_tool t
     LEFT JOIN sys_dept d on t.dept_id = d.dept_id
-    LEFT JOIN sys_dict_data dict1 ON (t.tool_type = dict1.dict_value AND dict1.dict_type =
-    'tool_type')
-    LEFT JOIN sys_dict_data dict2 ON (t.test_cycle = dict2.dict_value AND dict2.dict_type =
-    'test_cycle')
+    LEFT JOIN sys_dict_data dt1 ON (t.tool_type = dt1.dict_value AND dt1.dict_type = 'tool_type')
+    LEFT JOIN sys_dict_data dt2 ON (t.test_cycle = dt2.dict_value AND dt2.dict_type = 'test_cycle')
     where t.tool_id in
     <foreach collection="array" item="id" open="(" separator="," close=")">
       #{id}

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

@@ -27,7 +27,6 @@
     where scheduled_id = #{secid}
   </insert>
 
-
   <update id="update" parameterType="com.railway.business.safetool.domain.SecExperiment">
     UPDATE sec_experiment
     <set>
@@ -55,33 +54,6 @@
     )
   </update>
 
-  <resultMap id="BaseResultMap" type="com.railway.business.safetool.domain.vo.SecExpDetailVo">
-    <result column="toolName" property="toolName"/>
-    <result column="unit" property="unit"/>
-    <collection property="baseSafetyTools"
-      ofType="com.railway.business.safetool.domain.vo.SecExpToolsVo">
-      <result column="tool_id" property="toolId"/>
-      <result column="tool_code" property="toolCode"/>
-      <result column="id" property="id"/>
-      <result column="isok" property="isok"/>
-    </collection>
-
-  </resultMap>
-
-  <select id="getInfo1" resultMap="BaseResultMap">
-    select d3.dict_label toolName ,t.unit,t.tool_id,t.tool_code,r.id,r.isok
-    FROM sec_experiment s
-    LEFT JOIN sec_experiment_tool r
-    ON r.exp_id = s.id
-    INNER JOIN base_safety_tool t
-    ON t.tool_id = r.tool_id
-    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'
-    and s.id=#{id}
-  </select>
-
   <resultMap id="ToolsResultMap" type="com.railway.business.safetool.domain.vo.SecExpToolsVo">
     <result column="tool_id" property="toolId"/>
     <result column="tool_code" property="toolCode"/>
@@ -139,24 +111,58 @@
     <result column="dept_name" property="deptName"/>
     <result column="lab_name" property="labName"/>
     <result column="real_name" property="realName"/>
-
   </resultMap>
 
   <select id="getList" resultMap="listResultMap">
-
     select e.id,e.state,e.scheduled_time,e.end_time,e.exp_date,e.dept_name,e.lab_name,u.real_name
     from sec_experiment e
     left join sys_user u on e.create_by = u.user_name
     where (e.lab_id =#{deptId} or e.dept_id =#{deptId})
-
     <if test="scheduledTime!=null and scheduledTime!=''">
       and e.scheduled_time =#{scheduledTime}
     </if>
-
     <if test="orderby!=null and orderby!=''">
       order by end_time ${orderby}
     </if>
+  </select>
+
+  <resultMap id="listExperimentResultMap" type="com.railway.business.safetool.domain.SecExperiment">
+    <result column="id" property="id"/>
+    <result column="lab_id" property="labId"/>
+    <result column="lab_name" property="labName"/>
+    <result column="scheduled_id" property="scheduledId"/>
+    <result column="end_time" property="endTime"/>
+    <result column="dept_id" property="deptId"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="scheduled_time" property="scheduledTime"/>
+    <result column="state" property="state"/>
+    <result column="exp_date" property="expDate"/>
+    <result column="exp_by" property="expBy"/>
+    <result column="exp_report" property="expReport"/>
+    <result column="del_flag" property="delFlag"/>
+  </resultMap>
 
+  <sql id="list_Column_List">
+    t.id,
+    t.lab_id,
+    t.lab_name,
+    t.scheduled_id,
+    t.end_time,
+    t.dept_id,
+    t.dept_name,
+    t.scheduled_time,
+    t.state,
+    t.exp_date,
+    t.exp_by,
+    t.del_flag
+  </sql>
+
+  <select id="listExperiment" resultMap="listExperimentResultMap">
+    SELECT
+    <include refid="list_Column_List"/>
+    FROM sec_experiment t
+    left join sec_experiment_tool t1 on t.id = t1.exp_id
+    where t.del_flag='0' and t.state='0' and t1.tool_id=#{toolId}
   </select>
 
 </mapper>

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

@@ -175,4 +175,30 @@
     and s.id=#{id}
   </select>
 
+  <resultMap id="listResultMap" type="com.railway.business.safetool.domain.SecScheduled">
+    <result column="id" property="id"/>
+    <result column="dept_id" property="deptId"/>
+    <result column="lab_id" property="labId"/>
+    <result column="scheduled_time" property="scheduledTime"/>
+    <result column="state" property="state"/>
+    <result column="del_flag" property="delFlag"/>
+  </resultMap>
+
+  <sql id="list_Column_List">
+    t.id,
+    t.dept_id,
+    t.lab_id,
+    t.scheduled_time,
+    t.state,
+    t.del_flag
+  </sql>
+
+  <select id="listScheduled" resultMap="listResultMap">
+    SELECT
+    <include refid="list_Column_List"/>
+    FROM sec_scheduled t
+    left join sec_scheduled_tool t1 on t.id = t1.scheduled_id
+    where t.del_flag='0' and t.state='0' and t1.tool_id=#{toolId}
+  </select>
+
 </mapper>