guolong
/
back-end
0
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改去绿化率

feature/v.2.0.0
caoyizhong 3 years ago
parent
dbdd90044a
commit
5059bf17e1
4 changed files with 34 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      air/src/main/java/com/air/applets/service/impl/LandUserKeepServiceImpl.java
  2. 27
      air/src/main/java/com/air/housing/service/impl/BlocksServiceImpl.java
  3. 18
      air/src/main/resources/application.yml
  4. 9
      air/src/main/resources/mapper/LandListedMapper.xml

1
air/src/main/java/com/air/applets/service/impl/LandUserKeepServiceImpl.java
Unescape View File

@ -31,6 +31,7 @@ public class LandUserKeepServiceImpl extends ServiceImpl<LandUserKeepMapper, Lan
public IPage<ViewLand> getLandUserKeepPage(Page page, LandUserKeepVo landUserKeepVo) {
landUserKeepVo.setUserId(SecurityUtils.getUser().getId());
List<ViewLand> landUserKeepPage = this.baseMapper.getLandUserKeepPage(page, landUserKeepVo);
System.out.println("返回的数据数量"+landUserKeepPage.size());
return page.setRecords(landUserKeepPage);
}

27
air/src/main/java/com/air/housing/service/impl/BlocksServiceImpl.java
Unescape View File

@ -18,10 +18,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
@ -73,14 +75,27 @@ public class BlocksServiceImpl extends ServiceImpl<BlocksMapper, Blocks> impleme
@Override
public List<BlocksPreSaleTotalDto> getPreSaleDetailList(String landListedId, String buildingName) {
//获取楼盘id
AnnoBlocksRel annoBlocksRel = annoBlocksRelMapper.selectOne(Wrappers.<AnnoBlocksRel>query().lambda()
.eq(AnnoBlocksRel::getLandListedId, landListedId).eq(AnnoBlocksRel::getMainLand, 1));
// List<HousingEstates> housingEstates = housingEstatesMapper.selectList(Wrappers.<HousingEstates>query().lambda().eq(HousingEstates::getName, buildingName));
if (annoBlocksRel == null) {
List<AnnoBlocksRel> annoBlocksRelList = new ArrayList<>();
//判断楼盘名称是不是空的
if( StringUtils.isNotBlank(buildingName)){
List<HousingEstates> housingEstates = housingEstatesMapper.selectList(Wrappers.<HousingEstates>query().lambda().eq(HousingEstates::getName, buildingName));
if(housingEstates.size() == 1){
annoBlocksRelList = annoBlocksRelMapper.selectList(Wrappers.<AnnoBlocksRel>query().lambda()
.eq(AnnoBlocksRel::getLandListedId, landListedId)
.eq(AnnoBlocksRel::getMainLand, 1)
.eq(AnnoBlocksRel::getHousingEstatesId,housingEstates.get(0).getHousingEstateId())
);
}
}else{
annoBlocksRelList = annoBlocksRelMapper.selectList(Wrappers.<AnnoBlocksRel>query().lambda()
.eq(AnnoBlocksRel::getLandListedId, landListedId)
.eq(AnnoBlocksRel::getMainLand, 1)
);
}
if (annoBlocksRelList.size() != 1) {
return null;
}
List<BlocksPreSaleTotalDto> saleTotalDtoList = baseMapper.getHouseSaleInfo(annoBlocksRel.getHousingEstatesId());
List<BlocksPreSaleTotalDto> saleTotalDtoList = baseMapper.getHouseSaleInfo(annoBlocksRelList.get(0).getHousingEstatesId());
if (CollectionUtil.isNotEmpty(saleTotalDtoList)) {
saleTotalDtoList.forEach(saleInfo -> {
if (saleInfo.getPreSaleTotal() > 0) {

18
air/src/main/resources/application.yml
Unescape View File

@ -14,16 +14,16 @@ spring:
# password: air123456
# username: root
# password: root
username: root
password: long09aa@1345225844@.
url: jdbc:mysql://182.92.73.21:3370/air?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: long09aa@1345225844@.
# url: jdbc:mysql://182.92.73.21:3370/air?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://127.0.0.1:3306/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
# url: jdbc:mysql://124.71.210.242:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
# url: jdbc:mysql://127.0.0.1:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
# username: air
# password: air123456
# url: jdbc:mysql://127.0.0.1:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
# url: jdbc:mysql://124.71.210.242:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
# url: jdbc:mysql://127.0.0.1:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
username: air
password: air123456
# url: jdbc:mysql://127.0.0.1:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://124.71.59.126:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
# url: jdbc:mysql://124.71.210.242:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
stat-view-servlet:
enabled: true
@ -106,7 +106,7 @@ security:
# 文件系统
minio:
url: http://124.71.210.242:9000
url: http://124.71.59.126:9000
# url: http://127.0.0.1:9000
down-url: https://yoursairdata.com
access-key: air

9
air/src/main/resources/mapper/LandListedMapper.xml
Unescape View File

@ -125,13 +125,10 @@
<if test="landVo.endDate != null and landVo.endDate != ''">
and date_format(ll.auction_date,'%Y-%m-%d') &lt;= #{landVo.endDate}
</if>
<!-- <if test="landVo.landCode != null and landVo.landCode != ''">-->
<!-- and CONCAT(IFNULL(ll.anno_id,''),IFNULL(ll.land_code,''),IFNULL(ll.land_transfer_mu,'')-->
<!-- ,IFNULL(ll.city,''),IFNULL(ll.canton,''),IFNULL(ll.big_group,''))-->
<!-- like concat('%',#{landVo.landCode},'%')-->
<!-- </if>-->
<if test="landVo.landCode != null and landVo.landCode != ''">
and CONCAT(ll.anno_id,ll.land_code,ll.land_transfer_mu, ll.city,ll.canton,ll.big_group) like concat('%',#{landVo.landCode},'%')
and CONCAT(IFNULL(ll.anno_id,''),IFNULL(ll.land_code,''),IFNULL(ll.land_transfer_mu,'')
,IFNULL(ll.city,''),IFNULL(ll.canton,''),IFNULL(ll.big_group,''))
like concat('%',#{landVo.landCode},'%')
</if>
</where>
order by ll.land_listed_id desc

Write Preview
Loading…
Cancel
Save