fix: 解决冲突

src/main/java/com/isoft/tenio/business/bnsproduct/mapper/BnsProductMapper.java

@@ -18,4 +18,6 @@ public interface BnsProductMapper extends BaseMapper<BnsProduct> {
 
     List<RegionProductResultDto> getRegionProductList(String adminRegion, String regionId, String year, String productType, String areaMin, String areaMax);
 
+    List<BnsProduct> getProductList(String projectId);
+
 }

src/main/java/com/isoft/tenio/business/bnsproduct/service/IBnsProductService.java

@@ -18,4 +18,6 @@ public interface IBnsProductService extends IService<BnsProduct> {
 
     List<RegionProductResultDto> getRegionProductList(String adminRegion, String regionId, String year, String productType, String areaMin, String areaMax);
 
+    List<BnsProduct> getProductList(String projectId);
+
 }

src/main/java/com/isoft/tenio/business/bnsproduct/service/impl/BnsProductServiceImpl.java

@@ -25,4 +25,10 @@ public class BnsProductServiceImpl extends ServiceImpl<BnsProductMapper, BnsProd
 
         return super.baseMapper.getRegionProductList(adminRegion,regionId, year, productType, areaMin, areaMax);
     }
+
+    @Override
+    public List<BnsProduct> getProductList(String projectId){
+
+        return super.baseMapper.getProductList(projectId);
+    }
 }

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

@@ -302,14 +302,7 @@ public class BnsProjectController {
         DetilProductJsonDto detilProductJsonDto = new DetilProductJsonDto();
 
         //获取查询数据
-        QueryWrapper wrapperAll = new QueryWrapper();
-        BnsProduct bnsProduct = new BnsProduct();
-        bnsProduct.setProjectId(projectId);
-        bnsProduct.setDelFlag("0");
-        wrapperAll.orderByDesc("UNIT_AREA");
-        wrapperAll.setEntity(bnsProduct);
-
-        List<BnsProduct> bnsProductList = iBnsProductService.list(wrapperAll);
+        List<BnsProduct> bnsProductList = iBnsProductService.getProductList(projectId);
 
         //向返回结果集对象重新赋值
         for (int i = 0; i < bnsProductList.size(); i++) {
@@ -1433,16 +1426,15 @@ public class BnsProjectController {
 			@ApiImplicitParam(name  =  "type",value  ="业务类型", required = true)
 	})
 	public Ret getPropertyListByAll(String type) {
-//        QueryWrapper<BnsProperty> queryWrapper = new QueryWrapper<BnsProperty>();
-//        BnsProperty bnsProperty = new BnsProperty();
-//        bnsProperty.setType(type);
-//        bnsProperty.setDelFlag("0");
-//        queryWrapper.setEntity(bnsProperty);
-//
-//        List<BnsProperty> list = iBnsPropertyService.list(queryWrapper);
-//        Comparator<Object> com= Collator.getInstance(java.util.Locale.CHINA);
-//        list.sort((o1, o2) -> com.compare(o1.getName(),o2.getName()));
-        List<BnsProperty> list = iBnsPropertyService.selectAllProperty(type);
+        QueryWrapper<BnsProperty> queryWrapper = new QueryWrapper<BnsProperty>();
+        BnsProperty bnsProperty = new BnsProperty();
+        bnsProperty.setType(type);
+        bnsProperty.setDelFlag("0");
+        queryWrapper.setEntity(bnsProperty);
+
+        List<BnsProperty> list = iBnsPropertyService.list(queryWrapper);
+        Comparator<Object> com= Collator.getInstance(java.util.Locale.CHINA);
+        list.sort((o1, o2) -> com.compare(o1.getName(),o2.getName()));
         return Ret.ok().setData(list);
 	}
 

src/main/resources/mapper/bnsproduct/BnsProductMapper.xml

@@ -5,6 +5,23 @@
     <resultMap id="regionProductResultMap" type="com.isoft.tenio.business.bnsproduct.dto.RegionProductResultDto">
     </resultMap>
 
+    <resultMap id="productResultMap" type="com.isoft.tenio.business.bnsproduct.entity.BnsProduct">
+    </resultMap>
+
+    <select id="getProductList" resultMap="productResultMap">
+        SELECT
+            bpp.`NAME` AS propertyName,
+            bpd.*
+        FROM
+            bns_product bpd
+        LEFT JOIN bns_property bpp ON bpd.PRODUCT_TYPE = bpp.BUSINESS_ID
+        AND bpp.DEL_FLAG = 0
+        WHERE bpd.PROJECT_ID = #{projectId}
+        ORDER BY
+            bpp.`CODE`,bpd.UNIT_AREA DESC
+    </select>
+
+
     <select id="getRegionProductList" resultMap="regionProductResultMap">
         SELECT
             bpd.BUSINESS_ID AS productId,