|
@@ -31,7 +31,6 @@ import com.platform.service.upms.SysFileService;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
import tk.mybatis.mapper.weekend.Weekend;
|
|
|
|
|
|
import java.time.LocalDate;
|
|
@@ -180,7 +179,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
|
|
|
}
|
|
|
|
|
|
// 判断位号是否已经存在,且是否是被设备,如果不是则弹出提示
|
|
|
- if(StringUtils.isNotBlank(model.getSbPositionNo())){
|
|
|
+ /*if(StringUtils.isNotBlank(model.getSbPositionNo())){
|
|
|
List<SbInfo> checkSbInfo = sbInfoMapper.selectByPositionNo(model.getSbPositionNo());
|
|
|
if(!CollectionUtils.isEmpty(checkSbInfo)){
|
|
|
if(checkSbInfo.size()>1){
|
|
@@ -191,7 +190,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- }
|
|
|
+ }*/
|
|
|
sbInfo.setNextCheckDate(model.getLastDate().minusMonths(-checkPeriod).minusDays(1));
|
|
|
sbInfo.setZaiz(model.getName());// 检定单位
|
|
|
sbInfo.setSbdh(model.getNo());// 检定编号
|