diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java index 4cba65cc..ad32f605 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java @@ -14,6 +14,7 @@ import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Viola import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*; +import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -361,19 +362,19 @@ public class FishingBoatService extends BaseService { if(dto.getFieldIvsgt().equals("F")){ statistics.setFieldIvsgtCnt(statistics.getFieldIvsgtCnt()+1); } - if(dto.getConfiscationFrame()!=null){ + if(!Utils.isEmpty(dto.getConfiscationFrame())){ statistics.setConfiscationFrameCnt(statistics.getConfiscationFrameCnt()+Integer.parseInt(dto.getConfiscationFrame())); } - if(dto.getConfiscationWidth()!=null){ + if(!Utils.isEmpty(dto.getConfiscationWidth())){ statistics.setConfiscationWidthCnt(statistics.getConfiscationWidthCnt()+Integer.parseInt(dto.getConfiscationWidth())); } - if(dto.getConfiscationJo()!=null){ + if(!Utils.isEmpty(dto.getConfiscationJo())){ statistics.setConfiscationJoCnt(statistics.getConfiscationJoCnt()+Integer.parseInt(dto.getConfiscationJo())); } - if(dto.getConfiscationGae()!=null){ + if(!Utils.isEmpty(dto.getConfiscationGae())){ statistics.setConfiscationGaeCnt(statistics.getConfiscationGaeCnt()+Integer.parseInt(dto.getConfiscationGae())); } - if(dto.getConfiscationEtc()!=null){ + if(!Utils.isEmpty(dto.getConfiscationEtc())){ statistics.setConfiscationEtcCnt(statistics.getConfiscationEtcCnt()+Integer.parseInt(dto.getConfiscationEtc())); } }