Jelajahi Sumber

批量检定完善

guarantee-lsq 2 tahun lalu
induk
melakukan
7a3c80b2e2

+ 1 - 1
platform-dao/src/main/resources/mapper/sb/SbChangeRecordMapper.xml

@@ -125,7 +125,7 @@
             resultType="com.platform.dao.entity.sb.SbChangeRecord">
             select * from t_sb_change_record where end_time is null
             <if test="sbNoId != null and sbNoId != ''">
-                and sbNoId = #{sbNoId}
+                and sb_no_id = #{sbNoId}
             </if>
             order by created_time desc limit 1
     </select>

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

@@ -155,8 +155,8 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         }
         sbInfo.setCheckDate(model.getLastDate());
         Integer checkPeriod = 0;// 默认12个月
-        if(sbInfo.getCheckPeriod() != null){
-            checkPeriod = sbInfo.getCheckPeriod();
+        if(model.getCheckPeriod() != null){
+            checkPeriod = model.getCheckPeriod();
         }else{
             throw new BusinessException("检定设备的检定周期未设置,无法计算下次检定日期,请先设置");
         }