Merge branch 'test'

pro-base/src/main/java/com/idea/buildManage/service/ParkRoomService.java

@@ -773,8 +773,8 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
                 if (room.getSoldStatus() == 4) {
                     roomResponse.setProjectStatusStr("已退房");
                 }
-                // 初始状态 待售
-                if (room.getIsChoose() == 0) {
+                // 初始状态 待售 (退房后isChoose会变成0)
+                if (room.getIsChoose() == 0 && room.getSoldStatus() != 4) {
                     roomResponse.setProjectStatusStr("初始状态");
                 }
                 parkRoomResponses.add(roomResponse);

pro-base/src/main/java/com/idea/paymentManagement/service/RefundManageService.java

@@ -182,11 +182,10 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
         Integer collectionStatus = null;
         Integer fundCollectionStatus = null;
         for (RefundDetail detail : details) {
-            if (detail.getType().equals("定金") || detail.getType().equals("房款")) {
-                collectionStatus = 3;
-            }
             if (detail.getType().equals("专项维修资金")) {
                 fundCollectionStatus = 3;
+            }else {
+                collectionStatus = 3;
             }
             detail.setRefundManageId(id);
             detail.setCreatedId(userId);

pro-base/src/main/resources/mybatis/customerManagement/CustomerManagementExtendMapper.xml

@@ -84,8 +84,8 @@
 
     <select id="reportList" resultType="com.idea.customerManagement.dto.CustomerManagementDto">
       select p.group_name,p.group_id,f.id discId, f.name disc_name,
-             (select count(1) from mnp_building where disc_id = f.id) buildCount,
-             (select count(1) from park_room where disc_id = f.id) roomCount
+      count(DISTINCT(r.build_id)) buildCount,
+      count(DISTINCT(r.id)) roomCount
       from park_floor_disc f
       left join park_info p on p.id = f.group_id
       left join park_room r on r.disc_id = f.id