优化

platform-service/src/main/java/com/platform/service/sbUnused/impl/SbUnusedServiceImpl.java

@@ -15,6 +15,7 @@ import com.platform.dao.dto.sbUnuseddetail.SbUnusedDetailDTO;
 import com.platform.dao.dto.upms.SysFileDTO;
 import com.platform.dao.entity.sb.SbChangeRecord;
 import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.entity.sb.SbPosition;
 import com.platform.dao.entity.sbUnusedVerifyRecord.SbUnusedVerifyRecord;
 import com.platform.dao.entity.sbUnuseddetail.SbUnusedDetail;
 import com.platform.dao.entity.upms.SysFile;
@@ -22,6 +23,7 @@ import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.sb.SbChangeRecordMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
+import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.mapper.sbUnusedVerifyRecord.SbUnusedVerifyRecordMapper;
 import com.platform.dao.mapper.sbUnuseddetail.SbUnusedDetailMapper;
 import com.platform.dao.mapper.upms.SysFileMapper;
@@ -34,6 +36,7 @@ import com.platform.dao.entity.sbUnused.SbUnused;
 import com.platform.dao.mapper.sbUnused.SbUnusedMapper;
 import com.platform.dao.vo.query.sbUnusedVerifyRecord.SbUnusedVerifyRecordVO;
 import com.platform.dao.vo.query.sbUnuseddetail.SbUnusedDetailVO;
+import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.sbUnused.SbUnusedService;
 import com.platform.service.upms.SysFileService;
@@ -68,6 +71,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
     private SysFileMapper sysFileMapper;
     private SbInfoMapper sbInfoMapper;
     private SbChangeRecordMapper sbChangeRecordMapper;
+    private SbPositionMapper sbPositionMapper;
 
     @Override
     public void deleteByPrimaryKey(String id) {
@@ -332,6 +336,12 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
                 for (SbUnusedDetailVO vo : detailVOS) {
                     SbInfoDTO sbInfo = new SbInfoDTO();
                     sbInfo.setId(vo.getSbId());
+                    List<SbInfoVO> sbInfoVOS = sbInfoMapper.selectVOList(sbInfo);
+                    SbPosition position = sbPositionMapper.selectByPrimaryKey(vo.getNewPositionId());
+                    if (sbInfoVOS==null||sbInfoVOS.size()==0){
+                        throw new BusinessException("id为"+sbInfoVOS.get(0).getId()+"的设备已不存在，请查验！");
+                    }
+                    SbInfoVO sbInfoVO = sbInfoVOS.get(0);
                     sbInfo.setPositionId(vo.getNewPositionId());
                     sbInfo.setPositionNo(vo.getNewPositionNo());
                     sbInfoDTOS.add(sbInfo);
@@ -345,7 +355,9 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
                     record.setOldPositionId(vo.getOldPositionId());
                     record.setPositionId(vo.getNewPositionId());
                     record.setId(IdGeneratorUtils.getObjectId());
-                    record.setActionType(6);
+                    record.setContent("编号："+ sbInfoVO.getNo()+"的设备的位置由:"+sbInfoVO.getPositionName()+"变为："+position.getName()+",设备位号由："+
+                            sbInfoVO.getPositionNo()+"变为："+vo.getNewPositionNo());
+                    record.setTransformType(6);
                     sbChangeRecords.add(record);
                 }
                 sbInfoMapper.updateUnusedBatch(sbInfoDTOS);