fix查询

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

@@ -99,7 +99,13 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 															  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 															  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															  HttpServletRequest req) {
-		QueryWrapper<CmmsSubmission> queryWrapper = QueryGenerator.initQueryWrapper(cmmsSubmission, req.getParameterMap());
+		CmmsSubmission cmmsSubmission1= new CmmsSubmission();
+		cmmsSubmission1.setSubmissionGdstatus(cmmsSubmission.getSubmissionGdstatus());
+		cmmsSubmission1.setVerificateClientId(cmmsSubmission.getVerificateClientId());
+		cmmsSubmission1.setVerificateMethod(cmmsSubmission.getVerificateMethod());
+		cmmsSubmission1.setVerificatePerson(cmmsSubmission.getVerificatePerson());
+		QueryWrapper<CmmsSubmission> queryWrapper = QueryGenerator.initQueryWrapper(cmmsSubmission1, req.getParameterMap());
+		queryWrapper.like("sjcode",cmmsSubmission.getSjcode());
 		Page<CmmsSubmission> page = new Page<CmmsSubmission>(pageNo, pageSize);
 		IPage<CmmsSubmission> pageList = cmmsSubmissionService.page(page, queryWrapper);
 		List<CmmsSubmissionQueryVO> submissionQueryVOList = pageList.getRecords().stream().map(i->{

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

@@ -58,7 +58,20 @@ public class CmmsSubmissionEquipmentController extends JeecgController<CmmsSubmi
 	@ApiOperation(value="根据送检工单id查送检工单设备列表——包括设备名称", notes="根据送检工单id查送检工单设备列表——包括设备名称")
 	@GetMapping(value = "/voListByCmmsSubmissionId")
 	public Result<List<CmmsSubmissionEquipmentXQVO>> voListByCmmsSubmissionId(CmmsSubmissionEquipment cmmsSubmissionEquipment) {
-		List<CmmsSubmissionEquipmentXQVO> list = cmmsSubmissionEquipmentService.voListByCmmsSubmissionId(cmmsSubmissionEquipment);
+		List<CmmsSubmissionEquipmentXQVO> list = cmmsSubmissionEquipmentService.voListByCmmsSubmissionId(cmmsSubmissionEquipment).stream().map(i->{
+			/**检定结果 (0限用、1合格、2禁用)*/
+			if(i.getSubmissionResult()!=null){
+				if(i.getSubmissionResult().equals("0")) i.setSubmissionResultText("限用");
+				else if(i.getSubmissionResult().equals("1")) i.setSubmissionResultText("合格");
+				else if(i.getSubmissionResult().equals("2")) i.setSubmissionResultText("禁用");
+			}
+			/**送检状态 0送检中、1已返回*/
+			if(i.getSubmissionStatus()!=null){
+				if(i.getSubmissionStatus().equals("0")) i.setSubmissionStatusText("送检中");
+				else if(i.getSubmissionStatus().equals("1")) i.setSubmissionStatusText("已返回");
+			}
+			return i;
+		}).collect(Collectors.toList());
 		return Result.OK(list);
 	}