Merge remote-tracking branch 'origin/develop' into develop

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java

@@ -48,6 +48,11 @@ public class ProjectCategoryResultDTO implements Serializable {
      */
     private Integer closedProjectTotal;
 
+    /**
+     * 所有项目总数
+     */
+    private Integer allProjectTotal;
+
     /**
      * 总数占比
      */
@@ -70,5 +75,6 @@ public class ProjectCategoryResultDTO implements Serializable {
         this.totalRatio = "0.00%";
         this.closedRatio = "0.00%";
         this.children = new ArrayList<>();
+        this.allProjectTotal = NumConstant.ZERO;
     }
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -284,6 +284,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
             endCategoryList.forEach(e -> {
                 e.setTotalRatio(ratio(e.getProjectTotal(), finalTotal));
                 e.setClosedRatio(ratio(e.getClosedProjectTotal(),e.getProjectTotal()));
+                e.setAllProjectTotal(finalTotal);
             });
         }else {
             Integer endTotal = screenProjectOrgDailyDao.selectProjectTotalByAgency(customerId, endTime, orgId);
@@ -302,6 +303,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
             endCategoryList.forEach(e -> {
                 e.setTotalRatio(ratio(e.getProjectTotal(), finalTotal));
                 e.setClosedRatio(ratio(e.getClosedProjectTotal(),e.getProjectTotal()));
+                e.setAllProjectTotal(finalTotal);
             });
         }
         List<ProjectCategoryResultDTO> finalEndCategoryList = endCategoryList;
@@ -310,10 +312,12 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
                 r.setTotalRatio(e.getTotalRatio());r.setClosedRatio(e.getClosedRatio());
                 r.setProjectTotal(e.getProjectTotal());
                 r.setClosedProjectTotal(e.getClosedProjectTotal());
+                r.setAllProjectTotal(e.getAllProjectTotal());
             });
             r.getChildren().forEach(son -> finalEndCategoryList.stream().filter(e -> son.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> {
                 son.setTotalRatio(e.getTotalRatio());son.setClosedRatio(e.getClosedRatio());
                 son.setProjectTotal(e.getProjectTotal());son.setClosedProjectTotal(e.getClosedProjectTotal());
+                son.setAllProjectTotal(e.getAllProjectTotal());
             }));
         });
         // 排序

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -254,6 +254,11 @@ public class BuildingServiceImpl implements BuildingService {
                 icBuildingUnit.setUnitNum(String.valueOf(i+1));
                 unitList.add(icBuildingUnit);
             }
+            //同一小区下不能存在楼栋名字一样的
+            Integer count = icBuildingDao.checkBuildName(entity.getNeighborHoodId(),entity.getBuildingName(),null);
+            if (null != count && count > 0) {
+                throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(),EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
+            }
             icBuildingUnitEntityList.addAll(unitList);
         }
         //3.保存

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -165,6 +165,11 @@ public class HouseServiceImpl implements HouseService {
             entity.setOwnerName(icHouseExcel.getOwnerName());
             entity.setOwnerPhone(icHouseExcel.getOwnerPhone());
             entity.setOwnerIdCard(icHouseExcel.getOwnerIdCard());
+            //同一楼栋，单元内，房屋名称唯一
+            Integer count = icHouseDao.checkDoorNameUq(entity.getNeighborHoodId(), entity.getBuildingId(), entity.getBuildingUnitId(), entity.getDoorName(),null);
+            if (null != count && count > 0) {
+                throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
+            }
             houseEntityList.add(entity);
         }
         //3.保存

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java

@@ -261,6 +261,12 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
         List<IcNeighborHoodEntity> neighborHoodEntityList = new ArrayList<>();
         List<IcNeighborHoodPropertyEntity> icNeighborHoodPropertyEntityList = new ArrayList<>();
         for (IcNeighborHoodExcel  icNeighborHoodExcel : list) {
+            //同一客户下，小区名称唯一
+            Integer count = icNeighborHoodDao.checkNameUq(customerId,icNeighborHoodExcel.getNeighborHoodName(),null);
+            if (null != count && count > 0) {
+                throw new RenException(EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getCode(), EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg());
+            }
+
             IcNeighborHoodEntity entity = new IcNeighborHoodEntity();
             String uuid  =UUID.randomUUID().toString().replace("-", "");
             entity.setId(uuid);