Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/common/controller/CensusController.java

@@ -813,6 +813,7 @@ public class CensusController {
             add(new LinkedHashMap<String, Object>() {{
                 put("tip", "区市部门");
                 put("level", "county");
+                put("dept_count", sysDeptService.countByType(3));
                 put("apply_sum", county_apply_sum);
                 put("resource_sum", county_resource_sum);
                 put("resource_weekly_change", finalCounty_resource_weekly_change);
@@ -823,6 +824,7 @@ public class CensusController {
             add(new LinkedHashMap<String, Object>() {{
                 put("tip", "市级部门");
                 put("level", "municipal");
+                put("dept_count", sysDeptService.countByType(2));
                 put("apply_sum", municipal_apply_sum);
                 put("resource_sum", municipal_resource_sum);
                 put("resource_weekly_change", finalMunicipal_resource_weekly_change);

renren-admin/src/main/java/io/renren/modules/sys/dao/SysDeptDao.java

@@ -46,4 +46,13 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
 
     List<Long> getIdFromDistrict(@Param("district") Long district);
 
+
+    /**
+     * 统计部门类型数量
+     *
+     * @param type
+     * @return
+     */
+    Long countByType(@Param("type") Integer type);
+
 }

renren-admin/src/main/java/io/renren/modules/sys/service/SysDeptService.java

@@ -42,4 +42,6 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      */
     List<Long> getIdFromDistrict(Long district);
 
+    Long countByType(Integer type);
+
 }

renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysDeptServiceImpl.java

@@ -158,6 +158,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return baseDao.getIdFromDistrict(district);
     }
 
+    @Override
+    public Long countByType(Integer type) {
+        return baseDao.countByType(type);
+    }
+
 
     /**
      * 获取所有上级部门ID

renren-admin/src/main/resources/mapper/sys/SysDeptDao.xml

@@ -51,5 +51,13 @@
     <select id="getIdFromDistrict" resultType="java.lang.Long">
         SELECT id from sys_dept WHERE district = #{district};
     </select>
+    <select id="countByType" resultType="java.lang.Long">
+        SELECT
+        COUNT( id )
+        FROM
+        sys_dept
+        WHERE
+        type = #{type};
+    </select>
 
 </mapper>