|
@@ -15,12 +15,14 @@ import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.modules.cmmsOrderNode.convert.CmmsOrderNodeConvert;
|
|
import org.jeecg.modules.cmmsOrderNode.convert.CmmsOrderNodeConvert;
|
|
import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
|
|
import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
|
|
import org.jeecg.modules.cmmsOrderNode.service.ICmmsOrderNodeService;
|
|
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.convert.CmmsSubmissionConvert;
|
|
import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionAddDTO;
|
|
import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionAddDTO;
|
|
import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionUpdateDTO;
|
|
import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionUpdateDTO;
|
|
import org.jeecg.modules.cmmsSubmission.entity.CmmsSubmission;
|
|
import org.jeecg.modules.cmmsSubmission.entity.CmmsSubmission;
|
|
import org.jeecg.modules.cmmsSubmission.service.ICmmsSubmissionService;
|
|
import org.jeecg.modules.cmmsSubmission.service.ICmmsSubmissionService;
|
|
import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionQueryVO;
|
|
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.entity.CmmsSubmissionEquipment;
|
|
import org.jeecg.modules.cmmsSubmissionEquipment.service.ICmmsSubmissionEquipmentService;
|
|
import org.jeecg.modules.cmmsSubmissionEquipment.service.ICmmsSubmissionEquipmentService;
|
|
import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
|
|
import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
|
|
@@ -218,20 +220,38 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 通过id查询
|
|
|
|
|
|
+ * 通过id查询详情
|
|
*
|
|
*
|
|
* @param id
|
|
* @param id
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
//@AutoLog(value = "送检工单表-通过id查询")
|
|
//@AutoLog(value = "送检工单表-通过id查询")
|
|
- @ApiOperation(value="送检工单表-通过id查询", notes="送检工单表-通过id查询")
|
|
|
|
|
|
+ @ApiOperation(value="送检工单表-通过id查询详情", notes="送检工单表-通过id查询详情")
|
|
@GetMapping(value = "/queryById")
|
|
@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);
|
|
CmmsSubmission cmmsSubmission = cmmsSubmissionService.getById(id);
|
|
if(cmmsSubmission==null) {
|
|
if(cmmsSubmission==null) {
|
|
return Result.error("未找到对应数据");
|
|
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);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|