【CHG】调整安全计划详情接口

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

@@ -2,10 +2,9 @@ package com.railway.web.controller.business.safetool;
 
 
 import com.railway.business.safetool.domain.SecScheduled;
-import com.railway.business.safetool.domain.vo.SecScheduledDetailVo;
+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 com.railway.business.safetool.domain.vo.SecScheduledCountVo;
 import com.railway.business.safetool.domain.vo.SecScheduledToolVo;
 import com.railway.business.safetool.service.ISecScheduledService;
 import com.railway.common.core.controller.BaseController;
@@ -66,7 +65,7 @@ public class SecScheduledController extends BaseController {
   @ApiOperation(value = "查询详情")
   @GetMapping(value = {"/", "/{id}"})
   public AjaxResult getInfo(String id) {
-    SecScheduledDetailVo info = secScheduledService.getInfo(id);
+    SecScheduledToolListVo info = secScheduledService.getInfo(id);
     AjaxResult ajax = AjaxResult.success();
     ajax.put("info", info);
     return ajax;

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

@@ -26,4 +26,10 @@ public class SecScheduledToolVo implements Serializable {
   @ApiModelProperty(value = "id")
   protected String id;
 
+  @ApiModelProperty(value = "名称")
+  private String toolName;
+
+  @ApiModelProperty(value = "单位")
+  private String unit;
+
 }

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

@@ -4,8 +4,8 @@ import com.github.pagehelper.Page;
 import com.railway.business.safetool.domain.SecScheduled;
 import com.railway.business.safetool.domain.vo.SecScheduledCountVo;
 import com.railway.business.safetool.domain.vo.SecScheduledDetailCountVo;
-import com.railway.business.safetool.domain.vo.SecScheduledDetailVo;
 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;
@@ -38,7 +38,7 @@ public interface SecScheduledMapper {
     /**
      * 获取单个
      */
-    SecScheduledDetailVo getInfo(@Param("id") String id);
+    SecScheduledToolListVo getInfo(@Param("id") String id);
 
     /**
     * 获取单个

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

@@ -1,10 +1,9 @@
 package com.railway.business.safetool.service;
 
 import com.railway.business.safetool.domain.SecScheduled;
-import com.railway.business.safetool.domain.vo.SecScheduledDetailVo;
+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 com.railway.business.safetool.domain.vo.SecScheduledCountVo;
 import com.railway.business.safetool.domain.vo.SecScheduledToolVo;
 import java.util.List;
 /**
@@ -32,7 +31,7 @@ public interface ISecScheduledService{
     /**
     * 获取单个
     */
-    SecScheduledDetailVo getInfo(String id);
+    SecScheduledToolListVo getInfo(String id);
 
     /**
     * 查询列表

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

@@ -2,11 +2,9 @@ package com.railway.business.safetool.service.impl;
 
 import com.railway.business.safetool.domain.SecScheduled;
 import com.railway.business.safetool.domain.SecScheduledTool;
-import com.railway.business.safetool.domain.vo.SecScheduledDetailCountVo;
-import com.railway.business.safetool.domain.vo.SecScheduledDetailVo;
+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 com.railway.business.safetool.domain.vo.SecScheduledCountVo;
 import com.railway.business.safetool.domain.vo.SecScheduledToolVo;
 import com.railway.business.safetool.mapper.SecScheduledMapper;
 import com.railway.business.safetool.mapper.SecScheduledToolMapper;
@@ -101,14 +99,8 @@ public class SecScheduledServiceImpl implements ISecScheduledService {
    * 获取单个
    */
   @Override
-  public SecScheduledDetailVo getInfo(String id) {
-    List<SecScheduledDetailCountVo> r = secScheduledMapper.getScheduledTools(id);
-    r.forEach(vo ->
-        vo.setC(vo.getBaseSafetyTools().size() + "")
-    );
-    SecScheduledDetailVo detailVo = secScheduledMapper.getInfo(id);
-    detailVo.setToolCount(r);
-    return detailVo;
+  public SecScheduledToolListVo getInfo(String id) {
+    return secScheduledMapper.getInfo(id);
   }
 
   /**

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

@@ -140,22 +140,34 @@
   </select>
 
   <resultMap id="BaseResultMap"
-    type="com.railway.business.safetool.domain.vo.SecScheduledDetailVo">
+    type="com.railway.business.safetool.domain.vo.SecScheduledToolListVo">
     <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="deptName" property="deptName"/>
     <result column="labName" property="labName"/>
+    <collection property="baseSafetyTools"
+      ofType="com.railway.business.safetool.domain.vo.SecScheduledToolVo">
+      <result column="tool_id" property="toolId"/>
+      <result column="tool_code" property="toolCode"/>
+      <result column="scheduled_tool_id" property="id"/>
+      <result column="unit" property="unit"/>
+      <result column="toolName" property="toolName"/>
+    </collection>
   </resultMap>
 
   <select id="getInfo" resultMap="BaseResultMap">
     select s.id, s.dept_id, s.lab_id, s.scheduled_time,
-    d1.dept_name deptName, d2.dept_name labName
+    d1.dept_name deptName, d2.dept_name labName,
+    d3.dict_label toolName ,t.unit,t.tool_id,t.tool_code, r.id as scheduled_tool_id
     FROM sec_scheduled s
+    LEFT JOIN sec_scheduled_tool r ON r.scheduled_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
-    WHERE s.del_flag = '0' and s.state = 0
+    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 s.state = 0 and t.del_flag = '0' and t.state = '1'
     and s.id=#{id}
   </select>