Skip to content

X
xzxt-app-report
Commit 557f56a3 by yanru
Options

修改命案透视接口

parent 08beddd7
Showing with 18 additions and 12 deletions
src/main/java/org/springblade/founder/asj/controller/MatjTsController.java
......@@ -376,11 +376,6 @@ public class MatjTsController extends BladeController {
@ApiOperationSupport(order = 7)
@ApiOperation(value = "本年命案按照受害人性别、年龄段统计人员信息", notes = "本年命案按照受害人性别、年龄段统计人员信息")
public R toShrTjRyxx(@RequestBody Matj matj){
String larqQssj=matj.getLarqQssj();
String larqJssj=matj.getLarqJssj();
String unitCode=getUnitcodeByMatj(matj);
//String unitCode=matj.getUnitcode(); //互联网环境doc中调用接口测试时使用
Integer totalCount=0;
totalCount=matjTsService.toShrTjRyxxCount(matj);
int begin = 0;
......@@ -394,6 +389,8 @@ public class MatjTsController extends BladeController {
begin = easyUIPage.getBegin();
end = matj.getRows();
}
matj.setBegin(begin);
matj.setEnd(end);
List<TbXwRybh> tbXwRybhList = matjTsService.toShrTjRyxx(matj);
Map<String, Object> resultMapHtml = new HashMap<String, Object>();
......@@ -414,10 +411,7 @@ public class MatjTsController extends BladeController {
@ApiOperationSupport(order = 8)
@ApiOperation(value = "本年命案按照嫌疑人人性别、年龄段统计人员信息", notes = "本年命案按照嫌疑人人性别、年龄段统计人员信息")
public R toXyrTjRyxx(@RequestBody Matj matj){
String larqQssj=matj.getLarqQssj();
String larqJssj=matj.getLarqJssj();
String unitCode=getUnitcodeByMatj(matj);
//String unitCode=matj.getUnitcode(); //互联网环境doc中调用接口测试时使用
Integer totalCount=0;
totalCount=matjTsService.toXyrTjRyxxCount(matj);
int begin = 0;
......@@ -431,6 +425,8 @@ public class MatjTsController extends BladeController {
begin = easyUIPage.getBegin();
end = matj.getRows();
}
matj.setBegin(begin);
matj.setEnd(end);
List<TbXwZbfzxyr> tbXwZbfzxyrList = matjTsService.toXyrTjRyxx(matj);
Map<String, Object> resultMapHtml = new HashMap<String, Object>();
......
src/main/java/org/springblade/founder/asj/mapper/MatjMapper.xml
......@@ -821,6 +821,7 @@
ELSE '999' END) as pasddm 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="pa-condition"/>
and zczj.xxsc_pdbz='0'
) pasd
group by pasd.pasddm
</select>
......@@ -839,6 +840,7 @@
ELSE zbfzxyr.zhfzxyr_Xldm END) as zhfzxyrXldm
FROM tb_st_asj asj INNER JOIN tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh INNER JOIN tb_xw_zbfzxyr zbfzxyr on asj.asjbh = zbfzxyr.asjbh
<include refid="common-condition"/>
and zbfzxyr.xxsc_pdbz='0'
) zhfzxyrXl
group by zhfzxyrXl.zhfzxyrXldm
</select>
......@@ -855,6 +857,7 @@
ELSE '999' END) as zhfzxyrZyZylbdm
FROM tb_st_asj asj INNER JOIN tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh INNER JOIN tb_xw_zbfzxyr zbfzxyr on asj.asjbh = zbfzxyr.asjbh
<include refid="common-condition"/>
and zbfzxyr.xxsc_pdbz='0'
) zhfzxyrZy
group by zhfzxyrZy.zhfzxyrZyZylbdm
</select>
......@@ -871,6 +874,7 @@
ELSE '999' END) as bhrZyZylbdm
FROM tb_st_asj asj INNER JOIN tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh INNER JOIN tb_xw_rybh rybh on asj.asjbh = rybh.asjbh
<include refid="common-condition"/>
and rybh.xxsc_pdbz='0'
) bhrZy
group by bhrZy.bhrZyZylbdm
</select>
......
src/main/java/org/springblade/founder/asj/mapper/MatjTsMapper.xml
......@@ -1963,13 +1963,13 @@
<include refid="common-condition"/>
and rybh.xxsc_pdbz='0'
<!-- 男性 1 女性2 1其他999-->
<if test ="(type =='' or type == null) and type!='bhrZy'">
<if test ="(type =='' or type == null) or type!='bhrZy''">
<if test="code != null and code !=''">
<if test="code != 999">
and rybh.BHR_XBDM = #{code, jdbcType=VARCHAR}
</if>
<if test="xbdm == '999'"><!--未知-->
<if test="code == '999'"><!--未知-->
and (rybh.BHR_XBDM IS NULL OR rybh.BHR_XBDM ='' OR rybh.BHR_XBDM ='9' OR rybh.BHR_XBDM='0')
</if>
</if>
......@@ -1987,6 +1987,9 @@
<if test="nlddm == '05'"><!--36岁-45岁-->
and (year(ASJFSSJ_ASJFSKSSJ)-year(RQGZXX_CSRQ_RQGZSX)<![CDATA[>=]]>60)
</if>
<if test="nlddm == '999'"><!--其他-->
and (year(ASJFSSJ_ASJFSKSSJ)-year(zbfzxyr.RQGZXX_CSRQ_RQGZSX)<![CDATA[<]]>12)
</if>
</if>
</if>
<!--职业 务农04、无业05、务工03、其他-->
......@@ -2042,7 +2045,7 @@
<include refid="common-condition"/>
AND zbfzxyr.XXSC_PDBZ='0'
<!-- 男性 1 女性2 1其他999-->
<if test ="(type =='' or type == null) and type!='zhfzxyrXl' and type!='zhfzxyrZy'">
<if test ="(type =='' or type == null) or (type!='zhfzxyrXl' and type!='zhfzxyrZy') ">
<if test="code != null and code !=''">
<if test="code == '999'"><!--未知-->
and (zbfzxyr.ZHFZXYR_XBDM IS NULL OR zbfzxyr.ZHFZXYR_XBDM ='' OR zbfzxyr.ZHFZXYR_XBDM ='9' OR zbfzxyr.ZHFZXYR_XBDM='0')
......@@ -2066,6 +2069,9 @@
<if test="nlddm == '05'"><!--36岁-45岁-->
and (year(ASJFSSJ_ASJFSKSSJ)-year(zbfzxyr.RQGZXX_CSRQ_RQGZSX)<![CDATA[>=]]>60)
</if>
<if test="nlddm == '999'"><!--36岁-45岁-->
and (year(ASJFSSJ_ASJFSKSSJ)-year(zbfzxyr.RQGZXX_CSRQ_RQGZSX)<![CDATA[<]]>12)
</if>
</if>
</if>
<!--学历 大学及以上50、高中40、初中30、小学及以下20、其他-->
......
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