房屋列表

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureListResultDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: lichao
+ * @Date: 2023/4/11 15:05
+ */
+@NoArgsConstructor
+@Data
+public class HouseCountPictureListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2063032844842070847L;
+
+    private String type;
+
+    private Integer count;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java

@@ -19,13 +19,6 @@ public class HouseCountPictureResultDTO implements Serializable {
 
     private Integer total;
 
-    private List<HouseCountPictureCount> list;
+    private List<HouseCountPictureListResultDTO> list;
 
-    @Data
-    public static class HouseCountPictureCount{
-
-        private String type;
-
-        private Integer count;
-    }
 }

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

@@ -197,7 +197,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      **/
     AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId);
 
-    AgencyResultDTO selectAgencyByLevelStaffId(@Param("staffId") String staffId);
+//    AgencyResultDTO selectAgencyByLevelStaffId(@Param("staffId") String staffId);
 
     /**
      * @param customerId

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

@@ -220,9 +220,9 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      */
     List<GroupRentHouseResultDTO> selectGroupRentHouseList(GroupRentHouseFormDTO formDTO);
 
-    List<HouseCountPictureResultDTO.HouseCountPictureCount> getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
+    List<HouseCountPictureListResultDTO> getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 
-    List<HouseCountPictureResultDTO.HouseCountPictureCount> getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
+    List<HouseCountPictureListResultDTO> getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 
     List<HousePictureListResultDTO> getHousePictureList(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 }

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

@@ -776,7 +776,7 @@
             CONVERT ( ih.DOOR_NAME USING gbk ),
             ih.SORT ASC
     </select>
-    <select id="getHousePurposeCount" resultType="com.epmet.dto.result.HouseCountPictureResultDTO.HouseCountPictureCount">
+    <select id="getHousePurposeCount" resultType="com.epmet.dto.result.HouseCountPictureListResultDTO">
 
         select count (*) as count , PURPOSE as type
         from ic_house
@@ -792,7 +792,7 @@
         group by PURPOSE
 
     </select>
-    <select id="getHouseStatusCount" resultType="com.epmet.dto.result.HouseCountPictureResultDTO.HouseCountPictureCount">
+    <select id="getHouseStatusCount" resultType="com.epmet.dto.result.HouseCountPictureListResultDTO">
         select count (*) as count , RENT_FLAG as type
         from ic_house
         where DEL_FLAG = 0