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

bug (办公作价)：修复办公作价bug

Browse Source 
1. 修复下载查询传参名称不匹配
2. 调整docker container中的时区
This commit is contained in:
purple
2020-07-29 10:08:36 +08:00
parent 94fdb38c7f
commit 61c4ee1df4
5 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi/Dockerfile
View File

@ -1,5 +1,8 @@
FROM 172.16.30.92:5000/uv:jdk-1.8.0
# 设置时区
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
VOLUME /tmp
# 将jar包添加到容器中并更名为app.jar

3
ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.project.data.cases.mapper.sync;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.ruoyi.project.data.cases.domain.OriginalOfficeCase;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
@ -20,5 +21,5 @@ public interface DownloadOriginalOfficeCaseMapper {
* @param endDate
* @return
*/
List<OriginalOfficeCase> download(Date startDate, Date endDate);
List<OriginalOfficeCase> download(@Param("startDate") Date startDate,@Param("endDate") Date endDate);
}

2
ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/DownloadOriginalResidenceSaleClosingCaseServiceImpl.java
View File

@ -65,7 +65,7 @@ public class DownloadOriginalResidenceSaleClosingCaseServiceImpl {
running(tableRoute, originalResidenceSaleClosingCases);
after(tableRoute);
copy2UVData(tableRoute, remoteTableRoute);
// copy2UVData(tableRoute, remoteTableRoute);
}

48
ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java
View File

@ -17,7 +17,7 @@ public class GenerateTableTests {
@Test
public void testLastYearMonth() {
Integer lastYearMonth = DateUtils.getLastYearMonth();
Integer lastYearMonth = DateUtils.getLastYearMonth();
Assert.assertTrue(202007 == lastYearMonth);
}
@ -179,4 +179,50 @@ public class GenerateTableTests {
Assert.assertTrue(Objects.equals(202006, lastYearMonth));
}
/**
*
*/
@Test
public void testPrintLoop() {
/**
* 成交案例总数
* 成交套数
* 成交价格
*/
List<String> list = new LinkedList<>();
list.add("425280");
list.add("428770");
list.add("427490");
list.add("428790");
list.add("427780");
list.add("430050");
list.add("425028");
list.add("429710");
list.add("425700");
for (int j = 0; j < list.size(); j++) {
System.out.println("select " + list.get(j) + " as community_id , sum(count) as count,sum(total_price) as " +
"total_price," +
"avg" +
"(avg_price) as avg_price ,sum(total_area) as total_area,avg(avg_area) as avg_area from (");
for (int i = 201901; i <= 201906; i++) {
System.out.println("select COUNT(1) " +
"as count" +
" ,sum" +
"(PriceTotal) as total_price ,avg" +
"(PriceTotal) as avg_price," +
"sum(Area) as total_area ,avg" +
"(Area) as avg_area from " +
"ODS_HOUSINGCASE_DEAL_" + i + " where ProjectID=" + list.get(j));
if (i != 201906)
System.out.println("union");
}
System.out.println(") as t;\n");
}
}
}

6
ruoyi/src/test/java/com/ruoyi/compute/DownloadOriginalResidenceSaleClosingCaseServiceImplTests.java
View File

@ -27,9 +27,9 @@ public class DownloadOriginalResidenceSaleClosingCaseServiceImplTests {
@Test
public void testLoopDownload() {
// , 201912
Arrays.asList(201901, 201902, 201903, 201904, 201905, 201906, 201907, 201908, 201909, 201910).parallelStream().forEach(i -> {
downloadOriginalResidenceSaleClosingCaseService.download(i + 2, i);
});
// Arrays.asList(201901, 201902, 201903, 201904, 201905, 201906, 201907, 201908, 201909, 201910).parallelStream().forEach(i -> {
// downloadOriginalResidenceSaleClosingCaseService.download(i + 2, i);
// });
// downloadOriginalResidenceSaleClosingCaseService.download(202001, 201911);
// downloadOriginalResidenceSaleClosingCaseService.download(202002, 201912);
// downloadOriginalResidenceSaleClosingCaseService.download(202003, 202001);