Merge branch 'dev-lx' into 'dev'

Dev lx

See merge request !112

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourceDetail.java

@@ -18,6 +18,8 @@ public class HouseResourceDetail {
 
     private String three;
 
+    private String wgName3;
+
     private String four;
 
     private String wgName4;
@@ -86,7 +88,7 @@ public class HouseResourceDetail {
 
     private String address;
 
-    private String log;
+    private String lon;
 
     private String lat;
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePage.java

@@ -18,6 +18,8 @@ public class HouseResourcePage {
 
     private String three;
 
+    private String wgName3;
+
     private String four;
 
     private String wgName4;
@@ -86,7 +88,7 @@ public class HouseResourcePage {
 
     private String address;
 
-    private String log;
+    private String lon;
 
     private String lat;
 

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -78,6 +78,12 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (!two.isEmpty()) {
             houseResourceDetail.setWgName2(two.get(0).getWgName());
         }
+        GridRegionExample gridRegionExampleThree = new GridRegionExample();
+        gridRegionExampleThree.createCriteria().andWgCodeEqualTo(houseResourceDetail.getThree()).andWgTypeEqualTo(String.valueOf(houseResourceDetail.getType()));
+        List<GridRegion> three = gridRegionMapper.selectByExample(gridRegionExampleThree);
+        if (!three.isEmpty()) {
+            houseResourceDetail.setWgName3(three.get(0).getWgName());
+        }
         if (StringUtils.hasText(houseResourceDetail.getHouseResourceUrl())) {
             houseResourceDetail.setHouseResourceUrlList(Arrays.asList(houseResourceDetail.getHouseResourceUrl().split(",")));
         }
@@ -122,6 +128,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             businessEntityInfoMapper.insertBusinessEntityInfo(businessEntityInfo);
 
             for (BusinessEntitySell businessEntitySell : businessEntityDto.getBusinessEntitySells()) {
+                businessEntitySell.setId(UUID.randomUUID().toString().replaceAll("-", ""));
                 businessEntitySell.setBusinessEntityInfoId(businessEntityInfoId);
                 businessEntitySellMapper.insertBusinessEntitySell(businessEntitySell);
             }
@@ -150,8 +157,12 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             if (!two.isEmpty()) {
                 x.setWgName2(two.get(0).getWgName());
             }
-            if (StringUtils.hasText(x.getHouseResourceUrl())) {
-                x.setHouseResourceUrlList(Arrays.asList(x.getHouseResourceUrl().split(",")));
+
+            GridRegionExample gridRegionExampleThree = new GridRegionExample();
+            gridRegionExampleThree.createCriteria().andWgCodeEqualTo(x.getThree()).andWgTypeEqualTo(String.valueOf(x.getType()));
+            List<GridRegion> three = gridRegionMapper.selectByExample(gridRegionExampleThree);
+            if (!three.isEmpty()) {
+                x.setWgName3(three.get(0).getWgName());
             }
             x.setHouseResourceAttributeText(HouseEnums.HouseResourceAttributeEnum.getDescByCode(x.getHouseResourceAttribute()));
             x.setHouseResourceTypeText(HouseEnums.HouseResourceTypeEnum.getDescByCode(x.getHouseResourceType()));

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -122,13 +122,13 @@
                 and t2.type = #{query.wgType}
             </if>
             <if test="query.two != null and query.two != ''">
-                and t2.two like concat('%', #{query.two}, '%')
+                and t2.two = #{query.two}
             </if>
             <if test="query.three != null and query.three != ''">
-                and t2.three like concat('%', #{query.three}, '%')
+                and t2.three = #{query.three}
             </if>
             <if test="query.four != null and query.four != ''">
-                and t2.four like concat('%', #{query.four}, '%')
+                and t2.four = #{query.four}
             </if>
             <if test="query.houseResourceAttribute != null and query.houseResourceAttribute != ''">
                 and t2.house_resource_attribute = #{query.houseResourceAttribute}