Skip to content

M
map-parent
Commit 46c447c2 by YANGYANG
Options

军委 分词高亮

parent b5739468
Showing with 184 additions and 13 deletions
common/common_utils/src/main/java/com/founder/commonutils/publicEntity/TbAsjAndZbFzXyrAndQgCkXx.java
......@@ -87,6 +87,9 @@ public class TbAsjAndZbFzXyrAndQgCkXx implements Serializable {
private String zhfzxyrSzzwbh;// 抓获犯罪嫌疑人_十指指纹编号
private String zhfzxyrRydnabh;// 抓获犯罪嫌疑人_人员DNA编号
private String sjbq;// 标签
private int page = 1;
private int rownum = 10;
private int begin;
......@@ -324,6 +327,14 @@ public class TbAsjAndZbFzXyrAndQgCkXx implements Serializable {
this.zhfzxyrXb = zhfzxyrXb;
}
public String getSjbq() {
return sjbq;
}
public void setSjbq(String sjbq) {
this.sjbq = sjbq;
}
public String getZhfzxyrHjdqhdz() {
return zhfzxyrHjdqhdz;
}
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/AsjXyrMapper.java
......@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
......@@ -20,7 +21,20 @@ import java.util.List;
public interface AsjXyrMapper {
List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyr(@Param("begin") String begin, @Param("end") String end, @Param("zhfzxyrXm") String zhfzxyrXm, @Param("zhfzxyrZjhm") String zhfzxyrZjhm, @Param("sjaq") String sjaq, @Param("asjbh") String asjbh, @Param("ajlb") String ajlb);
List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyr(@Param("begin") String begin, @Param("end") String end, @Param("zhfzxyrXm") String zhfzxyrXm, @Param("zhfzxyrZjhm") String zhfzxyrZjhm, @Param("sjaq") String sjaq, @Param("asjbh") String asjbh, @Param("ajlb") String ajlb, @Param("zhfzxyrXb") String zhfzxyrXb, @Param("sjbq") String sjbq);
List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyrCount(@Param("zhfzxyrXm") String zhfzxyrXm, @Param("zhfzxyrZjhm") String zhfzxyrZjhm, @Param("sjaq") String sjaq, @Param("asjbh") String asjbh, @Param("ajlb") String ajlb);
List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyrAll(@Param("zhfzxyrXm") String zhfzxyrXm, @Param("zhfzxyrZjhm") String zhfzxyrZjhm, @Param("sjaq") String sjaq, @Param("asjbh") String asjbh, @Param("ajlb") String ajlb, @Param("zhfzxyrXb") String zhfzxyrXb, @Param("sjbq") String sjbq);
List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyrCount(@Param("zhfzxyrXm") String zhfzxyrXm, @Param("zhfzxyrZjhm") String zhfzxyrZjhm, @Param("sjaq") String sjaq, @Param("asjbh") String asjbh, @Param("ajlb") String ajlb, @Param("zhfzxyrXb") String zhfzxyrXb, @Param("sjbq") String sjbq);
Integer listAsjAndXyrCounts(@Param("zhfzxyrXm") String zhfzxyrXm, @Param("zhfzxyrZjhm") String zhfzxyrZjhm, @Param("sjaq") String sjaq, @Param("asjbh") String asjbh, @Param("ajlb") String ajlb, @Param("zhfzxyrXb") String zhfzxyrXb, @Param("sjbq") String sjbq);
List<Map> getAjlb(@Param("begin") String begin, @Param("end") String end, @Param("zhfzxyrXm") String zhfzxyrXm, @Param("zhfzxyrZjhm") String zhfzxyrZjhm, @Param("sjaq") String sjaq, @Param("asjbh") String asjbh, @Param("ajlb") String ajlb, @Param("zhfzxyrXb") String zhfzxyrXb, @Param("sjbq") String sjbq);
List<Map> getxb(@Param("begin") String begin, @Param("end") String end, @Param("zhfzxyrXm") String zhfzxyrXm, @Param("zhfzxyrZjhm") String zhfzxyrZjhm, @Param("sjaq") String sjaq, @Param("asjbh") String asjbh, @Param("ajlb") String ajlb, @Param("zhfzxyrXb") String zhfzxyrXb, @Param("sjbq") String sjbq);
List<Map> getSjbq(@Param("begin") String begin, @Param("end") String end, @Param("zhfzxyrXm") String zhfzxyrXm, @Param("zhfzxyrZjhm") String zhfzxyrZjhm, @Param("sjaq") String sjaq, @Param("asjbh") String asjbh, @Param("ajlb") String ajlb, @Param("zhfzxyrXb") String zhfzxyrXb, @Param("sjbq") String sjbq);
boolean updateSjbqByAsjbh(TbAsjAndZbFzXyrAndQgCkXx tbAsjAndZbFzXyrAndQgCkXx);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/xml/AsjXyrMapper.xml
......@@ -7,12 +7,21 @@
<if test="zhfzxyrXm!=null and zhfzxyrXm!=''">and c.zhfzxyr_Xm LIKE '%' || #{zhfzxyrXm , jdbcType=VARCHAR } || '%'</if>
<if test="zhfzxyrZjhm!=null and zhfzxyrZjhm!=''">and b.zhfzxyr_Cyzj_Zjhm = #{zhfzxyrZjhm}</if>
<if test="asjbh!=null and asjbh!=''">and a.asjbh LIKE '%' || #{asjbh , jdbcType=VARCHAR } || '%'</if>
<if test="ajlb!= null">
<if test="ajlb!= null and ajlb!=''">
AND a.AJLBDM= #{ ajlb , jdbcType=VARCHAR }
</if>
<if test="sjaq!= null">
<if test="sjaq!= null and sjaq!=''">
AND a.JYAQ LIKE '%' || #{sjaq , jdbcType=VARCHAR } || '%'
</if>
<if test="zhfzxyrXb!= null and zhfzxyrXb!=''">
AND c.ZHFZXYR_XB = #{zhfzxyrXb , jdbcType=VARCHAR }
</if>
<if test="zhfzxyrXb == '空'.toString()">
AND c.ZHFZXYR_XB = #{zhfzxyrXb , jdbcType=VARCHAR }
</if>
<if test="sjbq!= null and sjbq!=''">
AND a.sjbq = #{sjbq , jdbcType=VARCHAR }
</if>
AND ( a.JYAQ LIKE '%军队%'
OR a.JYAQ LIKE '%军人%'
OR a.JYAQ LIKE '%部队%'
......@@ -24,7 +33,7 @@
<select id="listAsjAndXyr" parameterType="java.lang.String" resultType="com.founder.commonutils.publicEntity.TbAsjAndZbFzXyrAndQgCkXx">
select * from(
select t.*,rownum rn from(
select a.asjbh,to_char(a.jyaq) as jyaq,
select a.asjbh,a.jyaq as jyaq,
a.ajlbdm as ajlbdm,
(select name from sys_dictitem where groupid = 'CODE_AJLB' and code = a.ajlbdm) as ajlbdmMc,
a.ladw_Gajgjgdm as ladwGajgjgdm,
......@@ -75,4 +84,91 @@
and b.zhfzxyr_Cyzj_Zjhm = c.zhfzxyr_Cyzj_Zjhm
<include refid="asjSql-where"/>
</select>
<select id="listAsjAndXyrCounts" parameterType="java.lang.String" resultType="java.lang.Integer">
select count(*)
from tb_st_asj a,tb_xw_zbfzxyr b,TB_XW_ZBFZXYRQGCKXX c
where a.asjbh = b.asjbh
and b.zhfzxyr_Cyzj_Zjhm = c.zhfzxyr_Cyzj_Zjhm
<include refid="asjSql-where"/>
</select>
<select id="listAsjAndXyrAll" parameterType="java.lang.String" resultType="com.founder.commonutils.publicEntity.TbAsjAndZbFzXyrAndQgCkXx">
select a.asjbh,to_char(a.jyaq) as jyaq,
a.ajlbdm as ajlbdm,
(select name from sys_dictitem where groupid = 'CODE_AJLB' and code = a.ajlbdm) as ajlbdmMc,
a.ladw_Gajgjgdm as ladwGajgjgdm,
(select name from sys_dictitem where groupid = 'CODE_QGUNIT' and code = a.ladw_Gajgjgdm) as ladwGajgjgdmMc,
TO_CHAR(a.larq,'YYYY-MM-DD hh24:mi:ss') as larq,
TO_CHAR(a.fxasjsj,'YYYY-MM-DD hh24:mi:ss') as fxasjsj,
a.fxasjdd_Xzqhdm as fxasjddXzqhdm,
(select name from sys_dictitem where groupid = 'CODE_XZQH' and code = a.fxasjdd_Xzqhdm) as fxasjddXzqhdmMc,
a.zbr_Xm as zbrXm,
a.zbr_Lxdh as zbrLxdh,
TO_CHAR(a.gxsj,'YYYY-MM-DD hh24:mi:ss') as gxsj,
a.zatz_Jyqk as zatzJyqk,
(select name from sys_dictitem where groupid = 'CODE_ZATZ' and code = a.zatz_Jyqk) as zatzJyqkMc,
TO_CHAR(a.zczj_Zxsj01,'YYYY-MM-DD hh24:mi:ss') as zczjZxsj01,
TO_CHAR(a.asjfssj_Asjfskssj,'YYYY-MM-DD hh24:mi:ss') as asjfssjAsjfskssj,
TO_CHAR(a.asjfssj_Asjfsjssj,'YYYY-MM-DD hh24:mi:ss') as asjfssjAsjfsjssj,
a.asjfsdd_Xzqhdm as asjfsddXzqhdm,
(select name from sys_dictitem where groupid = 'CODE_XZQH' and code = a.asjfsdd_Xzqhdm) as asjfsddXzqhdmMc,
a.zcjddm as zcjddm,
(select name from sys_dictitem where groupid = 'CODE_ZCJDDM' and code = a.zcjddm) as zcjddmMc,
a.ladw_gajgMc as ladwgajgMc,
b.zhfzxyr_Cyzj_Zjhm as zhfzxyrCyzjZjhm,
TO_CHAR(b.zhrq,'YYYY-MM-DD hh24:mi:ss') as zhrq,
b.zhdw_Gajgjgdm as zhdwGajgjgdm,
(select name from sys_dictitem where groupid = 'CODE_QGUNIT' and code = b.zhdw_Gajgjgdm) as zhdwGajgjgdmMc,
b.zhfzxyr_Szzwbh as zhfzxyrSzzwbh,
b.zhfzxyr_Rydnabh as zhfzxyrRydnabh,
c.zhfzxyr_Xm as zhfzxyrXm,
to_char(TO_Date(c.zhfzxyr_Csrq,'YYYY-MM-DD hh24:mi:ss'),'yyyy-mm-dd') as zhfzxyrCsrq,
c.zhfzxyr_Img as zhfzxyrImg,
c.zhfzxyr_Mz as zhfzxyrMz,
c.zhfzxyr_Xb as zhfzxyrXb,
c.zhfzxyr_Hjdqhdz as zhfzxyrHjdqhdz,
c.zhfzxyr_Csdzmc as zhfzxyrCsdzmc
from tb_st_asj a,tb_xw_zbfzxyr b,TB_XW_ZBFZXYRQGCKXX c
where a.asjbh = b.asjbh
and b.zhfzxyr_Cyzj_Zjhm = c.zhfzxyr_Cyzj_Zjhm
<include refid="asjSql-where"/>
</select>
<update id="updateSjbqByAsjbh" parameterType="com.founder.commonutils.publicEntity.TbAsjAndZbFzXyrAndQgCkXx">
update tb_st_asj a
set
<if test="sjbq!= null">
a.sjbq= #{ sjbq , jdbcType=VARCHAR }
</if>
where 1 = 1
<if test="asjbh!= null">
AND a.asjbh= #{ asjbh , jdbcType=VARCHAR }
</if>
</update>
<select id="getAjlb" parameterType="java.lang.String" resultType="java.util.Map">
select (case when d.ajlbdmMc is null then '空' else d.ajlbdmMc end) as ajlbdmMc,d.ajlbdm, count(*) as countAjlb from (SELECT
(SELECT name
FROM sys_dictitem
WHERE code = a.ajlbdm) as ajlbdmMc,a.ajlbdm as ajlbdm
FROM tb_st_asj a, tb_xw_zbfzxyr b, TB_XW_ZBFZXYRQGCKXX c
WHERE a.asjbh = b.asjbh AND b.zhfzxyr_Cyzj_Zjhm = c.zhfzxyr_Cyzj_Zjhm
and a.ajlbdm is not null
<include refid="asjSql-where"/>
)d
group by (case when d.ajlbdmMc is null then '空' else d.ajlbdmMc end),d.ajlbdm
</select>
<select id="getxb" parameterType="java.lang.String" resultType="java.util.Map">
select (case when c.ZHFZXYR_XB is null then '空' else c.ZHFZXYR_XB end) as xb ,count(*) as countXb from
tb_st_asj a, tb_xw_zbfzxyr b, TB_XW_ZBFZXYRQGCKXX c
WHERE a.asjbh = b.asjbh AND b.zhfzxyr_Cyzj_Zjhm = c.zhfzxyr_Cyzj_Zjhm
<include refid="asjSql-where"/>
group by (case when c.ZHFZXYR_XB is null then '空' else c.ZHFZXYR_XB end)
</select>
<select id="getSjbq" parameterType="java.lang.String" resultType="java.util.Map">
select a.sjbq ,count(*) as countXb from
tb_st_asj a, tb_xw_zbfzxyr b, TB_XW_ZBFZXYRQGCKXX c
WHERE a.asjbh = b.asjbh AND b.zhfzxyr_Cyzj_Zjhm = c.zhfzxyr_Cyzj_Zjhm
and a.sjbq is not null
<include refid="asjSql-where"/>
group by a.sjbq
</select>
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/service/TbStAsjAndXyrService.java
......@@ -15,7 +15,20 @@ import java.util.List;
*/
public interface TbStAsjAndXyrService {
List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyr(String begin, String end, String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb);
List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyr(String begin, String end, String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb, String zhfzxyrXb, String sjbq);
List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyrCount(String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb);
List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyrAll(String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb, String zhfzxyrXb, String sjbq);
List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyrCount(String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb, String zhfzxyrXb, String sjbq);
Integer listAsjAndXyrCounts(String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb, String zhfzxyrXb, String sjbq);
List getAjlb(String begin, String end, String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb, String zhfzxyrXb, String sjbq);
List getxb(String begin, String end, String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb, String zhfzxyrXb, String sjbq);
List getSjbq(String begin, String end, String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb, String zhfzxyrXb, String sjbq);
boolean updateSjbqByAsjbh(TbAsjAndZbFzXyrAndQgCkXx tbAsjAndZbFzXyrAndQgCkXx);
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TbStAsjAndXyrServiceImpl.java
......@@ -25,12 +25,48 @@ public class TbStAsjAndXyrServiceImpl implements TbStAsjAndXyrService {
@Override
public List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyr(String begin, String end, String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb) {
return asjXyrMapper.listAsjAndXyr(begin,end,zhfzxyrXm,zhfzxyrZjhm,sjaq,asjbh,ajlb);
public List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyr(String begin, String end, String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb,String zhfzxyrXb,String sjbq) {
return asjXyrMapper.listAsjAndXyr(begin,end,zhfzxyrXm,zhfzxyrZjhm,sjaq,asjbh,ajlb,zhfzxyrXb,sjbq);
}
@Override
public List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyrCount(String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb) {
return asjXyrMapper.listAsjAndXyrCount(zhfzxyrXm,zhfzxyrZjhm,sjaq,asjbh,ajlb);
public List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyrAll(String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb,String zhfzxyrXb,String sjbq) {
return asjXyrMapper.listAsjAndXyrAll(zhfzxyrXm,zhfzxyrZjhm,sjaq,asjbh,ajlb,zhfzxyrXb,sjbq);
}
@Override
public List<TbAsjAndZbFzXyrAndQgCkXx> listAsjAndXyrCount(String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb,String zhfzxyrXb,String sjbq) {
return asjXyrMapper.listAsjAndXyrCount(zhfzxyrXm,zhfzxyrZjhm,sjaq,asjbh,ajlb,zhfzxyrXb,sjbq);
}
@Override
public Integer listAsjAndXyrCounts(String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb,String zhfzxyrXb,String sjbq) {
return asjXyrMapper.listAsjAndXyrCounts(zhfzxyrXm,zhfzxyrZjhm,sjaq,asjbh,ajlb,zhfzxyrXb,sjbq);
}
@Override
public boolean updateSjbqByAsjbh(TbAsjAndZbFzXyrAndQgCkXx tbAsjAndZbFzXyrAndQgCkXx) {
return asjXyrMapper.updateSjbqByAsjbh(tbAsjAndZbFzXyrAndQgCkXx);
}
@Override
public List getAjlb(String begin, String end, String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb,String zhfzxyrXb,String sjbq){
return asjXyrMapper.getAjlb(begin,end,zhfzxyrXm,zhfzxyrZjhm,sjaq,asjbh,ajlb,zhfzxyrXb,sjbq);
}
@Override
public List getxb(String begin, String end, String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb,String zhfzxyrXb,String sjbq){
return asjXyrMapper.getxb(begin,end,zhfzxyrXm,zhfzxyrZjhm,sjaq,asjbh,ajlb,zhfzxyrXb,sjbq);
}
@Override
public List getSjbq(String begin, String end, String zhfzxyrXm, String zhfzxyrZjhm, String sjaq, String asjbh, String ajlb,String zhfzxyrXb,String sjbq){
return asjXyrMapper.getSjbq(begin,end,zhfzxyrXm,zhfzxyrZjhm,sjaq,asjbh,ajlb,zhfzxyrXb,sjbq);
}
}
serviceapi/carapi/src/main/java/com/founder/carapi/mapper/xml/RegInfoMapper.xml
......@@ -215,7 +215,7 @@
SELECT
r.xxzjbh as xxzjbh,
r.task_id as taskId,
r.object_value as object_value,
r.object_value as objectValue,
to_char(r.djsj,'yyyy-mm-dd hh24:mi:ss') as djsj,
r.X AS X,
r.Y AS Y,
......@@ -234,7 +234,7 @@
p.csrq as csrq
FROM TB_ST_REGIONALS_RESULT r,TB_ST_REGIONALS_detail d,TB_ST_REGIONALS_PERSON p
where r.XXZJBH = d.RESULT_ID
where r.XXZJBH = d.RESULT_ID(+)
and d.SFZHM = P.SFZHM(+)
<if test="taskId != null and taskId != ''">and r.task_Id = #{ taskId , jdbcType=VARCHAR }</if>
</select>
......
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