Skip to content

H
hnxtbaboot
Commit c6de5609 by yangliang
Options

Merge branch 'ythcj_hainan' of http://39.99.224.27:9022/yangliang/hnxtbaboot into ythcj_hainan

parents 906088e2 b9b0e877
Showing with 87 additions and 65 deletions
src/main/java/com/founder/cjqx/controller/SysClientVpController.java
......@@ -105,9 +105,9 @@ public class SysClientVpController {
sysClientVp.setZrmjjh(user.getPolicemanid());
}
//添加最近更新时间默认值
if(StringUtils.isBlank(sysClientVp.getGxsjStr())){
sysClientVp.setGxsjStr("4");
}
// if(StringUtils.isBlank(sysClientVp.getGxsjStr())){
// sysClientVp.setGxsjStr("4");
// }
//ip mac 加密 查询条件加密
if(sysClientVp.getIp()!=null&&!sysClientVp.getIp().equals("")){
sysClientVp.setIp(xzxtencode(sysClientVp.getIp()));
......
src/main/resources/mapper/KhtjDao.xml
......@@ -73,6 +73,7 @@
<result column="JYAQ" property="jyaq" jdbcType="VARCHAR"/>
<result column="LRR" property="lrr" jdbcType="VARCHAR"/>
<result column="LRDWDM" property="lrdwdm" jdbcType="VARCHAR"/>
<result column="LRDWMC" property="lrdwmc" jdbcType="VARCHAR"/>
<result column="LRSJ" property="lrsj" jdbcType="TIMESTAMP"/>
<result column="GXSJ" property="gxsj" jdbcType="TIMESTAMP"/>
<result column="JZRYBH" property="jzrybh" jdbcType="VARCHAR"/>
......@@ -528,6 +529,7 @@
TB_RY_RYCJ.SCBZ,
(select name from sys_dictitem s where s.groupid='CODE_XB' and s.code = TB_RY_RYCJ.XBDM) as XBDM,
(select name from sys_dictitem s where s.groupid='CODE_UNIT' and s.code = TB_RY_RYCJ.ZWCJDWDM) as ZWCJDWDM,
(select name from sys_dictitem s where s.groupid='CODE_UNIT' and s.code = TB_RY_RYCJ.LRDWDM) as LRDWMC,
to_char(TB_RY_RYCJ.ZWCJSJ,'YYYY-MM-DD') ZWCJSJSTR,
AFIS_QUALITY_CK.R_GDZW,AFIS_QUALITY_CK.R_WZXX,AFIS_QUALITY_CK.R_PMZW,AFIS_QUALITY_CK.R_RX,AFIS_QUALITY_CK.BZ,AFIS_QUALITY_CK.JCJG
from TB_RY_RYCJ,AFIS_QUALITY_CK where TB_RY_RYCJ.RYBH=AFIS_QUALITY_CK.R_RYBH(+) AND (TB_RY_RYCJ.SCBZ='0' or TB_RY_RYCJ.SCBZ is null) AND (IFHB<![CDATA[<>]]>'1' OR IFHB IS NULL)
......
src/main/resources/mapper/SysClientVpMapper.xml
......@@ -436,40 +436,49 @@
<select id="selectsbztPageList" parameterType="com.founder.model.SysClientVp" resultMap="BaseResultMap">
SELECT *
FROM (select a.*,ROWNUM as rn
from (select t.ycs as ZWCJY_NAME,
t.rylrsj,
(select name from SYS_DICTITEM where code = t.LRDWDM and GROUPID = 'CODE_UNIT') as SSDW_NAME,
(select TRUE_NAME from SYS_USER where USERNAME = ry.LRR) as IFYTHCJY
from (select LRDWDM, count(*) as ycs, max(LRSJ) as rylrsj
from tb_ry_rycj
where scbz = '0'
from (
select ry.ycs as ZWCJY_NAME,
vp.ips as ip,
NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) as rylrsj,
vp.SSDW_NAME as SSDW_NAME,
(select TRUE_NAME from SYS_USER where USERNAME = (select s.lrr from TB_RY_RYCJ s where s.lrsj =ry.RYLRSJ and s.ip=ry.IP)) as IFYTHCJY
from (select PP.LRSJ, (select name from SYS_DICTITEM where code = pp.ssdw_code and GROUPID = 'CODE_UNIT') as SSDW_NAME, substr((select utl_raw.cast_to_varchar2(utl_encode.base64_decode(
utl_raw.cast_to_raw(utl_raw.cast_to_varchar2(
utl_encode.base64_decode(utl_raw.cast_to_raw(pp.IP)))))) as ip
from dual), 1, instr((select utl_raw.cast_to_varchar2(
utl_encode.base64_decode(
utl_raw.cast_to_raw(
utl_raw.cast_to_varchar2(
utl_encode.base64_decode(utl_raw.cast_to_raw(pp.IP)))))) as ip
from dual), '{') - 1) as ips from Sys_Client_Vp pp where pp.scbz ='0'
<if test="ssdwcode!=null and ssdwcode !=''">
and LRDWDM like #{ssdwcode}||'%'
and pp.ssdw_code like #{ssdwcode}||'%'
</if>
group by LRDWDM) t,
TB_RY_RYCJ ry
where t.LRDWDM = ry.LRDWDM(+)
and t.rylrsj = ry.LRSJ
<if test="sbztstr!=null and sbztstr==1">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
order by ip) vp LEFT JOIN
(select ip, count(*) as ycs, max(LRSJ) as rylrsj
from tb_ry_rycj
where scbz = '0'
and ip is not null
group by ip
) ry ON vp.IPS = ry.ip
where 1=1
<if test="sbztstr!=null and sbztstr!='' and sbztstr==1">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="sbztstr!=null and sbztstr==2">
AND t.rylrsj <![CDATA[ < ]]> SYSDATE - 7
<if test="sbztstr!=null and sbztstr!='' and sbztstr==2">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ < ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==1">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
<if test="gxsjStr!=null and sbztstr!='' and gxsjStr==1">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==2">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 30
<if test="gxsjStr!=null and gxsjStr!='' and gxsjStr==2">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ >= ]]> SYSDATE - 30
</if>
<if test="gxsjStr!=null and gxsjStr==3">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 120
<if test="gxsjStr!=null and gxsjStr!='' and gxsjStr==3">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ >= ]]> SYSDATE - 120
</if>
<if test="gxsjStr!=null and gxsjStr==4">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 180
<if test="gxsjStr!=null and gxsjStr!='' and gxsjStr==4">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ >= ]]> SYSDATE - 180
</if>
order by rylrsj desc) a
......@@ -479,44 +488,47 @@
</select>
<!-- 通过条件分页查询，返回总记录数 人员录入时间 -->
<select id="selectsbztPageCount" parameterType="com.founder.model.SysClientVp" resultType="java.lang.Integer">
SELECT count(rn) FROM
(
select
ROWNUM as rn
from (
select LRDWDM, count(*) as ycs, max(LRSJ) as rylrsj
from tb_ry_rycj
where scbz = '0'
select count(*)
from (select pp.lrsj, substr((select utl_raw.cast_to_varchar2(utl_encode.base64_decode(
utl_raw.cast_to_raw(utl_raw.cast_to_varchar2(
utl_encode.base64_decode(utl_raw.cast_to_raw(pp.IP)))))) as ip
from dual), 1, instr((select utl_raw.cast_to_varchar2(
utl_encode.base64_decode(
utl_raw.cast_to_raw(
utl_raw.cast_to_varchar2(
utl_encode.base64_decode(utl_raw.cast_to_raw(pp.IP)))))) as ip
from dual), '{') - 1) as ips from Sys_Client_Vp pp where pp.scbz ='0'
<if test="ssdwcode!=null and ssdwcode !=''">
and LRDWDM like #{ssdwcode}||'%'
and pp.ssdw_code like #{ssdwcode}||'%'
</if>
group by LRDWDM
) t,
TB_RY_RYCJ ry
where t.LRDWDM = ry.LRDWDM(+)
and t.rylrsj = ry.LRSJ
<if test="sbztstr!=null and sbztstr==1">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
order by ip) vp LEFT JOIN
(select ip, count(*) as ycs, max(LRSJ) as rylrsj
from tb_ry_rycj
where scbz = '0'
and ip is not null
group by ip
) ry ON vp.IPS = ry.ip
where 1=1
<if test="sbztstr!=null and sbztstr!='' and sbztstr==1">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="sbztstr!=null and sbztstr==2">
AND t.rylrsj <![CDATA[ < ]]> SYSDATE - 7
<if test="sbztstr!=null and sbztstr!='' and sbztstr==2">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ < ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==1">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
<if test="gxsjStr!=null and sbztstr!='' and gxsjStr==1">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==2">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 30
<if test="gxsjStr!=null and gxsjStr!='' and gxsjStr==2">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ >= ]]> SYSDATE - 30
</if>
<if test="gxsjStr!=null and gxsjStr==3">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 120
<if test="gxsjStr!=null and gxsjStr!='' and gxsjStr==3">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ >= ]]> SYSDATE - 120
</if>
<if test="gxsjStr!=null and gxsjStr==4">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 180
<if test="gxsjStr!=null and gxsjStr!='' and gxsjStr==4">
AND NVL2(ry.RYLRSJ, ry.RYLRSJ,vp.LRSJ) <![CDATA[ >= ]]> SYSDATE - 180
</if>
)
</select>
......
src/main/resources/templates/cjqx/sbjkglform.html
......@@ -210,10 +210,10 @@
<div class="layui-input-block">
<select name="gxsjStr" id="gxsjStr">
<option value="">请选择</option>
<option value="1">7天</option>
<option value="1" th:selected="true">7天</option>
<option value="2">一个月</option>
<option value="3">三个月</option>
<option value="4" th:selected="true">半年</option>
<option value="4" >半年</option>
</select>
</div>
</div>
......@@ -338,6 +338,7 @@
// { field:'spzt',fixed: 'left',title:'操作',align:'center', width:'10%',toolbar: '#toolbarDemo'}
{type: 'numbers', width: '5%', title: '序号', align: 'center'}
, {field: 'ssdwname', width: '20%', title: '采集单位', align: 'center'}
,{field:'ip', title:'IP地址',align:'center', width:'15%'}
, {
field: 'rylrsj',
width: '20%',
......@@ -345,12 +346,11 @@
align: 'center',
templet: "<div>{{layui.util.toDateString(d.rylrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"
}
, {field: 'ifythcjy', width: '20%', title: '最近操作人', align: 'center'}
, {field: 'ifythcjy', width: '10%', title: '最近操作人', align: 'center'}
, {field: 'zwcjyname', width: '5%', title: '采集数', align: 'center'}
// ,{field:'ip', title:'IP地址',align:'center', width:'15%'}
, {field: 'sbztstr', width: '10%', title: '最近使用状态', align: 'center', templet: '#ifsbzt'}
, {field: 'bz', width: '20%', title: '备注', align: 'center'}
, {field: 'bz', width: '15%', title: '备注', align: 'center'}
// ,{field:'spzt', title:'审批状态',align:'center', width:'15%',templet: '#ifspzt'}
/* ,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo', width:140}
......
src/main/resources/templates/rygl/demo.html
......@@ -40,6 +40,14 @@
window.parent.document.getElementById("imghead32").src=document.getElementById("thisimg").src;
window.parent.document.getElementById("tstz2Base64").value=tishixingxi;
window.parent.document.getElementById("tstzflag2").value="0";
}else if(zpbw==41){
window.parent.document.getElementById("imghead41").src=document.getElementById("thisimg").src;
window.parent.document.getElementById("bj1Base64").value=tishixingxi;
window.parent.document.getElementById("bjflag1").value="0";
}else if(zpbw==42){
window.parent.document.getElementById("imghead42").src=document.getElementById("thisimg").src;
window.parent.document.getElementById("bj2Base64").value=tishixingxi;
window.parent.document.getElementById("bjflag2").value="0";
}
}
function cjwc() {
......
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