Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
civil-bigdata
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
civil
civil-bigdata
Commits
c95aef8f
Commit
c95aef8f
authored
Nov 19, 2021
by
袁伟铭
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
da378f6a
b88a5321
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
portal-server/src/main/java/com/zq/portal/service/CjStatsService.java
+1
-1
portal-server/src/main/java/com/zq/portal/service/ShjzStatsService.java
+2
-2
portal-server/src/main/resources/mapper/BzStatsMapper.xml
+4
-4
portal-server/src/main/resources/mapper/ShjzStatsDao.xml
+1
-1
No files found.
portal-server/src/main/java/com/zq/portal/service/CjStatsService.java
View file @
c95aef8f
...
...
@@ -265,7 +265,7 @@ public class CjStatsService {
returnData
.
put
(
"difficultIssueAmountList"
,
difficultIssueAmountList
);
returnData
.
put
(
"areaPeopleNumList"
,
areaPeopleNumList
);
//
redisUtils.setObj(PortalCacheKeys.getAreaDisabledIssueStatsKey(vo), returnData);
redisUtils
.
setObj
(
PortalCacheKeys
.
getAreaDisabledIssueStatsKey
(
vo
),
returnData
);
return
returnData
;
}
...
...
portal-server/src/main/java/com/zq/portal/service/ShjzStatsService.java
View file @
c95aef8f
...
...
@@ -371,13 +371,13 @@ public class ShjzStatsService {
List
<
StatsVo
>
cityMonyStats
=
monyStats
.
stream
().
filter
(
statsVo
->
"1"
.
equals
(
statsVo
.
getType
())).
collect
(
Collectors
.
toList
());
cityMonyStats
.
forEach
(
statsVo
->
{
Map
<
String
,
Object
>
data
=
map
.
computeIfAbsent
(
statsVo
.
getCode
(),
k
->
new
HashMap
<>());
data
.
put
(
"cityMony"
,
statsVo
.
getAmount
());
data
.
put
(
"cityMon
e
y"
,
statsVo
.
getAmount
());
});
// 添加农村发放金额
List
<
StatsVo
>
villageMonyStats
=
monyStats
.
stream
().
filter
(
statsVo
->
"0"
.
equals
(
statsVo
.
getType
())).
collect
(
Collectors
.
toList
());
villageMonyStats
.
forEach
(
statsVo
->
{
Map
<
String
,
Object
>
data
=
map
.
computeIfAbsent
(
statsVo
.
getCode
(),
k
->
new
HashMap
<>());
data
.
put
(
"villageMony"
,
statsVo
.
getAmount
());
data
.
put
(
"villageMon
e
y"
,
statsVo
.
getAmount
());
});
List
<
Map
<
String
,
Object
>>
dataList
=
new
ArrayList
<>();
...
...
portal-server/src/main/resources/mapper/BzStatsMapper.xml
View file @
c95aef8f
...
...
@@ -4,18 +4,18 @@
<select
id=
"getAreaCremationStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
SELECT
LEFT(d.
ups
, #{size}) 'code',
LEFT(d.
id
, #{size}) 'code',
COUNT( 1 ) 'num'
FROM
dic_city d
LEFT JOIN fis_cremation_info_sum f ON d.P_ID = f.POPULACE
WHERE 1=1
<if
test=
"subAreaCode != null and subAreaCode != ''"
>
ANd d.
ups
LIKE CONCAT (#{subAreaCode},'%')
ANd d.
id
LIKE CONCAT (#{subAreaCode},'%')
</if>
AND
LEFT(f.CREMATION_TIME, 4) >= '2017'
GROUP BY LEFT(d.
ups
, #{size})
GROUP BY LEFT(d.
id
, #{size})
</select>
<select
id=
"getCremationRateStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
SELECT ROUND(hhsum.c1 / rksum.c2 * 100) 'num'
...
...
@@ -79,7 +79,7 @@
AND LEFT ( di.CREATE_TIME, 4 ) = #{year}
</if>
<if
test=
"subAreaCode != null and subAreaCode != ''"
>
AND dc.
UPS
LIKE CONCAT(#{subAreaCode}, '%' )
AND dc.
id
LIKE CONCAT(#{subAreaCode}, '%' )
</if>
GROUP BY
LEFT ( di.CREATE_TIME, 4 )
...
...
portal-server/src/main/resources/mapper/ShjzStatsDao.xml
View file @
c95aef8f
...
...
@@ -191,7 +191,7 @@
LEFT ( a.area_code, #{size} ) 'code',
a.type 'type',
SUM(a.people_num) 'num'
FROM city_coutry_all a
FROM
2021_
city_coutry_all a
WHERE
CHAR_LENGTH (LEFT ( a.area_code, #{size} )) = #{size}
<if
test=
"subAreaCode != null and subAreaCode != ''"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment