送检工单表-通过id查询详情；

送检工单状态submissionGdstatus（0未开始1送检中1已完成）

module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/convert/CmmsOrderNodeConvert.java

@@ -1,11 +1,13 @@
 package org.jeecg.modules.cmmsOrderNode.convert;
 
 import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
+import org.jeecg.modules.cmmsOrderNode.vo.CmmsOrderNodeSubmissionVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.factory.Mappers;
 import org.springframework.util.CollectionUtils;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
@@ -15,4 +17,6 @@ public interface CmmsOrderNodeConvert {
 
     CmmsOrderNode convert(String relid, String nodename);
 
+    List<CmmsOrderNodeSubmissionVO> toVOList(List<CmmsOrderNode> list);
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/controller/CmmsSubmissionController.java

@@ -15,12 +15,14 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.cmmsOrderNode.convert.CmmsOrderNodeConvert;
 import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
 import org.jeecg.modules.cmmsOrderNode.service.ICmmsOrderNodeService;
+import org.jeecg.modules.cmmsOrderNode.vo.CmmsOrderNodeSubmissionVO;
 import org.jeecg.modules.cmmsSubmission.convert.CmmsSubmissionConvert;
 import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionAddDTO;
 import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionUpdateDTO;
 import org.jeecg.modules.cmmsSubmission.entity.CmmsSubmission;
 import org.jeecg.modules.cmmsSubmission.service.ICmmsSubmissionService;
 import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionQueryVO;
+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.sysUploadFile.entity.SysUploadFile;
@@ -218,20 +220,38 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 	}
 
 	/**
-	 * 通过id查询
+	 * 通过id查询详情
 	 *
 	 * @param id
 	 * @return
 	 */
 	//@AutoLog(value = "送检工单表-通过id查询")
-	@ApiOperation(value="送检工单表-通过id查询", notes="送检工单表-通过id查询")
+	@ApiOperation(value="送检工单表-通过id查询详情", notes="送检工单表-通过id查询详情")
 	@GetMapping(value = "/queryById")
-	public Result<CmmsSubmission> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<CmmsSubmissionXQVO> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsSubmissionXQVO xqvo = new CmmsSubmissionXQVO();
+
 		CmmsSubmission cmmsSubmission = cmmsSubmissionService.getById(id);
 		if(cmmsSubmission==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(cmmsSubmission);
+
+		CmmsOrderNode node = new CmmsOrderNode();
+		node.setRelid(id);
+		List<CmmsOrderNode> list = cmmsOrderNodeService.selectCmmsOrderNodeList(node);
+		List<CmmsOrderNodeSubmissionVO> voList = CmmsOrderNodeConvert.INSTANCE.toVOList(list);
+
+		LambdaQueryWrapper<CmmsSubmissionEquipment> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(CmmsSubmissionEquipment::getCmmsSubmissionId,id);
+		List<CmmsSubmissionEquipment> submissionEquipmentList = submissionEquipmentService.list(wrapper);
+
+		SysUploadFile file = new SysUploadFile();
+		file.setRelid(id);
+		List<SysUploadFile> uploadFileList = sysUploadFileService.selectFileList(file);
+
+		xqvo=CmmsSubmissionConvert.INSTANCE.toXQVO(cmmsSubmission, voList, submissionEquipmentList, uploadFileList);
+
+		return Result.OK(xqvo);
 	}
 
     /**

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/convert/CmmsSubmissionConvert.java

@@ -1,14 +1,19 @@
 package org.jeecg.modules.cmmsSubmission.convert;
 
+import org.jeecg.modules.cmmsOrderNode.vo.CmmsOrderNodeSubmissionVO;
 import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionAddDTO;
 import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionUpdateDTO;
 import org.jeecg.modules.cmmsSubmission.entity.CmmsSubmission;
 import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionQueryVO;
+import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQVO;
+import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
+import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.factory.Mappers;
 import org.springframework.util.CollectionUtils;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
@@ -22,4 +27,10 @@ public interface CmmsSubmissionConvert {
 
     CmmsSubmissionQueryVO convertToVO(CmmsSubmission cmmsSubmission, int totalNum, int returnNum, String equipmentids);
 
+    /**详情*/
+    CmmsSubmissionXQVO toXQVO(CmmsSubmission cmmsSubmission,
+                              List<CmmsOrderNodeSubmissionVO> voList,
+                              List<CmmsSubmissionEquipment> submissionEquipmentList,
+                              List<SysUploadFile> uploadFileList);
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/vo/CmmsSubmissionQueryVO.java

@@ -37,6 +37,11 @@ public class CmmsSubmissionQueryVO  implements Serializable {
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+    /**送检工单状态（0未开始1送检中1已完成）*/
+    @Excel(name = "送检工单状态", width = 15, dicCode = "submission_gdstatus")
+    @Dict(dicCode = "submission_gdstatus")
+    @ApiModelProperty(value = "送检工单状态（0未开始1送检中1已完成）")
+    private java.lang.String submissionGdstatus;
     /**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/vo/CmmsSubmissionXQVO.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.cmmsSubmission.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.cmmsOrderNode.vo.CmmsOrderNodeSubmissionVO;
+import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
+import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**送检工单详情*/
+@Data
+public class CmmsSubmissionXQVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**送检负责人*/
+    @Excel(name = "送检负责人", width = 15)
+    @ApiModelProperty(value = "送检负责人")
+    private java.lang.String verificatePerson;
+    /**检定方式*/
+    @Excel(name = "检定方式", width = 15, dicCode = "verificate_method")
+    @Dict(dicCode = "verificate_method")
+    @ApiModelProperty(value = "检定方式")
+    private java.lang.String verificateMethod;
+    /**检定单位id*/
+    @Excel(name = "检定单位id", width = 15, dictTable = "base_client", dicText = "client_name", dicCode = "id")
+    @Dict(dictTable = "base_client", dicText = "client_name", dicCode = "id")
+    @ApiModelProperty(value = "检定单位id")
+    private java.lang.String verificateClientId;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+    /**送检工单状态（0未开始1送检中1已完成）*/
+    @Excel(name = "送检工单状态", width = 15, dicCode = "submission_gdstatus")
+    @Dict(dicCode = "submission_gdstatus")
+    @ApiModelProperty(value = "送检工单状态（0未开始1送检中1已完成）")
+    private java.lang.String submissionGdstatus;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+    List<CmmsSubmissionEquipment> submissionEquipmentList;
+
+    List<CmmsOrderNodeSubmissionVO> orderNodeSubmissionVOList;
+
+    List<SysUploadFile> uploadFileList;
+}