完善

platform-dao/src/main/resources/mapper/sb/SbMeasureLogMapper.xml

@@ -136,7 +136,7 @@
         select checkstandard.*,
                sb.name sbName, sb.model sbModel, sb.no sbNo, sb.zzh sbZzh, sb.card_no cardNo
         from t_sb_measure_log as checkstandard
-        LEFT JOIN t_sb_info_measure sb on checkstandard.sb_id = sb.id
+        LEFT JOIN t_sb_info sb on checkstandard.sb_id = sb.id
         <where>
             <include refid="List_Condition"/>
         </where>

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

@@ -87,6 +87,11 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
     @Override
     public AbstractPageResultBean<SbMeasureLog> selectPageInfo(SbMeasureLogDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+        if(record.getType() == null || record.getType() == 1){
+
+        }else{
+
+        }
         AbstractPageResultBean<SbMeasureLog> pageInfo = new MyPage(mapper.selectList(record));
         return pageInfo;
     }
@@ -103,7 +108,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         }else if(sbInfo.getUseType().equals(SbUseType.BGCL.getValue())){
             model.setType(2);
         }else{
-            throw new BusinessException("非计量和特种的无需填报检定记录");
+            throw new BusinessException("非计量和非特种的设备, 无需填报检定记录");
         }
         sbInfo.setCheckDate(model.getLastDate());
         Integer checkPeriod = 12;// 默认12个月
@@ -135,10 +140,18 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void modModelByDTO(SbMeasureLogDTO model) {
-        super.modModelByDTO(model);
+
         // 更新设备下次检定日期
         SbInfo sbInfo = sbInfoMapper.selectByPrimaryKeyForUpdate(model.getSbId());
         sbInfo.setCheckDate(model.getLastDate());
+        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("非计量和非特种的设备，无需填报检定记录");
+        }
+        super.modModelByDTO(model);
 
         Integer checkPeriod = 12;// 默认12个月
         if(sbInfo.getCheckPeriod() != null){