Merge branch 'feat-projectAndProduct' into 'master'

feat: 楼盘详情产品类别 添加产品ID 用于跳转

See merge request !137

src/main/java/com/isoft/tenio/business/bnsproject/controller/BnsProjectController.java

@@ -366,6 +366,7 @@ public class BnsProjectController {
             pieTableDetilDto = new PieTableDetilDto();
             BnsProperty bnsProperty = iBnsPropertyService.getById(bnsProductList.get(i).getProductType());
             pieTableDetilDto.setProduction(bnsProperty != null ? ((bnsProductList.get(i).getUnitArea() == null ? "" : bnsProductList.get(i).getUnitArea() + "㎡ ") + bnsProperty.getName()) : "");
+            pieTableDetilDto.setProductId(bnsProductList.get(i).getBusinessId());
             pieTableDetilDto.setKjNum(bnsProductList.get(i).getBayNumber());
             pieTableDetilDto.setJsNum(bnsProductList.get(i).getRoomNumber());
             pieTableDetilDto.setTingNum(bnsProductList.get(i).getHallNumber());
@@ -374,6 +375,7 @@ public class BnsProjectController {
 
             barDetilDto = new BarDetilDto();
             barDetilDto.setProduction(bnsProperty != null ? ((bnsProductList.get(i).getUnitArea() == null ? "" : bnsProductList.get(i).getUnitArea() + "㎡ ") + bnsProperty.getName()) : "");
+            barDetilDto.setProductId(bnsProductList.get(i).getBusinessId());
             barDetilDto.setNxmk(bnsProductList.get(i).getSouthWidth());
             barDetilDto.setQjsmk(bnsProductList.get(i).getLiveRoomWidth());
             barDetilDto.setZwmk(bnsProductList.get(i).getMasterRoomWidth());

src/main/java/com/isoft/tenio/business/bnsproject/dto/detilProduct/BarDetilDto.java

@@ -17,6 +17,8 @@ public class BarDetilDto {
 
         private String production;
 
+        private String productId;
+
         private Float nxmk;
 
         private Float qjsmk;

src/main/java/com/isoft/tenio/business/bnsproject/dto/detilProduct/PieTableDetilDto.java

@@ -17,6 +17,8 @@ public class PieTableDetilDto {
 
         private String production;
 
+        private String productId;
+
         private Float kjNum;
 
         private Integer jsNum;