试验查询设备信息以及设备使用信息

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDetectionController.java

@@ -575,13 +575,17 @@ public class TrialDetectionController extends BladeController {
             if (record != null) {
                 String baseInfo = record.getBaseInfo();
                 if (baseInfo != null) {
-                    try {
-                        TrialSeleInspectionRecordInfoDTO info = JSON.parseObject(baseInfo, TrialSeleInspectionRecordInfoDTO.class);
-                        if (info != null) {
-                            BeanUtil.copyProperties(info, vo);
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                    TrialSeleInspectionRecordInfoDTO info = JSON.parseObject(baseInfo, TrialSeleInspectionRecordInfoDTO.class);
+                    if (info != null) {
+                        vo.setEntrustId(info.getEntrustId());
+                        vo.setEntrustNo(info.getEntrustNo());
+                        vo.setProjectName(info.getProjectName());
+                        vo.setConstructionUnit(info.getConstructionUnit());
+                        vo.setSupervisionUnit(info.getSupervisionUnit());
+                        vo.setLabName(info.getLabName());
+                        vo.setContractName(info.getContractName());
+                        vo.setProjectPosition(info.getProjectPosition());
+                        vo.setTrialSampleInfo(info.getTrialSampleInfo());
                     }
                 }
                 // 取样
@@ -745,7 +749,7 @@ public class TrialDetectionController extends BladeController {
         List<TrailDeviceUseInfoDTO> trailDeviceUseInfoDTOS = new ArrayList<>();
         deviceInfoList.forEach(deviceInfo -> {
             // 查询该设备最近一次的使用信息
-            List<TrailDeviceUseInfoDTO> trialDeviceUseList = jdbcTemplate.query("select * from u_trial_device_use where device_info_id = " + deviceInfo.getId() + "limit 1", new BeanPropertyRowMapper<>(TrailDeviceUseInfoDTO.class));
+            List<TrailDeviceUseInfoDTO> trialDeviceUseList = jdbcTemplate.query("select * from u_trial_device_use where device_info_id = " + deviceInfo.getId() + " limit 1", new BeanPropertyRowMapper<>(TrailDeviceUseInfoDTO.class));
             if (!trialDeviceUseList.isEmpty()) {
                 TrailDeviceUseInfoDTO dto = trialDeviceUseList.get(0);
                 dto.setMeasuringRange(deviceInfo.getMeasuringRange());