根据送检工单id查送检工单设备列表

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/controller/CmmsSubmissionEquipmentController.java

@@ -14,6 +14,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQVO;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import org.jeecg.modules.cmmsSubmissionEquipment.service.ICmmsSubmissionEquipmentService;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentQueryVO;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
 import org.jeecg.modules.tpmEquipment.entity.TpmEquipment;
@@ -56,10 +57,8 @@ public class CmmsSubmissionEquipmentController extends JeecgController<CmmsSubmi
 	//@AutoLog(value = "送检工单设备表-分页列表查询")
 	@ApiOperation(value="根据送检工单id查设备列表", notes="根据送检工单id查设备列表")
 	@GetMapping(value = "/listByCmmsSubmissionId")
-	public Result<List<CmmsSubmissionEquipment>> listByCmmsSubmissionId(String cmmsSubmissionId) {
-		LambdaQueryWrapper<CmmsSubmissionEquipment> wrapper = new LambdaQueryWrapper();
-		wrapper.eq(CmmsSubmissionEquipment::getCmmsSubmissionId,cmmsSubmissionId);
-		List<CmmsSubmissionEquipment> list = cmmsSubmissionEquipmentService.list(wrapper);
+	public Result<List<CmmsSubmissionEquipmentQueryVO>> listByCmmsSubmissionId(String cmmsSubmissionId) {
+		List<CmmsSubmissionEquipmentQueryVO> list = cmmsSubmissionEquipmentService.listByCmmsSubmissionId(cmmsSubmissionId);
 		return Result.OK(list);
 	}
 

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/mapper/CmmsSubmissionEquipmentMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentQueryVO;
 
 /**
  * @Description: 送检工单设备表
@@ -15,6 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsSubmissionEquipmentMapper extends BaseMapper<CmmsSubmissionEquipment> {
 
+    /**根据送检工单id查询送检工单设备集合*/
+    @Select("select s.id,s.equipmentid,e.equipmentname from cmms_submission_equipment s " +
+            "left join tpm_equipment e on e.id = s.equipmentid ")
+    List<CmmsSubmissionEquipmentQueryVO> listByCmmsSubmissionId(String cmmsSubmissionId);
+
     /**
      * 根据送检工单id查询该工单送检设备总数
      * */

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/service/ICmmsSubmissionEquipmentService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.cmmsSubmissionEquipment.service;
 
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentQueryVO;
 
 import java.util.List;
 
@@ -13,6 +14,9 @@ import java.util.List;
  */
 public interface ICmmsSubmissionEquipmentService extends IService<CmmsSubmissionEquipment> {
 
+    /**根据送检工单id查询送检工单设备集合*/
+    List<CmmsSubmissionEquipmentQueryVO> listByCmmsSubmissionId(String cmmsSubmissionId);
+
     /**
      * 根据设备id查询该所有工单所有检测时间、检测结果、有效时间
      * */

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/service/impl/CmmsSubmissionEquipmentServiceImpl.java

@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import org.jeecg.modules.cmmsSubmissionEquipment.mapper.CmmsSubmissionEquipmentMapper;
 import org.jeecg.modules.cmmsSubmissionEquipment.service.ICmmsSubmissionEquipmentService;
+import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentQueryVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +25,11 @@ public class CmmsSubmissionEquipmentServiceImpl extends ServiceImpl<CmmsSubmissi
     @SuppressWarnings("all")
     private CmmsSubmissionEquipmentMapper submissionEquipmentMapper;
 
+    /**根据送检工单id查询送检工单设备集合*/
+    public List<CmmsSubmissionEquipmentQueryVO> listByCmmsSubmissionId(String cmmsSubmissionId){
+        return submissionEquipmentMapper.listByCmmsSubmissionId(cmmsSubmissionId);
+    }
+
     /**
      * 根据设备id查询该所有工单所有检测时间、检测结果、有效时间
      * */