2 years ago
parent
commit
d1503e4f9c

+ 1 - 1
platform-rest/src/main/java/com/platform/rest/controller/sb/SbUpdateLogController.java

@@ -65,7 +65,7 @@ public class SbUpdateLogController {
         SbMeasureLog log = BeanConverterUtil.copyObjectProperties(dto,SbMeasureLog.class);
         sbMeasureLogMapper.insert(log);
         if (dto.getOtherType()!=null&&(dto.getOtherType().equals(SbMeasureLogOtherTypeEnum.IN_STORE.getValue()) ||
-                dto.getOtherType().equals(SbMeasureLogOtherTypeEnum.BAO_FEI.getValue())  )){
+                dto.getOtherType().equals(SbMeasureLogOtherTypeEnum.BAO_FEI.getValue()))){
             SbInfo sbInfo = new SbInfo();
             sbInfo.setPositionNo("暂无");
             sbInfo.setPositionNo(dto.getSbId());

+ 1 - 1
platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -3020,7 +3020,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
 
     @Override
     public List<SbInfoTypeReportVO> getTypeReport2(SbInfoDTO dto, Integer year, LocalDate startMonth, LocalDate endMonth) {
-        if (dto.getTypeId()!=null&&"特种设备".equals(dto.getId())){
+        if (dto.getTypeId()!=null&&"特种设备".equals(dto.getTypeId())){
             SbInfo info = new SbInfo();
             info.setUseType(5);
             int count = mapper.selectCount(info);