Commit e489e9d4 by yanru

修改研判报告四中的日期

parent a0861398
......@@ -228,9 +228,9 @@
<!--根据作案动机代码,查询相应作案动机发案情况-->
<select id="getZadjCountByCode" resultType="java.util.HashMap" parameterType="java.util.Map">
select zczj_zadjdm as zczjzadjdm ,count(*) as num
select zczj.zczj_zadjdm as zczjzadjdm ,count(*) as num
from tb_st_asj asj INNER JOIN tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh INNER JOIN tb_xw_zczj zczj on asj.asjbh=zczj.asjbh
<include refid="common-condition"/>
<include refid="pa-condition"/>
group by zczj.zczj_zadjdm
</select>
......@@ -815,13 +815,13 @@
(CASE WHEN dictitem.code='999' THEN '其他' ELSE (select name from sys_dictitem where groupid='CODE_TSSD' and code=dictitem.code) END) as name,
IFNULL(tssd.num,0) num
from
(select * from ( select (CASE WHEN (code = '01' or code = '08' or code = '02' or code = '03') THEN code ELSE '999' END) code from sys_dictitem where groupid='CODE_TSSD' ) dictitem group by dictitem.code) dictitem
(select * from ( select (CASE WHEN (code = '01' or code = '02' or code = '03') THEN code ELSE '999' END) code from sys_dictitem where groupid='CODE_TSSD' ) dictitem group by dictitem.code) dictitem
LEFT JOIN
(SELECT tssd.tssddm as code,
count(*) as num
FROM (
select (CASE
WHEN (asj.tssddm = '01' or asj.tssddm = '08' or asj.tssddm = '02' or asj.tssddm = '03') THEN asj.tssddm
WHEN (asj.tssddm = '01' or asj.tssddm = '02' or asj.tssddm = '03') THEN asj.tssddm
ELSE '999' END) as tssddm from tb_st_asj asj inner join tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh
<include refid="common-condition"/>
) tssd
......
......@@ -1027,16 +1027,22 @@ public class YpbgServiceImpl implements IYpbgService {
@Override
public Map<String, Object> getFaqkYdtb(Matj matj)throws Exception {
String ori_larqQssj=matj.getLarqQssj();
String ori_larqJssj=matj.getLarqJssj();
String last_larqQssj=DateUtil.getLastYear(ori_larqQssj);
String last_larqJssj=DateUtil.getLastYear(ori_larqJssj);
Map<String, Object> retMap = new HashMap<>();
String unitcode = null;
matj.setUnitcode(unitcode);
matj.setType("fa");
int maFaCount = matjDao.getMaFaCount(matj);//获取命案发案总数
//上年
String kssj = matj.getLarqQssj();
String jssj = matj.getLarqJssj();
matj.setLarqQssj(DateUtil.getLastYear(kssj));
matj.setLarqJssj(DateUtil.getLastYear(jssj));
matj.setLarqQssj(last_larqQssj);
matj.setLarqJssj(last_larqJssj);
matj.setType("fa");
//上年命案发案
int snmaFaCount=matjService.getMaFaCount(matj);
//同比发案变动数
......@@ -1055,10 +1061,11 @@ public class YpbgServiceImpl implements IYpbgService {
maFabds=Math.abs(maFaCount - snmaFaCount);
maFaBdl = NumberUtil.getPercent(maFabds, snmaFaCount);
}
//环比时间
String hbKssj = DateUtil.getHbKssj(kssj,jssj);
//环比时间 前一个时间段的发案数
String hbKssj = DateUtil.getHbKssj(last_larqQssj,last_larqJssj);
matj.setLarqQssj(hbKssj);
matj.setLarqJssj(kssj);
matj.setLarqJssj(ori_larqQssj);
matj.setType("fa");
//环比时间发案数
int hbMaFaCount = matjService.getMaFaCount(matj);
//环比发案变动数
......@@ -1076,8 +1083,8 @@ public class YpbgServiceImpl implements IYpbgService {
}
//按案发地分组
Map<String, String> levMap = StringUtil.getDwLevCode(unitcode, "B");
levMap.put("larqQssj",kssj);
levMap.put("larqJssj",jssj);
levMap.put("larqQssj",ori_larqQssj);
levMap.put("larqJssj",ori_larqJssj);
List<Xqfpaxx> faList = matjService.getXqMaFaCount(levMap);
String fasf1 = "";
String fasf2 = "";
......@@ -1108,7 +1115,7 @@ public class YpbgServiceImpl implements IYpbgService {
* 发案较少的五个省份是:西藏(2起)、宁夏(2起)、兵团(3起)、上海(3起)、新疆(5起)。
*/
Date qssj = new SimpleDateFormat("yyyy-MM-dd").parse(kssj);
Date qssj = new SimpleDateFormat("yyyy-MM-dd").parse(ori_larqQssj);
Calendar now = Calendar.getInstance();
now.setTime(qssj);
int month = now.get(Calendar.MONTH) + 1;
......@@ -1121,19 +1128,24 @@ public class YpbgServiceImpl implements IYpbgService {
+"同比"+maFaBdlUp+maFaBdl+",环比"+maFaHbBdlUp+maFaHbBdl+"。"
+month+"月份命案发案较多的五个省份是:<b>"+fasf1+"</b>,发案较少的五个省份是:<b>"+fasf2+"。</b></p>";
String year = kssj.substring(0,4);
String year = ori_larqQssj.substring(0,4);
String tnKssj = year+"-01-01";
matj.setLarqQssj(tnKssj);
matj.setLarqJssj(jssj);
matj.setLarqJssj(ori_larqJssj);
matj.setType("fa");
int bnmaFaCount = matjService.getMaFaCount(matj);
//本年命案破案
matj.setType("pa");
matj.setLarqQssj(tnKssj);
matj.setLarqJssj(ori_larqJssj);
int bnmaPaCount=matjService.getMaFaCount(matj);
//本年命案破案率
String maPal = NumberUtil.getPercent(bnmaPaCount,bnmaFaCount);
matj.setLarqQssj(DateUtil.getLastYear(tnKssj));
matj.setLarqJssj(DateUtil.getLastYear(jssj));
//上年命案发案
matj.setLarqQssj(DateUtil.getLastYear(tnKssj));
matj.setLarqJssj(DateUtil.getLastYear(ori_larqJssj));
matj.setType("fa");
int snmaFaCount2=matjService.getMaFaCount(matj);
//同比发案变动率
String maFaBdl2="";
......@@ -1149,6 +1161,8 @@ public class YpbgServiceImpl implements IYpbgService {
int qgrs = 1411778724;
double swrFasQg = (double) (Math.round(bnmaFaCount*100000/qgrs)/100.0);
matj.setDscodeLevCol("CODE_LEV1");
matj.setLarqQssj(ori_larqQssj);
matj.setLarqJssj(ori_larqJssj);
List<Xqfpaxx> swrFasList = matjService.getSwrFasList(matj);
String swrfasSf1 = "";
String swrfasSf2 = "";
......@@ -1171,6 +1185,8 @@ public class YpbgServiceImpl implements IYpbgService {
}
//存在现案未破的省份
matj.setLarqQssj(ori_larqQssj);
matj.setLarqJssj(ori_larqJssj);
List<Map<String,Object>> xawpSfList = matjService.getXawpSfList(matj);
int xaypCount = 32;
String xawpSfStr="";
......@@ -1193,12 +1209,12 @@ public class YpbgServiceImpl implements IYpbgService {
+ "全国现案破案率为"+maPal+"。";
MafxtjParam mafxtjParam = new MafxtjParam();
mafxtjParam.setLasjQssj(kssj);
mafxtjParam.setLasjJssj(jssj);
mafxtjParam.setLasjQssj(ori_larqQssj);
mafxtjParam.setLasjJssj(ori_larqJssj);
String p3Str = "<p style=\"font-size: 21px;text-indent:50px; font-family: 仿宋\">"+getMaqxTj(mafxtjParam)+"</p></p><p style=\"font-size: 21px;text-indent:50px; font-family: 仿宋\"><b>二、一案杀死多人案件发案情况</b></p>";
String p4Str = getZdswYdtb(kssj,jssj,unitcode,"month");
String p5Str = getZdswYdtb(kssj,jssj,unitcode,"year");
String p4Str = getZdswYdtb(ori_larqQssj,ori_larqJssj,unitcode,"month");
String p5Str = getZdswYdtb(ori_larqQssj,ori_larqJssj,unitcode,"year");
String p6Str = "<p style=\"font-size: 21px;text-indent:50px; font-family: 仿宋\"><b>三、工作要求</b></p>" +
"<p style=\"font-size: 21px;text-indent:50px; font-family: 仿宋\">命案特别是一案杀死多人案件,严重侵害人民群众生命财产安全,影响社会治安稳定。部领导对此高度重视,要求各地切实采取有效措施,严厉打击、严密防范重大恶性案件发生。各地公安机关要认真落实部领导指示精神,在及时侦破案件的基础上,全面加强各项防范管控工作,全力维护社会治安大局稳定。<b>一是</b>快侦快破现行命案。" +
"各地要始终坚持对命案等严重暴力犯罪的严打高压态势,由案发地公安机关领导牵头负责,组织有关警种合成作战,力争在最短时间内破案。对犯罪嫌疑人潜逃的,要快速部署查缉布控工作,坚决防止逃犯再次作案。<b>二是</b>加强案件防范工作。各地刑侦部门要会同相关部门重点排查化解易引发命案的感情纠葛、家庭矛盾、邻里积怨等矛盾纠纷," +
......
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