行政许可判空处理

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/BsSupervisionAllServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * @author yq
@@ -26,7 +27,7 @@ public class BsSupervisionAllServiceImpl implements BsSupervisionAllService {
     @Override
     public BsSupervisionAllPO getByRecentlyOne(String typeOneLetter, String typeTwoLetter) {
         Map<String, String> stringStringMap = bsSupervisionAllMapper.selectByRecentlyOne(typeOneLetter, typeTwoLetter);
-        return enhanceBsSupervisionAll(stringStringMap);
+        return Optional.ofNullable(stringStringMap).map(s -> enhanceBsSupervisionAll(stringStringMap)).orElse(null);
     }
 
 

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireWaterServiceImpl.java

@@ -42,7 +42,7 @@ public class FireWaterServiceImpl implements FireWaterService {
         fireWaterStatisticsVO.setMunicipalFireCode(
                 fireWaterMapper.selectCountByWaterNature("消火栓","市政",null,startTime,endTime,null));
         fireWaterStatisticsVO.setCommunityFireCode(
-                fireWaterMapper.selectCountByWaterNature("消火栓","社区",null,startTime,endTime,null));
+                fireWaterMapper.selectCountByWaterNature("消火栓","居民",null,startTime,endTime,null));
         fireWaterStatisticsVO.setUnitFireCode(
                 fireWaterMapper.selectCountByWaterNature("消火栓","单位",null,startTime,endTime,null));
         fireWaterStatisticsVO.setNaturalWater(

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/UnitServiceImpl.java

@@ -64,13 +64,13 @@ public class UnitServiceImpl implements UnitService {
         unitAlCheckVo.setHistoryFire(fireCount);
         //审核时间
         BsSupervisionAllPO byRecentlyOne = bsSupervisionAllService.getByRecentlyOne(BsSaOneCode.A_P.getLetter(), BsSaTwoCode.J_G_S_G_AUDIT.getLetter());
-        unitAlCheckVo.setAuditTime(byRecentlyOne.getProductCreatTime());
+        unitAlCheckVo.setAuditTime(Optional.ofNullable(byRecentlyOne).map(BsSupervisionAllPO::getProductCreatTime).orElse(null));
         //验收
         BsSupervisionAllPO acceptOne = bsSupervisionAllService.getByRecentlyOne(BsSaOneCode.A_P.getLetter(), BsSaTwoCode.J_G_S_G_ACCPET.getLetter());
-        unitAlCheckVo.setAcceptTime(acceptOne.getProductCreatTime());
+        unitAlCheckVo.setAcceptTime(Optional.ofNullable(acceptOne).map(BsSupervisionAllPO::getProductCreatTime).orElse(null));
         //行政许可安检时间
         BsSupervisionAllPO serviceByRecentlyOne = bsSupervisionAllService.getByRecentlyOne(BsSaOneCode.A_P.getLetter(), BsSaTwoCode.R_C_C.getLetter());
-        unitAlCheckVo.setSecurityTime(serviceByRecentlyOne.getProductCreatTime());
+        unitAlCheckVo.setSecurityTime(Optional.ofNullable(serviceByRecentlyOne).map(BsSupervisionAllPO::getProductCreatTime).orElse(null));
         //TODO 历史检查情况,历史隐患次数找不见对应记录
         return unitAlCheckVo;
     }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireWaterStatisticsVO.java

@@ -18,7 +18,7 @@ public class FireWaterStatisticsVO {
 
 
     /**
-     * 社区消火栓
+     * 社区(居民)消火栓
      */
     private Integer communityFireCode;