【CHG】修改数据筛选条件

railway-business/src/main/java/com/railway/business/safetool/domain/vo/ExpToolQuery.java

@@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class ExpToolQuery extends BaseEntity {
 
-  @ApiModelProperty(value = "送检记录id")
+  @ApiModelProperty(value = "送检记录id", required = true)
   private Long id;
 
   @ApiModelProperty(value = "车间id")

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

@@ -455,7 +455,14 @@
 
   <select id="listExperimentTool" resultMap="ExpResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, t1.isok, #{id} as exp_id
+    <include refid="Base_Column_List"/>,
+    t1.isok, #{id} as exp_id, d.dept_name,
+    dt1.dict_label as tool_name,
+    dt2.dict_label as test_cycle_text
+    FROM base_safety_tool t
+    LEFT JOIN sys_dept d on t.dept_id = d.dept_id
+    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')
     FROM base_safety_tool t
     left join sec_experiment_tool t1 on t.tool_id = t1.tool_id
     <where>