Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

@@ -174,6 +174,21 @@ public class IcNeighborHoodController {
         return new Result<List<OptionResultDTO>>().ok(list);
     }
 
+    /**
+     * 入参：gridId、agencyId
+     * 返回当前组织及下级下的所有小区
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("neighborhood-options-yantai")
+    public Result<List<OptionResultDTO>> queryNeighborHoodOptionsYanTai(@LoginUser TokenDto tokenDto, @RequestBody NeighborHoodOptionFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        List<OptionResultDTO> list=icNeighborHoodService.queryNeighborHoodOptionsYanTai(formDTO);
+        return new Result<List<OptionResultDTO>>().ok(list);
+    }
+
     /**
      * 获取用户组织下小区列表
      *

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java

@@ -156,7 +156,7 @@ public class PropertyManagementController implements ResultDataResolver {
         response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("物业管理导入模版", "UTF-8") + ".xlsx");
 
-        InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ic_property_management_temp.xlsx");
+        InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/yantai/ic_property_management_temp.xlsx");
         try {
             ServletOutputStream os = response.getOutputStream();
             IOUtils.copy(is, os);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java

@@ -224,4 +224,17 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
     IcNeighborHoodEntity getNeighborHoodInfoByName(CheckHouseInfoFormDTO formDTO);
 
     List<OptionResultDTO> queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO);
+
+    /**
+     * label: xxx网格-xxx小区
+     * @param customerId
+     * @param agencyId
+     * @param gridId
+     * @param neighborHoodName
+     * @return
+     */
+    List<OptionResultDTO> queryNeighborHoodOptionsYanTai(@Param("customerId") String customerId,
+                                                         @Param("agencyId") String agencyId,
+                                                         @Param("gridId") String gridId,
+                                                         @Param("neighborHoodName") String neighborHoodName);
 }

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

@@ -203,4 +203,11 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      * @return
      */
     List<OptionResultDTO> queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO);
+
+    /**
+     * 小区下拉框，小区名：xxx网格-xxx小区
+     * @param formDTO
+     * @return
+     */
+    List<OptionResultDTO> queryNeighborHoodOptionsYanTai(NeighborHoodOptionFormDTO formDTO);
 }

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

@@ -856,9 +856,20 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     }
 
 
-
-
-
-
-
+    /**
+     * 小区下拉框，小区名：xxx网格-xxx小区
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public List<OptionResultDTO> queryNeighborHoodOptionsYanTai(NeighborHoodOptionFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getGridId()) && StringUtils.isBlank(formDTO.getAgencyId())) {
+            // 默认查询当前工作人员所属组织及下级的
+            CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+            formDTO.setAgencyId(staffInfoCacheResult.getAgencyId());
+        }
+        List<OptionResultDTO> list = baseDao.queryNeighborHoodOptionsYanTai(formDTO.getCustomerId(),formDTO.getAgencyId(),formDTO.getGridId(),formDTO.getNeighborHoodName());
+        return list;
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -699,4 +699,26 @@
         ORDER BY
             h.NEIGHBOR_HOOD_NAME ASC
     </select>
+
+    <select id="queryNeighborHoodOptionsYanTai" parameterType="map" resultType="com.epmet.commons.tools.dto.result.OptionResultDTO">
+        SELECT
+            concat(cg.grid_name,'-',h.NEIGHBOR_HOOD_NAME) as label,
+            h.ID as `value`
+        FROM
+            ic_neighbor_hood h
+        left join customer_grid cg on(h.grid_id=cg.id)
+        WHERE
+            h.DEL_FLAG = '0'
+            AND h.CUSTOMER_ID = #{customerId}
+            <if test=" null != agencyId and agencyId != ''">
+                AND ( h.AGENCY_ID = #{agencyId} OR h.AGENCY_PIDS LIKE concat( '%', #{agencyId}, '%' ) )
+            </if>
+            <if test=" null != neighborHoodName and neighborHoodName != ''">
+                and h.NEIGHBOR_HOOD_NAME like concat('%',#{neighborHoodName},'%')
+            </if>
+            <if test=" null != gridId and gridId != ''">
+                and h.GRID_ID=#{gridId}
+            </if>
+        ORDER BY  h.NEIGHBOR_HOOD_NAME ASC
+    </select>
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml

@@ -18,7 +18,7 @@
     <!--    当前物业在 当前组织及下级范围内，管理的小区数量 -->
     <select id="getNeighborHoodList" parameterType="java.lang.String" resultType="com.epmet.dto.IcNeighborHoodDTO">
         SELECT
-            p.NEIGHBOR_HOOD_ID,
+            p.NEIGHBOR_HOOD_ID as id,
             h.NEIGHBOR_HOOD_NAME
         FROM
             ic_neighbor_hood_property p