Merge branch 'feat-region' into 'master'

fix : 修改bug 导出产品信息

See merge request !136

src/main/java/com/isoft/tenio/business/bnsregion/controller/BnsRegionController.java

@@ -319,11 +319,13 @@ public class BnsRegionController {
     @ApiOperation(value = "导出产品数据", notes = "导出产品数据")
 
     public void downloadCP(HttpServletResponse response, HttpServletRequest request, ExportTitleQuery exportTitleQuery) {
-        List<ExportProductResullt> export = JSONArray.parseArray(exportTitleQuery.getDataJsonTwo(), ExportProductResullt.class);
-        POIUtil.exportExcel(export,
-                exportTitleQuery.getTitle(),
-                "产品分析",
-                ExportProductResullt.class, exportTitleQuery.getTitle() + "产品分析数据",
+        //产品数据
+        List<ExportProjectMesDTO> exportProductResullts = JSONArray.parseArray(exportTitleQuery.getDataJson(), ExportProjectMesDTO.class);
+        //供求数据
+        List<ExportProductResullt> exportGongQiuResults = JSONArray.parseArray(exportTitleQuery.getDataJsonTwo(), ExportProductResullt.class);
+        POIUtil.exportExcellP(exportProductResullts, exportGongQiuResults,
+                exportTitleQuery.getTitle(), ExportProductResullt.class,
+                ExportProjectMesDTO.class, exportTitleQuery.getTitle() + "销售数据",
                 response,
                 request
         );

src/main/java/com/isoft/tenio/business/bnsregion/dto/ExportProjectMesDTO.java

+package com.isoft.tenio.business.bnsregion.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * EasyPoi导出
+ *
+ * @author :jiangpengpeng
+ * @date:2020/8/2 8:19
+ */
+@Data
+public class ExportProjectMesDTO {
+
+    @Excel(name = "产品名称",needMerge = true)
+    private String productionName;
+
+    @ExcelCollection(name = "")
+    private List<ProductionPropertiesDTO> productionProperties;
+
+}

src/main/java/com/isoft/tenio/business/bnsregion/dto/ProductionPropertiesDTO.java

+package com.isoft.tenio.business.bnsregion.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 产品信息
+ *
+ * @author :jiangpengpeng
+ * @date:2020/8/2 8:26
+ */
+@Data
+public class ProductionPropertiesDTO {
+
+    @Excel(name="户型面积")
+    private String unitArea;
+
+    @Excel(name = " 户型图",type = 2 ,width = 40 , height = 20)
+    private String  imgUrl;
+
+    @Excel(name = "开间数")
+    private String bayNumber;
+
+    @Excel(name = "局室数")
+    private String roomNumber;
+
+    @Excel(name = "厅数")
+    private String hallNumber;
+
+    @Excel(name = "卫生间数")
+    private String toiletNumber;
+
+    @Excel(name = "南向面宽")
+    private String southWidth;
+
+    @Excel(name = "起居室面宽")
+    private String liveRoomWidth;
+
+    @Excel(name = "主卧面宽")
+    private String masterRoomWidth;
+
+    @Excel(name = "客卧面宽")
+    private String guestRoomWidth;
+
+    @Excel(name = "起居室-大横厅")
+    private String liveRoom_largeHorizontalHall;
+
+    @Excel(name = "起居室-外设阳台")
+    private String liveRoom_balcony;
+
+    @Excel(name = "起居室-LDK")
+    private String liveRoom_LDK;
+
+    @Excel(name = "主卧-主卫")
+    private String masterRoom_masterBathRoom;
+
+    @Excel(name = "主卧-衣帽间")
+    private String masterRoom_cloakRoom;
+
+    @Excel(name = "客卧-客卫")
+    private String guestRoom_guestBathRoom;
+
+    @Excel(name = "厨房-LDK")
+    private String kitchen_LDK;
+
+
+    @Excel(name = "厨房-中西厨分离")
+    private String kitchen_SCWesternCook;
+
+
+    @Excel(name = "厨房-玄关设厨房独立动线")
+    private String kitchen_hallwayCFDX;
+
+
+
+    @Excel(name = "厨房-厨房形式")
+    private String kitchen_kitchenStyle;
+
+
+
+    @Excel(name = "餐厅-LDK")
+    private String restaurant_LDK;
+
+
+    @Excel(name = "餐厅-独立开窗")
+    private String restaurant_independentWindow;
+
+
+
+    @Excel(name = "书房-大宽厅/独立")
+    private String bookRoom_wideHallSingleGuard;
+
+
+
+    @Excel(name = "卫生间-明卫")
+    private String restRoom_brightBathRoom;
+
+
+
+    @Excel(name = "卫生间-干湿分离")
+    private String restRoom_dryWetDepart;
+
+
+
+    @Excel(name = "卫生间-功能")
+    private String restRoom_function;
+
+
+
+    @Excel(name = "主卫-明卫")
+    private String bathRoom_brightBathRoom;
+
+
+
+    @Excel(name = "主卫-干湿分离")
+    private String bathRoom_dryWetDepart;
+
+    @Excel(name = "主卫-功能")
+    private String bathRoom_function;
+
+
+    @Excel(name = "阳台-是否设置阳台")
+    private String balcony_designHalcony;
+
+
+    @Excel(name = "阳台-位置")
+    private String balcony_location;
+
+    @Excel(name = "储藏间--是否设置储藏间")
+    private String storeRoom_designStoreRoom;
+
+
+    @Excel(name = "家政间--是否设置家政间")
+    private String houseSpace_designHouseSpace;
+
+    @Excel(name = "玄关--是否设置玄关")
+    private String hallway_designHallway;
+
+    @Excel(name = "玄关-是否设置厨房动线")
+    private String hallway_designHallwayCFDX;
+
+
+}

src/main/java/com/isoft/tenio/business/bnsregion/dto/ResultBnsProjectDTO.java

@@ -107,6 +107,8 @@ public class ResultBnsProjectDTO extends CommonEntity {
 
     private String fileType;
 
+    private String fileOrder;
+
 
 
 }

src/main/java/com/isoft/tenio/business/bnsregion/mapper/BnsRegionMapper.java

@@ -97,13 +97,24 @@ public interface BnsRegionMapper extends BaseMapper<BnsRegion> {
     @Select("<script>SELECT " +
             "bp.* ," +
             "bf.FILE_URL AS fileUrl, " +
-            "bf.FILE_TYPE AS fileType " +
+            "bf.FILE_TYPE AS fileType, " +
+            "(SELECT " +
+            "GROUP_CONCAT(DISTINCT bp1.NAME) " +
+            "FROM " +
+            "bns_product b " +
+            "LEFT JOIN bns_property bp1 ON bp1.BUSINESS_ID = b.PRODUCT_TYPE " +
+            "WHERE " +
+            "b.USE_FLAG = #{useFlag} " +
+            "AND b.DEL_FLAG = #{delFlag} " +
+            "AND b.PROJECT_ID = bp.BUSINESS_ID ) AS productType " +
             "FROM " +
             "bns_project bp " +
             "left join bns_file bf on bf.PARENT_ID = bp.BUSINESS_ID " +
             "WHERE " +
             "bp.USE_FLAG = #{useFlag} " +
             "AND bp.DEL_FLAG = #{delFlag} " +
+            "AND bf.FILE_ORDER = '0' " +
+            "AND bf.FILE_TYPE = '1' " +
             "<if test=\"name!='' and name!=null\">" +
             "AND ( " +
             "bp.`NAME` LIKE concat('%', #{name} ,'%') " +
@@ -162,6 +173,8 @@ public interface BnsRegionMapper extends BaseMapper<BnsRegion> {
             "WHERE " +
             "bp.USE_FLAG = #{useFlag} " +
             "AND bp.DEL_FLAG = #{delFlag} " +
+            "AND bf.FILE_ORDER = '0' " +
+            "AND bf.FILE_TYPE = '1' " +
             "AND bp.BUSINESS_ID IN ( " +
             "SELECT " +
             "bpp.PROJECT_ID " +

src/main/java/com/isoft/tenio/business/bnsregion/service/impl/BnsRegionServiceImpl.java

@@ -55,29 +55,8 @@ public class BnsRegionServiceImpl extends ServiceImpl<BnsRegionMapper, BnsRegion
         regionByName.setResultBnsLandDTOS(resultBnsLandDTOS);
         //查询土拍包括的楼盘和板跨内的楼盘
         List<ResultBnsProjectDTO> resultBnsProjectDTOS = bnsRegionMapper.bnsProjectByIds(UseStatus.START.getStatus(), DelStatus.NORMAL.getStatus(), businessId, resultBnsLandDTOS);
-        List<ResultBnsProjectDTO> result = new ArrayList<>();
-
-        Map<String,ResultBnsProjectDTO> map = new HashMap<>();
-
-        for (ResultBnsProjectDTO resultBnsProjectDTO: resultBnsProjectDTOS) {
-            if (map.size()>0){
-                if (map.keySet().contains(resultBnsProjectDTO.getCode())){
-                    if (resultBnsProjectDTO.getFileType().equals("1")){
-                        map.put(resultBnsProjectDTO.getCode(),resultBnsProjectDTO);
-                    }
-                }else {
-                    map.put(resultBnsProjectDTO.getCode(),resultBnsProjectDTO);
-                }
-            }else {
-                map.put(resultBnsProjectDTO.getCode(),resultBnsProjectDTO);
-            }
-        }
-        Collection<ResultBnsProjectDTO> values = map.values();
-        for (ResultBnsProjectDTO object: values) {
-            result.add(object);
-        }
         //存入楼盘信息
-        regionByName.setResultBnsProjectDTOS(result);
+        regionByName.setResultBnsProjectDTOS(resultBnsProjectDTOS);
         return regionByName;
     }
 
@@ -113,9 +92,11 @@ public class BnsRegionServiceImpl extends ServiceImpl<BnsRegionMapper, BnsRegion
     public Ret mesByName(String useFlag, String delFlag, String name) {
         ResultMesByNameDTO resultMesByNameDTO = new ResultMesByNameDTO();
         List<ResultBnsProjectDTO> projectByName = bnsRegionMapper.projectByName(useFlag, delFlag, name);
+        List<ResultBnsProjectDTO> result = null;
         //如果存在查询的楼盘
         if (projectByName.size() > 0) {
             resultMesByNameDTO.setFlag("plate");
+           // result = this.distinctMes(projectByName);
             resultMesByNameDTO.setProjectByName(projectByName);
             return Ret.ok().setData(resultMesByNameDTO);
         }
@@ -135,33 +116,39 @@ public class BnsRegionServiceImpl extends ServiceImpl<BnsRegionMapper, BnsRegion
             //查询土拍包括的楼盘和板跨内的楼盘
             List<ResultBnsProjectDTO> resultBnsProjectDTOS = bnsRegionMapper.bnsProjectByIds(useFlag, delFlag, resultBnsRegionByNameDTO.getBusinessId(), resultBnsLandDTOS);
 
-            List<ResultBnsProjectDTO> result = new ArrayList<>();
+           // result = this.distinctMes(resultBnsProjectDTOS);
+            //存入楼盘信息
+            resultBnsRegionByNameDTO.setResultBnsProjectDTOS(resultBnsProjectDTOS);
+        }
+        resultMesByNameDTO.setFlag("plateRegion");
+        resultMesByNameDTO.setRegionByNames(regionByName);
+        return Ret.ok().setData(resultMesByNameDTO);
+    }
 
-            Map<String,ResultBnsProjectDTO> map = new HashMap<>();
+    //遍历产品解决重复数据
+    public List<ResultBnsProjectDTO> distinctMes(List<ResultBnsProjectDTO> resultBnsProjectDTOS){
+        List<ResultBnsProjectDTO> result = new ArrayList<>();
 
-            for (ResultBnsProjectDTO resultBnsProjectDTO: resultBnsProjectDTOS) {
-                if (map.size()>0){
-                    if (map.keySet().contains(resultBnsProjectDTO.getCode())){
-                        if (resultBnsProjectDTO.getFileType().equals("1")){
-                            map.put(resultBnsProjectDTO.getCode(),resultBnsProjectDTO);
-                        }
-                    }else {
+        Map<String,ResultBnsProjectDTO> map = new HashMap<>();
+
+        for (ResultBnsProjectDTO resultBnsProjectDTO: resultBnsProjectDTOS) {
+            if (map.size()>0){
+                if (map.keySet().contains(resultBnsProjectDTO.getCode())){
+                    if (resultBnsProjectDTO.getFileType().equals("1")){
                         map.put(resultBnsProjectDTO.getCode(),resultBnsProjectDTO);
                     }
                 }else {
                     map.put(resultBnsProjectDTO.getCode(),resultBnsProjectDTO);
                 }
+            }else {
+                map.put(resultBnsProjectDTO.getCode(),resultBnsProjectDTO);
             }
-            Collection<ResultBnsProjectDTO> values = map.values();
-            for (ResultBnsProjectDTO object: values) {
-                result.add(object);
-            }
-            //存入楼盘信息
-            resultBnsRegionByNameDTO.setResultBnsProjectDTOS(result);
         }
-        resultMesByNameDTO.setFlag("plateRegion");
-        resultMesByNameDTO.setRegionByNames(regionByName);
-        return Ret.ok().setData(resultMesByNameDTO);
+        Collection<ResultBnsProjectDTO> values = map.values();
+        for (ResultBnsProjectDTO object: values) {
+            result.add(object);
+        }
+        return result;
     }
 
     /**