完善

platform-service/src/main/java/com/platform/service/sb/impl/SbMeasureLogServiceImpl.java

@@ -59,7 +59,7 @@ import java.util.List;
 @AllArgsConstructor
 @Service("sbMeasureLogService")
 public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper, SbMeasureLog, SbMeasureLogDTO> implements SbMeasureLogService {
-    private SbInfoMeasureMapper sbInfoMeasureMapper;
+    private SbInfoMapper sbInfoMapper;
     private final SysFileService sysFileService;
     @Override
     public boolean cascadingDeleteByKey(String id) {
@@ -97,7 +97,14 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         SbMeasureLog sbMeasureLog = super.saveModelByDTO(model);
         model.setId(sbMeasureLog.getId());
         // 更新设备下次检定日期
-        SbInfoMeasure sbInfo = sbInfoMeasureMapper.selectByPrimaryKey(model.getSbId());
+        SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(model.getSbId());
+        if(sbInfo.getUseType().equals(SbUseType.BGCL.getValue())){
+            model.setType(1);
+        }else if(sbInfo.getUseType().equals(SbUseType.BGCL.getValue())){
+            model.setType(2);
+        }else{
+            throw new BusinessException("非计量和特种的无需填报检定记录");
+        }
         sbInfo.setCheckDate(model.getLastDate());
         Integer checkPeriod = 12;// 默认12个月
         if(sbInfo.getCheckPeriod() != null){
@@ -111,7 +118,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         sbInfo.setRemark(model.getRemark());// 备注
         sbInfo.setDph(model.getRequirement());// 检定人
         sbInfo.setStatus(model.getSbStatus());// 每次检定后，状态变更也要更新
-        sbInfoMeasureMapper.updateByPrimaryKey(sbInfo);
+        sbInfoMapper.updateByPrimaryKey(sbInfo);
 
         // 保存文件
         sysFileService.saveFile(model.getId(), SysFileTypeEnum.Sb_MEASURE_IMGS.getValue(), model.getCheckImgList());
@@ -119,7 +126,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         // 保存参数
        /* List<CheckStandardParamDTO> paramList = model.getParamList();
         paramList.forEach(item -> {
-            item.setStandardId(checkStandard.getId());
+            item.setStandardId(sbMeasureLog.getId());
         });
         paramService.saveModelListByDTO(paramList);*/
         return sbMeasureLog;
@@ -130,7 +137,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
     public void modModelByDTO(SbMeasureLogDTO model) {
         super.modModelByDTO(model);
         // 更新设备下次检定日期
-        SbInfoMeasure sbInfo = sbInfoMeasureMapper.selectByPrimaryKeyForUpdate(model.getSbId());
+        SbInfo sbInfo = sbInfoMapper.selectByPrimaryKeyForUpdate(model.getSbId());
         sbInfo.setCheckDate(model.getLastDate());
 
         Integer checkPeriod = 12;// 默认12个月
@@ -145,7 +152,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         sbInfo.setRemark(model.getRemark());// 备注
         sbInfo.setDph(model.getRequirement());// 检定人
         sbInfo.setStatus(model.getSbStatus());// 每次检定后，状态变更也要更新
-        sbInfoMeasureMapper.updateByPrimaryKey(sbInfo);
+        sbInfoMapper.updateByPrimaryKey(sbInfo);
 
         // 保存文件
         sysFileService.saveFile(model.getId(), SysFileTypeEnum.Sb_MEASURE_IMGS.getValue(), model.getCheckImgList());
@@ -160,24 +167,24 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
 
     @Override
     public SbMeasureLog getModelById(Object id) {
-        SbMeasureLog checkStandard = super.getModelById(id);
+        SbMeasureLog sbMeasureLog = super.getModelById(id);
   /*      Weekend<CheckStandardParam> weekend = new Weekend<>(CheckStandardParam.class);
         weekend.weekendCriteria().andEqualTo(CheckStandardParam::getStandardId, id);
         List<CheckStandardParam> paramList = paramMapper.selectByExample(weekend);
-        checkStandard.setParamList(paramList);*/
+        sbMeasureLog.setParamList(paramList);*/
 
-        SbInfoMeasure sbInfo = sbInfoMeasureMapper.selectByPrimaryKey(checkStandard.getSbId());
-        checkStandard.setSbNo(sbInfo.getCardNo());
-        checkStandard.setSbModel(sbInfo.getModel());
-        checkStandard.setSbName(sbInfo.getName());
-        checkStandard.setCheckPeriod(sbInfo.getCheckPeriod());
-        checkStandard.setCheckDate(sbInfo.getCheckDate());
-        checkStandard.setNextCheckDate(sbInfo.getNextCheckDate());
-        checkStandard.setFdjxh(sbInfo.getFdjxh());
-        checkStandard.setSbStatus(sbInfo.getStatus());
+        SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(sbMeasureLog.getSbId());
+        sbMeasureLog.setSbNo(sbInfo.getCardNo());
+        sbMeasureLog.setSbModel(sbInfo.getModel());
+        sbMeasureLog.setSbName(sbInfo.getName());
+        sbMeasureLog.setCheckPeriod(sbInfo.getCheckPeriod());
+        sbMeasureLog.setCheckDate(sbInfo.getCheckDate());
+        sbMeasureLog.setNextCheckDate(sbInfo.getNextCheckDate());
+        sbMeasureLog.setFdjxh(sbInfo.getFdjxh());
+        sbMeasureLog.setSbStatus(sbInfo.getStatus());
         Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
-        weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, checkStandard.getId());
-        List<SysFile> sysFiles = sysFileService.getListByTargetAndType(checkStandard.getId(), null);
+        weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, sbMeasureLog.getId());
+        List<SysFile> sysFiles = sysFileService.getListByTargetAndType(sbMeasureLog.getId(), null);
         List<SysFile> checkImgList = ListUtils.newArrayList();
         List<SysFile> checkFileList = ListUtils.newArrayList();
         sysFiles.forEach(item -> {
@@ -188,8 +195,8 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
                 checkFileList.add(item);
             }
         });
-        checkStandard.setCheckImgList(checkImgList);
-        checkStandard.setCheckFileList(checkFileList);
-        return checkStandard;
+        sbMeasureLog.setCheckImgList(checkImgList);
+        sbMeasureLog.setCheckFileList(checkFileList);
+        return sbMeasureLog;
     }
 }