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
d7c12dc6
Commit
d7c12dc6
authored
Jun 29, 2021
by
袁伟铭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
24480f3c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
23 deletions
+39
-23
portal-server/src/main/java/com/zq/portal/controller/admin/EtStatsAdminController.java
+3
-3
portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
+1
-1
portal-server/src/main/java/com/zq/portal/task/StatsTimingTask.java
+1
-1
portal-server/src/main/resources/mapper/AreaMapper.xml
+25
-14
portal-server/src/main/resources/mapper/CjStatsMapper.xml
+9
-4
No files found.
portal-server/src/main/java/com/zq/portal/controller/admin/EtStatsAdminController.java
View file @
d7c12dc6
...
@@ -44,9 +44,9 @@ public class EtStatsAdminController {
...
@@ -44,9 +44,9 @@ public class EtStatsAdminController {
}
}
@ApiOperation
(
"儿童搜索"
)
@ApiOperation
(
"儿童搜索"
)
@PostMapping
(
value
=
"/
agencyC
hildSearch"
)
@PostMapping
(
value
=
"/
c
hildSearch"
)
public
ResultVo
agencyC
hildSearch
(
@RequestBody
StatsReqVo
vo
)
{
public
ResultVo
c
hildSearch
(
@RequestBody
StatsReqVo
vo
)
{
return
ResultVo
.
success
(
etStatsService
.
agencyC
hildSearch
(
vo
.
getKeyword
()));
return
ResultVo
.
success
(
etStatsService
.
c
hildSearch
(
vo
.
getKeyword
()));
}
}
}
}
portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
View file @
d7c12dc6
...
@@ -208,7 +208,7 @@ public class EtStatsService {
...
@@ -208,7 +208,7 @@ public class EtStatsService {
* @param keyword
* @param keyword
* @return
* @return
*/
*/
public
Object
agencyC
hildSearch
(
String
keyword
)
{
public
Object
c
hildSearch
(
String
keyword
)
{
return
etStatsDao
.
search
(
keyword
);
return
etStatsDao
.
search
(
keyword
);
}
}
}
}
portal-server/src/main/java/com/zq/portal/task/StatsTimingTask.java
View file @
d7c12dc6
...
@@ -24,7 +24,7 @@ public class StatsTimingTask {
...
@@ -24,7 +24,7 @@ public class StatsTimingTask {
private
final
CjStatsService
cjStatsService
;
private
final
CjStatsService
cjStatsService
;
private
final
BzStatsService
bzStatsService
;
private
final
BzStatsService
bzStatsService
;
private
final
AreaDao
areaDao
;
private
final
AreaDao
areaDao
;
private
final
String
cron
=
"0 0
1
* * ?"
;
private
final
String
cron
=
"0 0
23
* * ?"
;
@Scheduled
(
cron
=
cron
)
@Scheduled
(
cron
=
cron
)
...
...
portal-server/src/main/resources/mapper/AreaMapper.xml
View file @
d7c12dc6
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.zq.portal.dao.AreaDao"
>
<mapper
namespace=
"com.zq.portal.dao.AreaDao"
>
<select
id=
"getAreaList"
resultType=
"com.zq.common.entity.SystemArea"
parameterType=
"com.zq.common.entity.SystemArea"
>
<select
id=
"getAreaList"
resultType=
"com.zq.common.entity.SystemArea"
parameterType=
"com.zq.common.entity.SystemArea"
>
SELECT
SELECT
a.id,
a.id,
CONCAT(
CONCAT(
...
@@ -28,17 +29,18 @@
...
@@ -28,17 +29,18 @@
</select>
</select>
<select
id=
"getCityAreaList"
resultType=
"com.zq.common.entity.SystemArea"
>
<select
id=
"getCityAreaList"
resultType=
"com.zq.common.entity.SystemArea"
>
select id,
select
name
id,name
FROM system_area
FROM system_area where parent_id=
0
where parent_id =
0
union
union
SELECT
SELECT a.id,
a.id,
CONCAT(
CONCAT(
(SELECT NAME FROM system_area ae WHERE ae.id = a.parent_id ),
NAME
(SELECT NAME FROM system_area ae WHERE ae.id = a.parent_id),
NAME
) AS name
) AS name
FROM system_area a where a.type in ('1','2') and a.parent_id>0
FROM system_area a
where a.type in ('1', '2')
and a.parent_id > 0
</select>
</select>
<select
id=
"getAreaByType"
resultType=
"com.zq.common.entity.SystemArea"
parameterType=
"string"
>
<select
id=
"getAreaByType"
resultType=
"com.zq.common.entity.SystemArea"
parameterType=
"string"
>
...
@@ -50,22 +52,31 @@
...
@@ -50,22 +52,31 @@
</select>
</select>
<select
id=
"findKid"
parameterType=
"java.lang.String"
resultType=
"com.zq.common.entity.SystemArea"
>
<select
id=
"findKid"
parameterType=
"java.lang.String"
resultType=
"com.zq.common.entity.SystemArea"
>
SELECT id as id, code, type ,parent_id as parentId,name FROM system_area a where a.parent_id=#{value}
SELECT id as id, code, type, parent_id as parentId, name
FROM system_area a
where a.parent_id = #{value}
</select>
</select>
<select
id=
"getYear"
resultType=
"com.zq.common.entity.SystemYear"
>
<select
id=
"getYear"
resultType=
"com.zq.common.entity.SystemYear"
>
select id ,isOk from sys_year
select id, isOk
from sys_year
</select>
</select>
<select
id=
"getAreaByCode"
parameterType=
"java.lang.String"
resultType=
"com.zq.common.entity.SystemArea"
>
<select
id=
"getAreaByCode"
parameterType=
"java.lang.String"
resultType=
"com.zq.common.entity.SystemArea"
>
SELECT id as id, code, type ,parent_id as parentId,name FROM system_area a where a.id=#{value}
SELECT id as id, code, type, parent_id as parentId, name
FROM system_area a
where a.id = #{value}
</select>
</select>
<select
id=
"getAreaByPartmentId"
parameterType=
"string"
resultType=
"string"
>
<select
id=
"getAreaByPartmentId"
parameterType=
"string"
resultType=
"string"
>
select area_id from sys_dept where dept_id =#{value}
select area_id
from sys_dept
where dept_id = #{value}
</select>
</select>
<select
id=
"getAreaByUserName"
resultType=
"string"
parameterType=
"string"
>
<select
id=
"getAreaByUserName"
resultType=
"string"
parameterType=
"string"
>
select dept_id from sys_user where username =#{value}
select dept_id
from sys_user
where username = #{value}
</select>
</select>
</mapper>
</mapper>
portal-server/src/main/resources/mapper/CjStatsMapper.xml
View file @
d7c12dc6
...
@@ -66,9 +66,11 @@
...
@@ -66,9 +66,11 @@
</select>
</select>
<select
id=
"getAreaIssueStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
<select
id=
"getAreaIssueStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
SELECT UNIT_ID 'code',UNIT_NAME 'name', APPLY_TYPE_ID 'type', GRANT_YEAR 'year', COUNT_PEOPLE 'num', SUM_MONEY 'amount'
SELECT UNIT_ID 'code',UNIT_NAME 'name', APPLY_TYPE_ID 'type', GRANT_YEAR 'year', COUNT_PEOPLE 'num', SUM_MONEY
'amount'
FROM `statics_grant`
FROM `statics_grant`
WHERE DATE_FORMAT(create_time, '%Y-%m-%d') = (SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM statics_grant ORDER BY create_time DESC LIMIT 1)
WHERE DATE_FORMAT(create_time, '%Y-%m-%d') = (SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM statics_grant
ORDER BY create_time DESC LIMIT 1)
<if
test=
"year != null"
>
<if
test=
"year != null"
>
AND GRANT_YEAR = #{year}
AND GRANT_YEAR = #{year}
</if>
</if>
...
@@ -81,7 +83,8 @@
...
@@ -81,7 +83,8 @@
<select
id=
"getYearIssueStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
<select
id=
"getYearIssueStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
SELECT APPLY_TYPE_ID 'type', GRANT_YEAR 'year', SUM( COUNT_PEOPLE ) 'num', SUM( SUM_MONEY ) 'amount'
SELECT APPLY_TYPE_ID 'type', GRANT_YEAR 'year', SUM( COUNT_PEOPLE ) 'num', SUM( SUM_MONEY ) 'amount'
FROM `statics_grant`
FROM `statics_grant`
WHERE DATE_FORMAT(create_time, '%Y-%m-%d') = (SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM statics_grant ORDER BY create_time DESC LIMIT 1)
WHERE DATE_FORMAT(create_time, '%Y-%m-%d') = (SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM statics_grant
ORDER BY create_time DESC LIMIT 1)
<if
test=
"subAreaCode != null and subAreaCode != ''"
>
<if
test=
"subAreaCode != null and subAreaCode != ''"
>
AND UNIT_ID LIKE CONCAT( #{subAreaCode}, '%' )
AND UNIT_ID LIKE CONCAT( #{subAreaCode}, '%' )
</if>
</if>
...
@@ -98,8 +101,10 @@
...
@@ -98,8 +101,10 @@
GROUP BY GRANT_YEAR
GROUP BY GRANT_YEAR
ORDER BY GRANT_YEAR DESC LIMIT 5
ORDER BY GRANT_YEAR DESC LIMIT 5
</select>
</select>
<select
id=
"search"
resultType=
"java.util.Map"
>
<select
id=
"search"
resultType=
"java.util.Map"
>
SELECT NAME 'name', CARD_CODE 'idCard',MARRY_TYPE_ID 'marryType', REGISTER_ADDRESS_NAME 'addressName',ENSURE_LEVEL_ID 'levelId', CREATE_DATE 'createTime'
SELECT NAME 'name', CARD_CODE 'idCard',MARRY_TYPE_ID 'marryType', REGISTER_ADDRESS_NAME
'addressName',ENSURE_LEVEL_ID 'levelId', CREATE_DATE 'createTime'
FROM
FROM
cjrjz_proposer
cjrjz_proposer
WHERE 1=1
WHERE 1=1
...
...
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