bug

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

@@ -25,6 +25,7 @@ import com.rockstar.frame.mapper.FrameDataMapper;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.Tablepar;
 import com.rockstar.shiro.util.ShiroUtils;
+import com.rockstar.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,6 +83,13 @@ public class MnpBuildingService implements BaseService<MnpBuilding, MnpBuildingE
 
     private MnpBuildingExample getCondition(MnpBuilding model, DateTrans dt) {
         MnpBuildingExample ex = new MnpBuildingExample();
+        MnpBuildingExample.Criteria criteria = ex.createCriteria();
+        if (StringUtils.isNotEmpty(model.getGroupId())) {
+            criteria.andGroupIdEqualTo(model.getGroupId());
+        }
+        if (StringUtils.isNotEmpty(model.getDiscId())) {
+            criteria.andDiscIdEqualTo(model.getDiscId());
+        }
         return ex;
     }
 

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

@@ -81,6 +81,9 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
             List<String> groupIds = Arrays.asList(model.getGroupIds().split(","));
             criteria.andGroupIdIn(groupIds);
         }
+        if (StringUtils.isNotEmpty(model.getGroupId())) {
+            criteria.andGroupIdEqualTo(model.getGroupId());
+        }
         return ex;
     }
 

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

@@ -696,6 +696,7 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
 
         // 载体列表
         MnpBuildingExample buildingExample = new MnpBuildingExample();
+        buildingExample.setOrderByClause("build_num + 0 asc");
         buildingExample.createCriteria().andDiscIdEqualTo(discId);
         List<MnpBuilding> mnpBuildings = buildingService.selectByExample(buildingExample);
         for (MnpBuilding mnpBuilding : mnpBuildings) {
@@ -707,6 +708,7 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
 
             // 房间列表
             ParkRoomExample roomExample = new ParkRoomExample();
+            roomExample.setOrderByClause("room_no + 0 asc");
             roomExample.createCriteria().andBuildIdEqualTo(mnpBuilding.getId());
             List<ParkRoom> parkRooms = selectByExample(roomExample);
             for (ParkRoom room : parkRooms) {
@@ -715,11 +717,11 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
                 // 已选房
                 if (room.getIsChoose() == 1) {
                     // 待售
-                    if(room.getSoldStatus() == 1){
+                    if (room.getSoldStatus() == 1) {
                         roomResponse.setProjectStatusStr("已选房");
                     }
                     // 认购
-                    if(room.getSoldStatus() == 2){
+                    if (room.getSoldStatus() == 2) {
                         roomResponse.setProjectStatusStr("已订房");
                     }
                 }
@@ -835,8 +837,10 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
                         default:
                             paymentMethodStr = "其他";
                     }
-                    builder.append(DateUtils.parseDateToStr("yyyy-MM-dd", payTime))
-                            .append(paymentMethodStr)
+                    if (payTime != null) {
+                        builder.append(DateUtils.parseDateToStr("yyyy-MM-dd", payTime));
+                    }
+                    builder.append(paymentMethodStr)
                             .append("收到")
                             .append(contentTypeStr)
                             .append(payMoney).append("元;");