【CHG】增加送检记录工具列表接口

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

@@ -1,6 +1,8 @@
 package com.railway.web.controller.business.safetool;
 
 import com.railway.business.safetool.domain.BaseSafetyTool;
+import com.railway.business.safetool.domain.vo.ExpToolQuery;
+import com.railway.business.safetool.domain.vo.ExpToolVo;
 import com.railway.business.safetool.enums.ToolStateEnum;
 import com.railway.business.safetool.service.IBaseSafetyToolService;
 import com.railway.common.annotation.Log;
@@ -97,10 +99,9 @@ public class BaseSafetyToolController extends BaseController {
 
   @ApiOperation(value = "实验安全工具列表")
   @GetMapping(value = "listExperimentTool")
-  public TableDataInfo listExperimentTool(BaseSafetyTool baseSafetyTool) {
+  public TableDataInfo listExperimentTool(ExpToolQuery toolQuery) {
     startPage();
-    baseSafetyTool.setState(ToolStateEnum.SCRAP.getCode());
-    List<BaseSafetyTool> list = baseSafetyToolService.getList(baseSafetyTool);
+    List<ExpToolVo> list = baseSafetyToolService.listExperimentTool(toolQuery);
     return getDataTable(list);
   }
 

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

@@ -0,0 +1,50 @@
+package com.railway.business.safetool.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 安全工具 - 送检记录工具查询参数
+ *
+ * @author ZhaoMn
+ */
+@Data
+@ApiModel("安全工具 - 送检记录工具查询参数")
+@EqualsAndHashCode(callSuper = true)
+public class ExpToolQuery extends BaseEntity {
+
+  @ApiModelProperty(value = "送检记录id")
+  private Long experimentId;
+
+  @ApiModelProperty(value = "车间id")
+  private Long deptId;
+
+  @ApiModelProperty(value = "车间名称")
+  private String deptName;
+
+  @ApiModelProperty(value = "存放处所")
+  private String storePlace;
+
+  @ApiModelProperty(value = "名称")
+  private String toolName;
+
+  @ApiModelProperty(value = "编号")
+  private String toolCode;
+
+  @ApiModelProperty(value = "上次试验日期开始")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date lastTestDateStart;
+
+  @ApiModelProperty(value = "上次试验日期结束")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date lastTestDateEnd;
+
+  @ApiModelProperty(value = "是否合格(0:不合格， 1：合格)")
+  private String isok;
+
+}

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

@@ -0,0 +1,55 @@
+package com.railway.business.safetool.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 安全工具 - 送检记录工具列表
+ *
+ * @author ZhaoMn
+ */
+@Data
+@ApiModel("安全工具 - 送检记录工具列表")
+@EqualsAndHashCode(callSuper = true)
+public class ExpToolVo extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long toolId;
+
+  @ApiModelProperty(value = "送检计划id")
+  private Long scheduledId;
+
+  @ApiModelProperty(value = "送检记录id")
+  private Long experimentId;
+
+  @ApiModelProperty(value = "车间id")
+  private Long deptId;
+
+  @ApiModelProperty(value = "车间名称")
+  private String deptName;
+
+  @ApiModelProperty(value = "存放处所")
+  private String storePlace;
+
+  @ApiModelProperty(value = "名称")
+  private String toolName;
+
+  @ApiModelProperty(value = "类型(名称字典)")
+  private String toolType;
+
+  @ApiModelProperty(value = "编号")
+  private String toolCode;
+
+  @ApiModelProperty(value = "上次试验日期")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date lastTestDate;
+
+  @ApiModelProperty(value = "是否合格(0:不合格， 1：合格)")
+  private String isok;
+
+}

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

@@ -2,6 +2,8 @@ package com.railway.business.safetool.mapper;
 
 import com.github.pagehelper.Page;
 import com.railway.business.safetool.domain.BaseSafetyTool;
+import com.railway.business.safetool.domain.vo.ExpToolQuery;
+import com.railway.business.safetool.domain.vo.ExpToolVo;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -46,6 +48,11 @@ public interface BaseSafetyToolMapper {
     */
     Page<BaseSafetyTool> getList(BaseSafetyTool baseSafetyTool);
 
+    /**
+     * 查询列表
+     */
+    List<ExpToolVo> listExperimentTool(ExpToolQuery toolQuery);
+
     /**
      * 查询列表
      */

railway-business/src/main/java/com/railway/business/safetool/service/IBaseSafetyToolService.java

@@ -1,6 +1,8 @@
 package com.railway.business.safetool.service;
 
 import com.railway.business.safetool.domain.BaseSafetyTool;
+import com.railway.business.safetool.domain.vo.ExpToolQuery;
+import com.railway.business.safetool.domain.vo.ExpToolVo;
 import com.railway.common.core.domain.AjaxResult;
 import java.util.List;
 /**
@@ -45,6 +47,11 @@ public interface IBaseSafetyToolService{
     */
     List<BaseSafetyTool> getList(BaseSafetyTool baseSafetyTool);
 
+    /**
+     * 查询列表
+     */
+    List<ExpToolVo> listExperimentTool(ExpToolQuery toolQuery);
+
     /**
      * 批量导出二维码
      */

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

@@ -3,6 +3,8 @@ 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.domain.vo.ExpToolQuery;
+import com.railway.business.safetool.domain.vo.ExpToolVo;
 import com.railway.business.safetool.enums.ToolStateEnum;
 import com.railway.business.safetool.enums.ToolTestStateEnum;
 import com.railway.business.safetool.mapper.BaseSafetyToolMapper;
@@ -171,6 +173,14 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     return list;
   }
 
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<ExpToolVo> listExperimentTool(ExpToolQuery toolQuery) {
+    return safetyToolMapper.listExperimentTool(toolQuery);
+  }
+
   /**
    * 批量导出二维码
    */

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

@@ -72,6 +72,7 @@ public class SecExperimentServiceImpl implements ISecExperimentService {
     }
     //设置已送检状态
     if (r > 0) {
+      //TODO 设置工具送检记录ID
       r = scheduledMapper.updateScheduled(secExpAddParmVo.getSecid(), TestStateEnum.ALREADY.getCode());
     }
     return r;
@@ -101,7 +102,9 @@ public class SecExperimentServiceImpl implements ISecExperimentService {
       // 更新工具最后实验时间
       List<BaseSafetyTool> toolList =  toolMapper.listByExperimentId(secExperiment.getId());
       for(BaseSafetyTool tool : toolList){
+        tool.setExperimentId(secExperiment.getId());
         tool.setLastTestDate(secExperiment.getExpDate());
+        //TODO 设置工具计划ID
         toolMapper.update(tool);
         SecScheduledToolVo scheduledToolVo = new SecScheduledToolVo();
         scheduledToolVo.setScheduledId(secExperiment.getId());

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

@@ -424,14 +424,61 @@
     </foreach>
   </select>
 
-  <select id="listByExperimentId"
-          resultType="com.railway.business.safetool.domain.BaseSafetyTool">
+  <select id="listByExperimentId" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM base_safety_tool t
+    left join sec_experiment_tool t1 on t.tool_id = t1.tool_id
+    where t1.exp_id=#{experimentId}
+  </select>
 
+  <select id="listByScheduledId" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM base_safety_tool t
+    left join sec_scheduled_tool t1 on t.tool_id = t1.tool_id
+    where t1.scheduled_id=#{scheduledId}
   </select>
 
-  <select id="listByScheduledId"
-          resultType="com.railway.business.safetool.domain.BaseSafetyTool">
+  <resultMap id="ExpResultMap" type="com.railway.business.safetool.domain.vo.ExpToolVo">
+    <result column="tool_id" property="toolId"/>
+    <result column="dept_id" property="deptId"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="store_place" property="storePlace"/>
+    <result column="tool_name" property="toolName"/>
+    <result column="tool_type" property="toolType"/>
+    <result column="tool_code" property="toolCode"/>
+    <result column="last_test_date" property="lastTestDate"/>
+    <result column="isok" property="isok"/>
+  </resultMap>
 
+  <select id="listExperimentTool" resultMap="ExpResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>, t1.isok
+    FROM base_safety_tool t
+    left join sec_experiment_tool t1 on t.tool_id = t1.tool_id
+    where t1.exp_id=#{expId}
+    <where>
+      t.del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and t.dept_id=#{deptId}
+      </if>
+      <if test="storePlace!=null and storePlace!=''">
+        and t.store_place like concat(#{storePlace}, '%')
+      </if>
+      <if test="toolName!=null and toolName!=''">
+        and t.tool_name like concat(#{toolName}, '%')
+      </if>
+      <if test="toolCode!=null and toolCode!=''">
+        and t.tool_code=#{toolCode}
+      </if>
+      <if test="lastTestDateStart!=null">
+        and t.last_test_date <![CDATA[ >= ]]> #{lastTestDateStart}
+      </if>
+      <if test="lastTestDateEnd!=null">
+        and t.last_test_date <![CDATA[ <= ]]> #{lastTestDateEnd}
+      </if>
+    </where>
   </select>
 
 </mapper>