试验保存设备使用信息

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/TrialSeleInspectionRecordInfoDTO.java

@@ -31,6 +31,9 @@ public class TrialSeleInspectionRecordInfoDTO extends TrialSeleInspectionRecordB
 	@ApiModelProperty("id")
 	private Long id;
 
+	@ApiModelProperty(value = "所属方类型 1=施工自检 2=监理抽检 3业主")
+	private Integer type;
+
 	@ApiModelProperty(value = "节点ID")
 	private Long nodeId;
 

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

@@ -573,8 +573,14 @@ public class TrialDetectionController extends BladeController {
             if (record != null) {
                 String baseInfo = record.getBaseInfo();
                 if (baseInfo != null) {
-                    TrialSeleInspectionRecordInfoDTO info = JSON.parseObject(baseInfo, TrialSeleInspectionRecordInfoDTO.class);
-                    BeanUtil.copyProperties(info, vo);
+                    try {
+                        TrialSeleInspectionRecordInfoDTO info = JSON.parseObject(baseInfo, TrialSeleInspectionRecordInfoDTO.class);
+                        if (info != null) {
+                            BeanUtil.copyProperties(info, vo);
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
                 // 取样
                 Long entrustId = record.getEntrustId();
@@ -589,8 +595,10 @@ public class TrialDetectionController extends BladeController {
                     List<TrialSelfSample> selfSampleList = jdbcTemplate.query("select * from u_trial_self_sample where self_id = " + id, new BeanPropertyRowMapper<>(TrialSelfSample.class));
                     if (!selfSampleList.isEmpty()) {
                         String samplingIds = selfSampleList.stream().map(TrialSelfSample::getSamplingId).map(String::valueOf).collect(Collectors.joining(","));
-                        List<TrialSampleInfo> trialSampleInfoList = jdbcTemplate.query("select * from u_trial_sample_info where id in (" + samplingIds + ")", new BeanPropertyRowMapper<>(TrialSampleInfo.class));
-                        vo.setTrialSampleInfo(trialSampleInfoList.isEmpty() ? new TrialSampleInfo() : trialSampleInfoList.get(0));
+                        if (samplingIds != null && !"".equals(samplingIds)) {
+                            List<TrialSampleInfo> trialSampleInfoList = jdbcTemplate.query("select * from u_trial_sample_info where id in (" + samplingIds + ")", new BeanPropertyRowMapper<>(TrialSampleInfo.class));
+                            vo.setTrialSampleInfo(trialSampleInfoList.isEmpty() ? new TrialSampleInfo() : trialSampleInfoList.get(0));
+                        }
                     }
                 }
                 if (vo.getProjectPosition() == null) {

blade-service/blade-business/src/main/java/org/springblade/business/mapper/EntrustInfoMapper.xml

@@ -184,7 +184,7 @@
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        and status > 1
+        and status  in (0,1)
         and id not in(SELECT entrust_id from u_trial_self_inspection_record where is_deleted=0 and  LENGTH(entrust_id)>=5)
     </delete>
 

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -42,6 +42,9 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
 import org.springblade.manager.entity.*;
@@ -2162,6 +2165,18 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
             //修改项目节点基础信息
             jdbcTemplate.update("update u_entrust_info set sample_status=4 where id ='"+dto.getEntrustId()+"'");
         }
+        //------关联新增设备使用记录信息------
+        List<TrailDeviceUseInfoDTO> deviceUseInfoDTOS = dto.getTrailDeviceUseInfoDTOS();
+        if (deviceUseInfoDTOS != null && !deviceUseInfoDTOS.isEmpty()) {
+            List<Long> ids = deviceUseInfoDTOS.stream().map(TrailDeviceUseInfoDTO::getDeviceInfoId).collect(Collectors.toList());
+            TrialSelfInspectionRecordDTO recordDTO = new TrialSelfInspectionRecordDTO();
+            recordDTO.setDeviceUseIds(org.apache.commons.lang.StringUtils.join(ids, ","));
+            List<Long> collect = trialSampleInfoList.stream().map(TrialSampleInfo::getId).collect(Collectors.toList());
+            recordDTO.setSampleIds(org.apache.commons.lang.StringUtils.join(collect, ","));
+            recordDTO.setNodeId(dto.getNodeId());
+            recordDTO.setTrialUserName(AuthUtil.getUserName());
+            this.trialDeviceUseService.addDeviceUseInfo(recordDTO, record.getId());
+        }
         return record.getId();
     }