rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

sql调整

dev
zhangyuan 3 years ago
parent
76dbe9aecd
commit
0397fc16e0
3 changed files with 37 additions and 19 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. 44
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
  2. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml
  3. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml

44
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
View File

@ -73,20 +73,50 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
FactUserHouseResultDTO dto = null;
if (params.containsKey("startTime") && params.containsKey("endTime")) {
if (StringUtils.isNotBlank(params.get("startTime").toString()) && StringUtils.isNotBlank(params.get("endTime").toString())) {
params.put("dateId", StringUtils.EMPTY);
if (params.containsKey("level")) {
if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
params.put("dateId", params.get("startTime").toString().replaceAll("-", ""));
FactUserHouseResultDTO dtoStart = factGridUserHouseDailyService.getTotal(params);
params.put("dateId", params.get("endTime").toString().replaceAll("-", ""));
FactUserHouseResultDTO dtoEnd = factGridUserHouseDailyService.getTotal(params);
dto = dtoEnd;
dto.setHouseIncr(dtoEnd.getHouseIncr() - dtoStart.getHouseIncr());
dto.setHouseModify(dtoEnd.getHouseModify() - dtoStart.getHouseModify());
dto.setUserIncr(dtoEnd.getUserIncr() - dtoStart.getUserIncr());
dto.setUserModify(dtoEnd.getUserModify() - dtoStart.getUserModify());
} else {
params.put("dateId", params.get("startTime").toString().replaceAll("-", ""));
FactUserHouseResultDTO dtoStart = factAgencyUserHouseDailyService.getTotal(params);
params.put("dateId", params.get("endTime").toString().replaceAll("-", ""));
FactUserHouseResultDTO dtoEnd = factAgencyUserHouseDailyService.getTotal(params);
dto = dtoEnd;
dto.setHouseIncr(dtoEnd.getHouseIncr() - dtoStart.getHouseIncr());
dto.setHouseModify(dtoEnd.getHouseModify() - dtoStart.getHouseModify());
dto.setUserIncr(dtoEnd.getUserIncr() - dtoStart.getUserIncr());
dto.setUserModify(dtoEnd.getUserModify() - dtoStart.getUserModify());
}
}
} else {
params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE));
if (params.containsKey("level")) {
if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
dto = factGridUserHouseDailyService.getTotal(params);
} else {
dto = factAgencyUserHouseDailyService.getTotal(params);
}
}
}
} else {
params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE));
}
if (params.containsKey("level")) {
if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
dto = factGridUserHouseDailyService.getTotal(params);
} else {
dto = factAgencyUserHouseDailyService.getTotal(params);
if (params.containsKey("level")) {
if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
dto = factGridUserHouseDailyService.getTotal(params);
} else {
dto = factAgencyUserHouseDailyService.getTotal(params);
}
}
}
return dto;
}

6
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml
View File

@ -114,12 +114,6 @@
<if test="dateId != null and dateId != ''">
AND a.DATE_ID = #{dateId}
</if>
<if test="startTime != null and startTime != ''">
AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
</if>
<if test="endTime != null and endTime != ''">
AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) &lt;= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
</if>
</select>
<delete id="deleteByDateId">

6
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml
View File

@ -104,12 +104,6 @@
<if test="dateId != null and dateId != ''">
AND d.DATE_ID = #{dateId}
</if>
<if test="startTime != null and startTime != ''">
AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
</if>
<if test="endTime != null and endTime != ''">
AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) &lt;= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
</if>
</select>
<select id="statAgency" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">

Write Preview
Loading…
Cancel
Save