Skip to content

C
civil-bigdata
Commit d7c12dc6 by 袁伟铭
Options

修改

parent 24480f3c
Showing with 42 additions and 26 deletions
portal-server/src/main/java/com/zq/portal/controller/admin/EtStatsAdminController.java
......@@ -44,9 +44,9 @@ public class EtStatsAdminController {
}
@ApiOperation("儿童搜索")
@PostMapping(value = "/agencyChildSearch")
public ResultVo agencyChildSearch(@RequestBody StatsReqVo vo) {
return ResultVo.success(etStatsService.agencyChildSearch(vo.getKeyword()));
@PostMapping(value = "/childSearch")
public ResultVo childSearch(@RequestBody StatsReqVo vo) {
return ResultVo.success(etStatsService.childSearch(vo.getKeyword()));
}
}
portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
......@@ -208,7 +208,7 @@ public class EtStatsService {
* @param keyword
* @return
*/
public Object agencyChildSearch(String keyword) {
public Object childSearch(String keyword) {
return etStatsDao.search(keyword);
}
}
portal-server/src/main/java/com/zq/portal/task/StatsTimingTask.java
......@@ -24,7 +24,7 @@ public class StatsTimingTask {
private final CjStatsService cjStatsService;
private final BzStatsService bzStatsService;
private final AreaDao areaDao;
private final String cron = "0 0 1 * * ?";
private final String cron = "0 0 23 * * ?";
@Scheduled(cron = cron)
......
portal-server/src/main/resources/mapper/AreaMapper.xml
......@@ -2,7 +2,8 @@
<!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">
<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
a.id,
CONCAT(
......@@ -28,17 +29,18 @@
</select>
<select id="getCityAreaList" resultType="com.zq.common.entity.SystemArea">
select
id,name
FROM system_area where parent_id=0
select id,
name
FROM system_area
where parent_id = 0
union
SELECT
a.id,
CONCAT(
(SELECT NAME FROM system_area ae WHERE ae.id = a.parent_id ),NAME
) AS name
FROM system_area a where a.type in ('1','2') and a.parent_id>0
SELECT a.id,
CONCAT(
(SELECT NAME FROM system_area ae WHERE ae.id = a.parent_id), NAME
) AS name
FROM system_area a
where a.type in ('1', '2')
and a.parent_id > 0
</select>
<select id="getAreaByType" resultType="com.zq.common.entity.SystemArea" parameterType="string">
......@@ -50,22 +52,31 @@
</select>
<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 id="getYear" resultType="com.zq.common.entity.SystemYear">
select id ,isOk from sys_year
select id, isOk
from sys_year
</select>
<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 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 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>
</mapper>
portal-server/src/main/resources/mapper/CjStatsMapper.xml
......@@ -66,9 +66,11 @@
</select>
<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`
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">
AND GRANT_YEAR = #{year}
</if>
......@@ -81,7 +83,8 @@
<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'
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 != ''">
AND UNIT_ID LIKE CONCAT( #{subAreaCode}, '%' )
</if>
......@@ -98,10 +101,12 @@
GROUP BY GRANT_YEAR
ORDER BY GRANT_YEAR DESC LIMIT 5
</select>
<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
cjrjz_proposer
cjrjz_proposer
WHERE 1=1
<choose>
<when test="keyword != null and keyword != ''">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment