Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feature (调整前端文案)：

Browse Source
This commit is contained in:
purple
2020-07-10 18:22:39 +08:00
parent 4d4d36ddef
commit 462207c613
10 changed files with 454 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-ui/src/layout/components/Navbar.vue
View File

@@ -8,13 +8,13 @@
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<el-tooltip content="源码地址" effect="dark" placement="bottom">
<!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
<el-tooltip content="文档地址" effect="dark" placement="bottom">
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip>
</el-tooltip> -->
<screenfull id="screenfull" class="right-menu-item hover-effect" />
@@ -52,8 +52,8 @@ import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
// import RuoYiGit from '@/components/RuoYi/Git'
// import RuoYiDoc from '@/components/RuoYi/Doc'
export default {
components: {
@@ -62,8 +62,8 @@ export default {
Screenfull,
SizeSelect,
Search,
RuoYiGit,
RuoYiDoc
// RuoYiGit,
// RuoYiDoc
},
computed: {
...mapGetters([

2
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
View File

@@ -26,7 +26,7 @@ export default {
},
data() {
return {
title: '若依管理系统',
title: '联城作价系统',
logo: logoImg
}
}

4
ruoyi-ui/src/views/login.vue
View File

@@ -65,8 +65,8 @@ export default {
codeUrl: "",
cookiePassword: "",
loginForm: {
username: "admin",
password: "admin123",
username: "",
password: "",
rememberMe: false,
code: "",
uuid: ""

48
ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java
View File

@@ -1,31 +1,41 @@
package com.ruoyi.project.data.cases.controller;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.framework.web.page.TableSupport;
import com.ruoyi.project.data.cases.domain.OriginalNewHouseCase;
import com.ruoyi.project.data.cases.service.IOriginalNewHouseCaseService;
import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 案例Controller
*
* @author lihe
*/
@RestController
@RequestMapping("/data/cases")
public class CasesController {
public class CasesController extends BaseController {
@Autowired
private IOriginalNewHouseCaseService originalNewHouseCaseService;
/**
* 原始办公挂牌案例
* 一手房成交案例
*/
public void originalOfficeOpeningCase() {
@PreAuthorize("@ss.hasPermi('cases:newHouse:list')")
@GetMapping("/newHouse/list")
public TableDataInfo list(OriginalNewHouseCase originalNewHouseCase) {
int total = originalNewHouseCaseService.selectCount(originalNewHouseCase);
List<OriginalNewHouseCase> list =
originalNewHouseCaseService.selectList(originalNewHouseCase);
return getDataTable(list, total);
}
/**
* 原始住宅销售挂牌案例
*/
public void originalResidenceSalesOpeningCase(){
}
/**
* 原始住宅销售挂牌案例
*/
public void originalResidenceSalesClosingCase(){
}
}

19
ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalNewHouseCase.java
View File

@@ -14,6 +14,9 @@ import java.util.Date;
*/
public class OriginalNewHouseCase {
private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
private Integer pageIndex;
private Integer pageSize;
private Integer yearMonth;
/**
* 案例id
@@ -248,4 +251,20 @@ public class OriginalNewHouseCase {
public void setCaseLabel(String caseLabel) {
this.caseLabel = caseLabel;
}
public Integer getPageIndex() {
return pageIndex;
}
public void setPageIndex(Integer pageIndex) {
this.pageIndex = pageIndex;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
}

16
ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalNewHouseCaseMapper.java
View File

@@ -47,5 +47,21 @@ public interface OriginalNewHouseCaseMapper {
*/
int insertSecondTable(OriginalNewHouseCase originalNewHouseCase);
/**
* 分页总数
*
* @param originalNewHouseCase
* @return
*/
int pageCount(OriginalNewHouseCase originalNewHouseCase);
/**
* 分页列表
*
* @param originalNewHouseCase
* @return
*/
List<OriginalNewHouseCase> pageList(OriginalNewHouseCase originalNewHouseCase);
}

29
ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalNewHouseCaseService.java Normal file
View File

@@ -0,0 +1,29 @@
package com.ruoyi.project.data.cases.service;
import com.ruoyi.project.data.cases.domain.OriginalNewHouseCase;
import com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice;
import java.util.List;
/**
* 一手房成交案例Service
*
* @author lihe
*/
public interface IOriginalNewHouseCaseService {
/**
* @param originalNewHouseCase
* @return
*/
List<OriginalNewHouseCase> selectList(OriginalNewHouseCase originalNewHouseCase);
/**
* 分页总数
*
* @param originalNewHouseCase
* @return
*/
int selectCount(OriginalNewHouseCase originalNewHouseCase);
}

38
ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalNewHouseCaseServiceImpl.java Normal file
View File

@@ -0,0 +1,38 @@
package com.ruoyi.project.data.cases.service.impl;
import com.ruoyi.common.constant.LabelConstants;
import com.ruoyi.project.data.cases.domain.OriginalNewHouseCase;
import com.ruoyi.project.data.cases.mapper.OriginalNewHouseCaseMapper;
import com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalNewHouseCaseMapper;
import com.ruoyi.project.data.cases.service.IOriginalNewHouseCaseService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
/**
* 一手房成交案例Service
*
* @author lihe
*/
@Service
public class OriginalNewHouseCaseServiceImpl implements IOriginalNewHouseCaseService {
@Autowired
private OriginalNewHouseCaseMapper originalNewHouseCaseMapper;
@Override
public List<OriginalNewHouseCase> selectList(OriginalNewHouseCase originalNewHouseCase) {
return originalNewHouseCaseMapper.pageList(originalNewHouseCase);
}
@Override
public int selectCount(OriginalNewHouseCase originalNewHouseCase) {
return originalNewHouseCaseMapper.pageCount(originalNewHouseCase);
}
}

3
ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceRentPriceService.java
View File

@@ -32,6 +32,8 @@ public interface IArtificialResidenceRentPriceService {
List<ArtificialResidenceRentBasePrice> selectList(ArtificialResidenceRentBasePrice officeBasePriceUltimate);
/**
* 分页总数
*
* @param officeBasePriceUltimate
* @return
*/
@@ -51,6 +53,7 @@ public interface IArtificialResidenceRentPriceService {
/**
* 更新
*
* @param officeBasePriceUltimate
* @return
*/

47
ruoyi/src/main/resources/mybatis/data/OriginalNewHouseCaseMapper.xml
View File

@@ -163,4 +163,51 @@
)
</insert>
<select id="pageCount" parameterType="com.ruoyi.project.data.cases.domain.OriginalNewHouseCase">
SELECT case_county as caseCounty
,case_block as caseBlock
,case_loop as caseLoop
,case_community_name as caseCommunityName
,case_address as caseAddress
,case_area as caseArea
,case_unit_price as caseUnitPrice
,case_total_price as caseTotalPrice
,case_house_type as caseHouseType
,case_signing_date as caseSigningDate
,case_floor as caseFloor
,case_house_property as caseHouseProperty
,case_apartment_layout as caseApartmentLayout
,compute_unit_price as computeUnitPrice
,compute_total_price as computeTotalPrice
,reference_unit_price as referenceUnitPrice
,reference_total_price as referenceTotalPrice
,case_label as caseLabel
,create_time
, ${yearMonth} as yearMonth
FROM dbo.original_new_house_case_${yearMonth}
</select>
<select id="pageList" resultType="com.ruoyi.project.data.cases.domain.OriginalNewHouseCase">
SELECT case_county as caseCounty
,case_block as caseBlock
,case_loop as caseLoop
,case_community_name as caseCommunityName
,case_address as caseAddress
,case_area as caseArea
,case_unit_price as caseUnitPrice
,case_total_price as caseTotalPrice
,case_house_type as caseHouseType
,case_signing_date as caseSigningDate
,case_floor as caseFloor
,case_house_property as caseHouseProperty
,case_apartment_layout as caseApartmentLayout
,compute_unit_price as computeUnitPrice
,compute_total_price as computeTotalPrice
,reference_unit_price as referenceUnitPrice
,reference_total_price as referenceTotalPrice
,case_label as caseLabel
,create_time
, ${yearMonth} as yearMonth
FROM dbo.original_new_house_case_${yearMonth}
order by case_id ASC OFFSET #{pageIndex} rows fetch next #{pageSize} rows only
</select>
</mapper>