Skip to content

J
jilinzhongdianrenqun
Commit ef92198c by wangchunyang
Options

1、统计颜色按标准指定红、黄、绿颜色显示； 

2、评分时增加多附件上传
3、双属地增加通讯录
4、双属地增加预警，推送后24小时后，若未接收，显示在预警
5、统计调整，双属地统计时，去除原属地统计数量
parent 886dd3f6
正在显示 包含 222 行增加 和 16 行删除
src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyPersonRatingDualServiceImpl.java
package com.scpyun.platform.jilinsscgsdp.service.impl; package com.scpyun.platform.jilinsscgsdp.service.impl;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.scpyun.base.bean.Page; import com.scpyun.base.bean.Page;
import com.scpyun.base.core.annotation.Api; import com.scpyun.base.core.annotation.Api;
...@@ -165,6 +166,7 @@ public class KeyPersonRatingDualServiceImpl { ...@@ -165,6 +166,7 @@ public class KeyPersonRatingDualServiceImpl {
record.put("push_reason", params.get("push_reason")); record.put("push_reason", params.get("push_reason"));
record.put("push_time", now); record.put("push_time", now);
record.put("push_user", operator.getUserId()); record.put("push_user", operator.getUserId());
record.put("push_duty_phone", params.get("push_duty_phone"));//推送负责人电话
record.put("create_user", operator.getUserId()); record.put("create_user", operator.getUserId());
record.put("create_time", now); record.put("create_time", now);
record.put("update_user", operator.getUserId()); record.put("update_user", operator.getUserId());
...@@ -497,4 +499,46 @@ public class KeyPersonRatingDualServiceImpl { ...@@ -497,4 +499,46 @@ public class KeyPersonRatingDualServiceImpl {
this.areaId = areaId; this.areaId = areaId;
} }
} }
@ApiOperation(value = "预警tab列表", desc = "查询推送超过24小时未处理的数据")
public Page<Map<String, Object>> selectDualWarnPushList(Page<Map<String, Object>> page) {
page.setParams(DataScopeUtil.resetUser(page.getParams()));
Map<String, Object> params = normalizePageParams(page);
// OperatorContext operator = resolveOperator(params.get("_user"));
// params.put("operator_area_id", operator.getUserId());
page.setParams(params);
return commonService.findPage(NAMESPACE + "selectDualWarnPushList", page);
}
@ApiOperation(value = "电话tab列表", desc = "查询长春市通讯录")
public Page<Map<String, Object>> selectDualPhoneList(Page<Map<String, Object>> page) {
page.setParams(DataScopeUtil.resetUser(page.getParams()));
Map<String, Object> params = normalizePageParams(page);
// OperatorContext operator = resolveOperator(params.get("_user"));
// params.put("operator_area_id", operator.getUserId());
page.setParams(params);
return commonService.findPage(NAMESPACE + "selectDualPhoneList", page);
}
@ApiOperation(value = "保存通讯录", desc = "保存对应机构的通讯录电话")
public String saveDualPhone(Map<String, Object> map) {
map = DataScopeUtil.resetUser(map);
Map<String, Object> params = normalizeParams(map);
OperatorContext operator = resolveOperator(params.get("_user"));
map.put("userId", operator.getUserId());
String newId = null;
if(map.get("mark_id") != null) {
newId = String.valueOf(map.get("mark_id"));
if (commonService.update(NAMESPACE + "updateDualPhone", map) != 1) {
throw new CustomException("更新通讯录失败");
}
}else{
newId = IdUtil.simpleUUID();
map.put("mark_id", newId);
if (commonService.insert(NAMESPACE + "insertDualPhone", map) != 1) {
throw new CustomException("保存通讯录失败");
}
}
return newId;
}
} }
src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyPersonRatingServiceImpl.java
...@@ -245,6 +245,7 @@ public class KeyPersonRatingServiceImpl { ...@@ -245,6 +245,7 @@ public class KeyPersonRatingServiceImpl {
summaryMap.put("rating_users", map.get("ratingUsers")); summaryMap.put("rating_users", map.get("ratingUsers"));
summaryMap.put("rating_custom_time", map.get("ratingTime").toString().replace("T", " ").substring(0,19)); summaryMap.put("rating_custom_time", map.get("ratingTime").toString().replace("T", " ").substring(0,19));
summaryMap.put("rating_img", map.get("ratingImg").toString());
// try { // try {
// summaryMap.put("rating_custom_time", DateUtil.parseTime(map.get("ratingTime").toString().replace("T", " ").substring(0,19))); // summaryMap.put("rating_custom_time", DateUtil.parseTime(map.get("ratingTime").toString().replace("T", " ").substring(0,19)));
// } catch (ParseException e) { // } catch (ParseException e) {
......
src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyPersonMinorDao.xml
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
DATE_FORMAT(history.plan_start_data,'%Y-%m-%d') planStartData, DATE_FORMAT(history.plan_start_data,'%Y-%m-%d') planStartData,
DATE_FORMAT(history.plan_end_data,'%Y-%m-%d') planEndData, DATE_FORMAT(history.plan_end_data,'%Y-%m-%d') planEndData,
DATE_FORMAT(history.overdue_date,'%Y-%m-%d') overdueDate, DATE_FORMAT(history.overdue_date,'%Y-%m-%d') overdueDate,
DATE_FORMAT(summary.rating_time,'%Y-%m-%d %T') ratingTime, DATE_FORMAT(case when summary.rating_custom_time is null then summary.rating_time else summary.rating_custom_time end,'%Y-%m-%d %T') ratingTime,
case case
when history.id is null then 1 when history.id is null then 1
when curdate() &gt;= history.plan_start_data when curdate() &gt;= history.plan_start_data
......
src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyPersonRatingDao.xml
...@@ -191,7 +191,8 @@ ...@@ -191,7 +191,8 @@
create_by, create_by,
create_time, create_time,
rating_users, rating_users,
rating_custom_time rating_custom_time,
rating_img
) VALUES ( ) VALUES (
#{id}, #{id},
#{rating_dict_type}, #{rating_dict_type},
...@@ -206,7 +207,8 @@ ...@@ -206,7 +207,8 @@
#{_user.id}, #{_user.id},
NOW(), NOW(),
#{rating_users}, #{rating_users},
STR_TO_DATE(#{rating_custom_time}, '%Y-%m-%d %H:%i:%s') STR_TO_DATE(#{rating_custom_time}, '%Y-%m-%d %H:%i:%s'),
#{rating_img}
) )
<!--<selectKey keyProperty="count" resultType="int" order="BEFORE"> <!--<selectKey keyProperty="count" resultType="int" order="BEFORE">
SELECT COUNT(1) FROM jl_key_person_rating_summary WHERE id = #{key_person_rating_summary_id} SELECT COUNT(1) FROM jl_key_person_rating_summary WHERE id = #{key_person_rating_summary_id}
...@@ -284,7 +286,8 @@ ...@@ -284,7 +286,8 @@
kprs.rating_type, kprs.rating_type,
kprs.rating, kprs.rating,
DATE_FORMAT(kprs.rating_custom_time,'%Y-%m-%d %T') rating_custom_time, DATE_FORMAT(kprs.rating_custom_time,'%Y-%m-%d %T') rating_custom_time,
kprs.rating_users kprs.rating_users,
kprs.rating_img
from from
jl_key_person_rating_summary kprs jl_key_person_rating_summary kprs
LEFT JOIN sys_user su ON kprs.rating_personnel = su.id LEFT JOIN sys_user su ON kprs.rating_personnel = su.id
......
src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyPersonRatingDualDao.xml
...@@ -771,4 +771,162 @@ ...@@ -771,4 +771,162 @@
WHERE id = #{id} WHERE id = #{id}
</delete> </delete>
<!-- 双属地通讯录， 目前只有长春范围-->
<select id="selectDualPhoneList" parameterType="page" resultType="map">
select a.id,a.city_id, a.city_name, a.area_id, a.area_name, a.street_id, a.street_name, a.community_id, a.community_name, a.lev, b.phone_number, b.id as mark_id
from (
select id,parent_id,parent_ids, CONCAT(parent_ids, ',', id) as px, sort, '3' as lev,
id as city_id, name as city_name, null as area_id, null as area_name, null as street_id, null as street_name, null as community_id, null as community_name
from sys_office city where city.id = '220100000000' and city.del_flag ='0' and city.is_manage_center =1
union all
select area.id,area.parent_id, area.parent_ids, CONCAT(area.parent_ids, ',', area.id) as px, area.sort, '4' as lev,
city.id as city_id, city.name as city_name, area.id as area_id, area.name as area_name, null as street_id, null as street_name, null as community_id, null as community_name
from sys_office city left join sys_office area on area.parent_id = city.id
where city.id = '220100000000' and city.del_flag ='0' and area.del_flag ='0' and city.is_manage_center =1 and area.is_manage_center =1
union all
select street.id,street.parent_id, street.parent_ids, CONCAT(street.parent_ids, ',', street.id) as px, street.sort, '5' as lev,
city.id as city_id, city.name as city_name, area.id as area_id, area.name as area_name, street.id as street_id, street.name as street_name, null as community_id, null as community_name
from sys_office city left join sys_office area on area.parent_id = city.id left join sys_office street on street.parent_id = area.id
where city.id = '220100000000' and city.del_flag ='0' and area.del_flag ='0' and street.del_flag ='0' and city.is_manage_center =1 and area.is_manage_center =1 and street.is_manage_center =1
<!-- union all-->
<!-- select community.id,community.parent_id, community.parent_ids, CONCAT(community.parent_ids, ',', community.id) as px, community.sort, '6' as lev,-->
<!-- city.id as city_id, city.name as city_name, area.id as area_id, area.name as area_name, street.id as street_id, street.name as street_name, community.id as community_id, community.name as community_name-->
<!-- from sys_office city left join sys_office area on area.parent_id = city.id left join sys_office street on street.parent_id = area.id left join sys_office community on community.parent_id = street.id-->
<!-- where city.id = '220100000000' and city.del_flag ='0' and area.del_flag ='0' and street.del_flag ='0' and community.del_flag ='0'-->
<!-- and city.is_manage_center =1 and area.is_manage_center =1 and street.is_manage_center =1-->
) a left join jl_key_person_rating_dual_phone b on b.office_id = a.id
<where>
AND 1 = 1
<if test="params.city_id != null and params.city_id != ''">
AND a.city_id = #{params.city_id}
</if>
<if test="params.area_id != null and params.area_id != ''">
AND a.area_id = #{params.area_id}
</if>
<if test="params.street_id != null and params.street_id != ''">
AND a.street_id = #{params.street_id}
</if>
<if test="params.community_id != null and params.community_id != ''">
AND a.community_id = #{params.community_id}
</if>
</where>
ORDER BY a.px, a.sort
</select>
<insert id="insertDualPhone" parameterType="map">
INSERT INTO jl_key_person_rating_dual_phone(
id,
office_id,
city_id,
area_id,
street_id,
community_id,
phone_number,
create_user,
create_date
) VALUES (
#{mark_id},
#{id},
#{city_id},
#{area_id},
#{street_id},
#{community_id},
#{phone_number},
#{userId},
NOW()
)
</insert>
<update id="updateDualPhone" parameterType="map">
UPDATE jl_key_person_rating_dual_phone
SET phone_number = #{phone_number},
update_user = #{userId},
update_date = NOW()
WHERE id = #{mark_id}
</update>
<!-- 双属地推送预警查询-->
<select id="selectDualWarnPushList" parameterType="page" resultType="map">
SELECT
dualRecord.id,
dualRecord.key_person_id,
dualRecord.sys_type,
dualRecord.push_status,
dualRecord.push_reason,
dualRecord.push_type,
dualRecord.push_time,
dualRecord.push_user,
dualRecord.recvie_region,
dualRecord.recvie_city_id,
dualRecord.recvie_area_id,
dualRecord.recvie_street_id,
dualRecord.recvie_community_id,
person.name,
person.card_no,
recCity.name AS recvie_city_name,
recArea.name AS recvie_area_name,
recStreet.name AS recvie_street_name,
recCommunity.name AS recvie_community_name,
pushUser.name AS push_user_name,
auditUser.name AS audit_user_name,
returnUser.name AS return_user_name
FROM jl_key_person_rating_dual dualRecord
LEFT JOIN (
<include refid="personUnion"/>
) person ON person.id = dualRecord.key_person_id
LEFT JOIN sys_office recCity ON recCity.id = dualRecord.recvie_city_id
LEFT JOIN sys_office recArea ON recArea.id = dualRecord.recvie_area_id
LEFT JOIN sys_office recStreet ON recStreet.id = dualRecord.recvie_street_id
LEFT JOIN sys_office recCommunity ON recCommunity.id = dualRecord.recvie_community_id
LEFT JOIN sys_user pushUser ON pushUser.id = dualRecord.push_user
LEFT JOIN sys_user auditUser ON auditUser.id = dualRecord.audit_user
LEFT JOIN sys_user returnUser ON returnUser.id = dualRecord.return_user
<where>
AND dualRecord.sys_type = #{params.sys_type}
AND dualRecord.push_type = '0'
AND dualRecord.push_status = 1
AND NOW() - INTERVAL 1 HOUR > dualRecord.push_time
<if test="params.name != null and params.name != ''">
AND person.name LIKE CONCAT('%', #{params.name}, '%')
</if>
<if test="params.card_no != null and params.card_no != ''">
AND person.card_no = #{params.card_no}
</if>
<if test="params.city_id != null and params.city_id != ''">
AND dualRecord.recvie_city_id = #{params.city_id}
</if>
<if test="params.area_id != null and params.area_id != ''">
AND dualRecord.recvie_area_id = #{params.area_id}
</if>
<if test="params.street_id != null and params.street_id != ''">
AND dualRecord.recvie_street_id = #{params.street_id}
</if>
<if test="params.community_id != null and params.community_id != ''">
AND dualRecord.recvie_community_id = #{params.community_id}
</if>
<if test="params.push_status != null and params.push_status != ''">
AND dualRecord.push_status = #{params.push_status}
</if>
<!-- 数据范围 -->
<if test="params._user.company_grade != null and params._user.company_grade != ''">
<choose>
<when test='params._user.company_grade == "3"'>
AND dualRecord.belong_city_id = #{params._user.area_id}
</when>
<when test='params._user.company_grade == "4"'>
AND dualRecord.belong_area_id = #{params._user.area_id}
</when>
<when test='params._user.company_grade == "5"'>
AND dualRecord.belong_street_id = #{params._user.area_id}
</when>
<when test='params._user.company_grade == "6"'>
AND dualRecord.belong_community_id = #{params._user.area_id}
</when>
</choose>
</if>
</where>
ORDER BY dualRecord.create_time DESC
</select>
</mapper> </mapper>
src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyPersonStatistics.xml
...@@ -99,19 +99,19 @@ ...@@ -99,19 +99,19 @@
and sys_type = '3' and sys_type = '3'
<choose> <choose>
<when test="scope_grade == '3'.toString()"> <when test="scope_grade == '3'.toString()">
AND ((city_id = #{scope_area_id} and city_id not in (select city_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person.id)) AND ((city_id = #{scope_area_id} and jl_key_person.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where city_id = #{scope_area_id} AND key_person_id=jl_key_person.id)) OR exists(select id from jl_key_person_rating_dual_person where city_id = #{scope_area_id} AND key_person_id=jl_key_person.id))
</when> </when>
<when test="scope_grade == '4'.toString()"> <when test="scope_grade == '4'.toString()">
AND ((area_id = #{scope_area_id} and area_id not in (select area_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person.id)) AND ((area_id = #{scope_area_id} and jl_key_person.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where area_id = #{scope_area_id} AND key_person_id=jl_key_person.id)) OR exists(select id from jl_key_person_rating_dual_person where area_id = #{scope_area_id} AND key_person_id=jl_key_person.id))
</when> </when>
<when test="scope_grade == '5'.toString()"> <when test="scope_grade == '5'.toString()">
AND ((street_id = #{scope_area_id} and street_id not in (select street_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person.id)) AND ((street_id = #{scope_area_id} and jl_key_person.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where street_id = #{scope_area_id} AND key_person_id=jl_key_person.id)) OR exists(select id from jl_key_person_rating_dual_person where street_id = #{scope_area_id} AND key_person_id=jl_key_person.id))
</when> </when>
<when test="scope_grade == '6'.toString()"> <when test="scope_grade == '6'.toString()">
AND ((community_id = #{scope_area_id} and community_id not in (select community_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person.id)) AND ((community_id = #{scope_area_id} and jl_key_person.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where community_id = #{scope_area_id} AND key_person_id=jl_key_person.id)) OR exists(select id from jl_key_person_rating_dual_person where community_id = #{scope_area_id} AND key_person_id=jl_key_person.id))
</when> </when>
</choose> </choose>
...@@ -123,19 +123,19 @@ ...@@ -123,19 +123,19 @@
and sys_type = '6' and sys_type = '6'
<choose> <choose>
<when test="scope_grade == '3'.toString()"> <when test="scope_grade == '3'.toString()">
AND ((city_id = #{scope_area_id} and city_id not in (select city_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person_minor.id)) AND ((city_id = #{scope_area_id} and jl_key_person_minor.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where city_id = #{scope_area_id} AND key_person_id=jl_key_person_minor.id)) OR exists(select id from jl_key_person_rating_dual_person where city_id = #{scope_area_id} AND key_person_id=jl_key_person_minor.id))
</when> </when>
<when test="scope_grade == '4'.toString()"> <when test="scope_grade == '4'.toString()">
AND ((area_id = #{scope_area_id} and area_id not in (select area_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person_minor.id)) AND ((area_id = #{scope_area_id} and jl_key_person_minor.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where area_id = #{scope_area_id} AND key_person_id=jl_key_person_minor.id)) OR exists(select id from jl_key_person_rating_dual_person where area_id = #{scope_area_id} AND key_person_id=jl_key_person_minor.id))
</when> </when>
<when test="scope_grade == '5'.toString()"> <when test="scope_grade == '5'.toString()">
AND ((street_id = #{scope_area_id} and street_id not in (select street_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person_minor.id)) AND ((street_id = #{scope_area_id} and jl_key_person_minor.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where street_id = #{scope_area_id} AND key_person_id=jl_key_person_minor.id)) OR exists(select id from jl_key_person_rating_dual_person where street_id = #{scope_area_id} AND key_person_id=jl_key_person_minor.id))
</when> </when>
<when test="scope_grade == '6'.toString()"> <when test="scope_grade == '6'.toString()">
AND ((community_id = #{scope_area_id} and community_id not in (select community_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person_minor.id)) AND ((community_id = #{scope_area_id} and jl_key_person_minor.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where community_id = #{scope_area_id} AND key_person_id=jl_key_person_minor.id)) OR exists(select id from jl_key_person_rating_dual_person where community_id = #{scope_area_id} AND key_person_id=jl_key_person_minor.id))
</when> </when>
</choose> </choose>
...@@ -147,19 +147,19 @@ ...@@ -147,19 +147,19 @@
and sys_type = '2' and sys_type = '2'
<choose> <choose>
<when test="scope_grade == '3'.toString()"> <when test="scope_grade == '3'.toString()">
AND ((city_id = #{scope_area_id} and city_id not in (select city_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person.id)) AND ((city_id = #{scope_area_id} and jl_key_person.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where city_id = #{scope_area_id} AND key_person_id=jl_key_person.id)) OR exists(select id from jl_key_person_rating_dual_person where city_id = #{scope_area_id} AND key_person_id=jl_key_person.id))
</when> </when>
<when test="scope_grade == '4'.toString()"> <when test="scope_grade == '4'.toString()">
AND ((area_id = #{scope_area_id} and area_id not in (select area_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person.id)) AND ((area_id = #{scope_area_id} and jl_key_person.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where area_id = #{scope_area_id} AND key_person_id=jl_key_person.id)) OR exists(select id from jl_key_person_rating_dual_person where area_id = #{scope_area_id} AND key_person_id=jl_key_person.id))
</when> </when>
<when test="scope_grade == '5'.toString()"> <when test="scope_grade == '5'.toString()">
AND ((street_id = #{scope_area_id} and street_id not in (select street_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person.id)) AND ((street_id = #{scope_area_id} and jl_key_person.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where street_id = #{scope_area_id} AND key_person_id=jl_key_person.id)) OR exists(select id from jl_key_person_rating_dual_person where street_id = #{scope_area_id} AND key_person_id=jl_key_person.id))
</when> </when>
<when test="scope_grade == '6'.toString()"> <when test="scope_grade == '6'.toString()">
AND ((community_id = #{scope_area_id} and community_id not in (select community_id from jl_key_person_rating_dual_person where key_person_id=jl_key_person.id)) AND ((community_id = #{scope_area_id} and jl_key_person.id not in (select key_person_id from jl_key_person_rating_dual_person))
OR exists(select id from jl_key_person_rating_dual_person where community_id = #{scope_area_id} AND key_person_id=jl_key_person.id)) OR exists(select id from jl_key_person_rating_dual_person where community_id = #{scope_area_id} AND key_person_id=jl_key_person.id))
</when> </when>
</choose> </choose>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论