Skip to content

H
hnxtbaboot
Commit 636a3100 by yangliang
Options

添加人员采集右侧菜单完成状态以及未采集说明

parent 57e642e2
Showing with 108 additions and 107 deletions
src/main/java/com/founder/model/AutoTbRyZp.java
...@@ -51,6 +51,7 @@ public class AutoTbRyZp implements Serializable { ...@@ -51,6 +51,7 @@ public class AutoTbRyZp implements Serializable {
private String xzpp; private String xzpp;
private String xzcm; private String xzcm;
private String sfcj; private String sfcj;
private String sfts;
private String tmtzms; private String tmtzms;
public static long getSerialVersionUID() { public static long getSerialVersionUID() {
...@@ -273,6 +274,14 @@ public class AutoTbRyZp implements Serializable { ...@@ -273,6 +274,14 @@ public class AutoTbRyZp implements Serializable {
this.sfcj = sfcj; this.sfcj = sfcj;
} }
public String getSfts() {
return sfts;
}
public void setSfts(String sfts) {
this.sfts = sfts;
}
@Override @Override
public String toString() { public String toString() {
return "AutoTbRyZp{" + return "AutoTbRyZp{" +
......
src/main/java/com/founder/model/TbXwYthcjZj.java
...@@ -20,6 +20,7 @@ public class TbXwYthcjZj implements Serializable { ...@@ -20,6 +20,7 @@ public class TbXwYthcjZj implements Serializable {
public String xzpp;//鞋子品牌 public String xzpp;//鞋子品牌
public String xzcm;//鞋子尺码 public String xzcm;//鞋子尺码
public String sfcj;//是否残疾 public String sfcj;//是否残疾
public String sfts;//推送状态
public String sbxh;//设备型号 public String sbxh;//设备型号
public String gxsj;//更新时间 public String gxsj;//更新时间
public String cjsj;//创建时间 public String cjsj;//创建时间
...@@ -48,8 +49,6 @@ public class TbXwYthcjZj implements Serializable { ...@@ -48,8 +49,6 @@ public class TbXwYthcjZj implements Serializable {
public String cjtpxh; public String cjtpxh;
public String iftscg;
public String getXxzjbh() { public String getXxzjbh() {
return xxzjbh; return xxzjbh;
} }
...@@ -338,11 +337,11 @@ public class TbXwYthcjZj implements Serializable { ...@@ -338,11 +337,11 @@ public class TbXwYthcjZj implements Serializable {
this.cjtpxh = cjtpxh; this.cjtpxh = cjtpxh;
} }
public String getIftscg() { public String getSfts() {
return iftscg; return sfts;
} }
public void setIftscg(String iftscg) { public void setSfts(String sfts) {
this.iftscg = iftscg; this.sfts = sfts;
} }
} }
src/main/resources/mapper/TbRyRyzpSqlMapper.xml
...@@ -243,6 +243,7 @@ ...@@ -243,6 +243,7 @@
b.XZPP xzpp, b.XZPP xzpp,
b.XZCM xzcm, b.XZCM xzcm,
b.SFCJ sfcj, b.SFCJ sfcj,
b.SFTS sfts,
a.ryzpzs a.ryzpzs
from (select RYBH,count(rybh) as ryzpzs from TB_XW_YTHCJ_ZJ where RYBH = #{rybh} and (XXSC_PDBZ ='0' OR XXSC_PDBZ IS NULL) and dbms_lob.getlength(ZJSJ)>0 group by rybh) a,TB_XW_YTHCJ_ZJ b from (select RYBH,count(rybh) as ryzpzs from TB_XW_YTHCJ_ZJ where RYBH = #{rybh} and (XXSC_PDBZ ='0' OR XXSC_PDBZ IS NULL) and dbms_lob.getlength(ZJSJ)>0 group by rybh) a,TB_XW_YTHCJ_ZJ b
where a.rybh = b.rybh where a.rybh = b.rybh
...@@ -278,6 +279,7 @@ ...@@ -278,6 +279,7 @@
XZPP, XZPP,
XZCM, XZCM,
SFCJ, SFCJ,
SFTS,
XXDJRY_XM, XXDJRY_XM,
DJSJ, DJSJ,
XXDJDW_GAJGJGDM, XXDJDW_GAJGJGDM,
...@@ -307,6 +309,8 @@ ...@@ -307,6 +309,8 @@
<if test="entity.xzcm == null or entity.xzcm == ''">,NULL </if> <if test="entity.xzcm == null or entity.xzcm == ''">,NULL </if>
<if test="entity.sfcj != null and entity.sfcj != ''">, #{entity.sfcj , jdbcType=VARCHAR }</if> <if test="entity.sfcj != null and entity.sfcj != ''">, #{entity.sfcj , jdbcType=VARCHAR }</if>
<if test="entity.sfcj == null or entity.sfcj == ''">,NULL </if> <if test="entity.sfcj == null or entity.sfcj == ''">,NULL </if>
<if test="entity.sfts != null and entity.sfts != ''">, #{entity.sfts , jdbcType=VARCHAR }</if>
<if test="entity.sfts == null or entity.sfts == ''">,NULL </if>
<if test="entity.lrr != null and entity.lrr != ''">, #{entity.lrr , jdbcType=VARCHAR }</if> <if test="entity.lrr != null and entity.lrr != ''">, #{entity.lrr , jdbcType=VARCHAR }</if>
<if test="entity.lrr == null or entity.lrr == ''">,NULL </if> <if test="entity.lrr == null or entity.lrr == ''">,NULL </if>
<if test="entity.lrsj != null">, #{entity.lrsj , jdbcType=TIMESTAMP }</if> <if test="entity.lrsj != null">, #{entity.lrsj , jdbcType=TIMESTAMP }</if>
...@@ -373,6 +377,8 @@ ...@@ -373,6 +377,8 @@
<if test="entity.xzcm == null or entity.xzcm == ''">XZCM = NULL, </if> <if test="entity.xzcm == null or entity.xzcm == ''">XZCM = NULL, </if>
<if test="entity.sfcj != null and entity.sfcj != ''">SFCJ = #{entity.sfcj , jdbcType=VARCHAR },</if> <if test="entity.sfcj != null and entity.sfcj != ''">SFCJ = #{entity.sfcj , jdbcType=VARCHAR },</if>
<if test="entity.sfcj == null or entity.sfcj == ''">SFCJ = NULL, </if> <if test="entity.sfcj == null or entity.sfcj == ''">SFCJ = NULL, </if>
<if test="entity.sfts != null and entity.sfts != ''">SFTS = #{entity.sfts , jdbcType=VARCHAR },</if>
<if test="entity.sfts == null or entity.sfts == ''">SFTS = NULL, </if>
<if test="entity.dzwjnr != null and entity.dzwjnr != ''">ZJSJ= #{entity.dzwjnr , jdbcType=VARCHAR },</if> <if test="entity.dzwjnr != null and entity.dzwjnr != ''">ZJSJ= #{entity.dzwjnr , jdbcType=VARCHAR },</if>
<if test="entity.dzwjnr == null or entity.dzwjnr == ''">ZJSJ=NULL, </if> <if test="entity.dzwjnr == null or entity.dzwjnr == ''">ZJSJ=NULL, </if>
<if test="entity.gxsj != null">gxsj=#{entity.gxsj , jdbcType=TIMESTAMP },</if> <if test="entity.gxsj != null">gxsj=#{entity.gxsj , jdbcType=TIMESTAMP },</if>
......
src/main/resources/templates/khtj/cxlist.html
...@@ -82,7 +82,17 @@ ...@@ -82,7 +82,17 @@
}}, }},
{title:"姓名",field:"xm",align:'left',width:120}, {title:"姓名",field:"xm",align:'left',width:120},
{title:"性别",field:"xbdm",align:'left',width:80}, {title:"性别",field:"xbdm",align:'left',width:80},
{title:"证件号码",field:"gmsfhm",align:'left',width:200}, {title:"证件号码",field:"gmsfhm",align:'left',width:200,formatter:function(val,row,index){
var gmsfhm=row.gmsfhm;
var zjhm=row.zjhm;
var rstStr;
if(gmsfhm==null||gmsfhm==""){
rstStr = zjhm;
}else{
rstStr = gmsfhm;
}
return rstStr;
}},
{title:"指纹编号",field:"szzwbh",align:'left',width:220}, {title:"指纹编号",field:"szzwbh",align:'left',width:220},
{title:"平面指纹",field:"pmzw",align:'center',color:'gree',width:90,formatter:function(val,row,index){ {title:"平面指纹",field:"pmzw",align:'center',color:'gree',width:90,formatter:function(val,row,index){
var zwfkxx=row.zwfkxx; var zwfkxx=row.zwfkxx;
......
src/main/resources/templates/khtj/sjlist.html
...@@ -82,7 +82,17 @@ ...@@ -82,7 +82,17 @@
}}, }},
{title:"姓名",field:"xm",align:'left',width:120}, {title:"姓名",field:"xm",align:'left',width:120},
{title:"性别",field:"xbdm",align:'left',width:80}, {title:"性别",field:"xbdm",align:'left',width:80},
{title:"证件号码",field:"gmsfhm",align:'left',width:150}, {title:"证件号码",field:"gmsfhm",align:'left',width:150,formatter:function(val,row,index){
var gmsfhm=row.gmsfhm;
var zjhm=row.zjhm;
var rstStr;
if(gmsfhm==null||gmsfhm==""){
rstStr = zjhm;
}else{
rstStr = gmsfhm;
}
return rstStr;
}},
{title:"是否有手机",field:"szzwbh",align:'left',width:60,formatter:function(val,row,index){ {title:"是否有手机",field:"szzwbh",align:'left',width:60,formatter:function(val,row,index){
var sjbs=row.sjbs; var sjbs=row.sjbs;
var rstStr=""; var rstStr="";
......
src/main/resources/templates/rygl/addryxx.html
...@@ -1251,6 +1251,7 @@ ...@@ -1251,6 +1251,7 @@
}else{ }else{
ifsj=data.sjcjycode; ifsj=data.sjcjycode;
} }
debugger;
if(data.ifswcjy=="否"){ if(data.ifswcjy=="否"){
$("#sw").find("a").removeAttr("href"); $("#sw").find("a").removeAttr("href");
$("#sw").find("a").removeAttr("onclick"); $("#sw").find("a").removeAttr("onclick");
...@@ -1334,106 +1335,65 @@ ...@@ -1334,106 +1335,65 @@
$("#swifcj").attr("src","/static/rygl/img/yes.png"); $("#swifcj").attr("src","/static/rygl/img/yes.png");
} }
debugger; debugger;
var csrq = $("#csrqQsrq").val();
const obj = { if($("#gmsfhm").val()!=null&&$("#gmsfhm").val()!=''&&$("#gmsfhm").val()!="无"){
type: "fz", csrq = $("#gmsfhm").val().substr(6,4)+"-"+$("#gmsfhm").val().substr(10,2)+"-"+$("#gmsfhm").val().substr(12,2);
param: { }
/** 给定数据唯一id 任意格式，String */ debugger;
id: $("#rybh").val(), if(ifsw=="1"){
userInfo: { var str = "audiocapture:{"
/** 姓名 */ +"'personNo':'"+$("#rybh").val()+"'"
name: $("#xm").val(), +",'personName':'"+$("#xm").val()+"'"
/** 性别 */ +",'cardTypeNo':'111'"
sex: $("#xbdm").val(), +",'cardNum':'"+$("#gmsfhm").val()+"'"
/** 证件类型 */ +",'birthday':'"+csrq+"'"
cardtype: "111", +",'nationalityNo':'CHN'"
/** 证件号码 */ +",'sexNo':'"+$("#xbdm").combobox("getValue")+"'"
idCode: $("#gmsfhm").val(), +",'ethniciNo':'"+$("#mzdm").combobox("getValue")+"'"
/** 人员类别 */ +",'schoolingNo':'"+$("#xldm").combobox("getValue")+"'"
personType: "01", +",'phoneNum':'"+$("#lxdm").val()+"'"
/** 人员编号 */ +",'birthAddrNo':'"+$("#hjdzXzqhdm").combobox("getValue")+"'"
personNo: $("#rybh").val(), +",'residenceAddr':'"+$("#xzzDzmc").val()+"'"
+",'hometownAddr':'"+$("#hjdzDzmc").val()+"'"
+",'caseTypeNo':'"+$("#ajlbdm").combobox("getValue")+"'"
+",'personTypeNo':'01'"
+",'remark':''"
+",'collectorName':'"+$("#zwcjr").val()+"'"
+"}";//长度最多400,超过会调用不了
window.location.href = str;
}else{
const obj = {
type: "fz",
param: {
/** 给定数据唯一id 任意格式，String */
id: $("#rybh").val(),
userInfo: {
/** 姓名 */
name: $("#xm").val(),
/** 性别 */
sex: $("#xbdm").val(),
/** 证件类型 */
cardtype: "111",
/** 证件号码 */
idCode: $("#gmsfhm").val(),
/** 人员类别 */
personType: "01",
/** 人员编号 */
personNo: $("#rybh").val(),
},
extrainfo: {
/** 采集人 */
collector: $("#zwcjrStr").val(),
},
caseInfo: {},
}, },
extrainfo: { other: {
/** 采集人 */ uploadUrl: "http://127.0.0.1:9200/getSwSjXx",
collector: $("#zwcjrStr").val(),
}, },
caseInfo: {}, };
}, window.location.href = encodeURI(`audio-capture://${JSON.stringify(obj)}`);
other: { }
uploadUrl: "http://127.0.0.1:9200/getSwSjXx",
},
};
window.location.href = encodeURI(`audio-capture://${JSON.stringify(obj)}`);
//let obj = {
//// "type":"fz",
// "id":$("#rybh").val(),
// "name":$("#xm").val(),
/// "uploadUrl":"http://127.0.0.1:9200/getSwSjXx"
//}
/*
var o={};
o["type"] = "fz";
o["no"] = $("#rybh").val();
o["cardTypeNo"] = "111";
o["birthLocation"] = $("#csdXzqhdm").val();
o["birthLocationDic"] = $("#csdDzmc").val();
o["birthday"] = "";
o["ethnic"] = $("#mzdm").val();
o["homeTown"] = $("#hjdzXzqhdm").val();
o["idNumber"] = $("#gmsfhm").val();
o["nationality"] = "CHN";
o["personName"] = $("#xm").val();
o["phone"] = $("#lxdm").val();
o["residenceAddr"] = $("#xzzXzqhdm").val();
o["residenceAddrDesc"] = $("#xzzDzmc").val();
o["schooling"] = $("#xldm").val();
o["sex"] = $("#xbdm").val();
o["remark"] = "";
o["caseTypeName"] = "";
o["personTypes"] = "01";
o["collectorName"] = $("#zwcjrStr").val();
o["uploadUrl"] = "http://127.0.0.1:9200/getSwSjXx";
var val = "audio-capture:"+JSON.stringify(o).replace(/\"/g,"\\\"")
window.location.href = val;
console.log(Object.keys(obj));
var str = "audio-capture:{"
+",'type':'fz'"
+"'id':'"+$("#rybh").val()+"'"
+",'name':'"+$("#xm").val()+"'"
+",'uploadUrl':'http://127.0.0.1:9200/saveSwSjXx'"
+"}";
var str = "audio-capture:{"
+"'no':'"+$("#rybh").val()+"'"
+",'cardTypeNo':'"+$("#cyzjdm").combobox("getValue")+"'"
+",'birthLocation':'"+$("#csdXzqhdm").combobox("getValue")+"'"
+",'birthLocationDic':'"+$("#csdDzmc").val()+"'"
+",'birthday':'"+$("#csrqQsrq").val()+"'"
+",'ethnic':'"+$("#mzdm").combobox("getValue")+"'"
+",'homeTown':'"+$("#jgssxdm").combobox("getValue")+"'"
+",'idNumber':'"+$("#gmsfhm").val()+"'"
+",'nationality':'"+$("#gjdm").combobox("getValue")+"'"
+",'personName':'"+$("#xm").val()+"'"
+",'phone':'"+$("#lxdm").val()+"'"
+",'profession':'"+$("#zylbdm").combobox("getValue")+"'"
+",'residenceAddr':'"+$("#xzzXzqhdm").combobox("getValue")+"'"
+",'residenceAddrDesc':'"+$("#xzzDzmc").val()+"'"
+",'schooling':'"+$("#xldm").combobox("getValue")+"'"
+",'sex':'"+$("#xbdm").combobox("getValue")+"'"
+",'remark':''"
+",'caseTypeName':'"+$("#ajlbdm").combobox("getValue")+"'"
+",'personTypes':'01'"
+",'collectorName':'"+$("#zwcjr").val()+"'"
+"}";//长度最多400,超过会调用不了
window.location.href = str;
*/
} }
......
src/main/resources/templates/rygl/ryxxlist.html
...@@ -342,6 +342,7 @@ ...@@ -342,6 +342,7 @@
}else{ }else{
rstStr = gmsfhm; rstStr = gmsfhm;
} }
return rstStr;
}}, }},
{title:"指纹编号",field:"szzwbh",align:'left',width:220}, {title:"指纹编号",field:"szzwbh",align:'left',width:220},
{title:"平面指纹",field:"pmzw",align:'center',color:'gree',width:90,formatter:function(val,row,index){ {title:"平面指纹",field:"pmzw",align:'center',color:'gree',width:90,formatter:function(val,row,index){
......
src/main/resources/templates/zjcj/zjcj.html
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<input id="xm" name="xm" class="xm" type="hidden" th:value="${xm}"> <input id="xm" name="xm" class="xm" type="hidden" th:value="${xm}">
<input id="zjhm" name="gmsfhm" class="zjhm" type="hidden" th:value="${zjhm}"> <input id="zjhm" name="gmsfhm" class="zjhm" type="hidden" th:value="${zjhm}">
<input id="sbxh" name="sbxh" class="sbxh" type="hidden"> <input id="sbxh" name="sbxh" class="sbxh" type="hidden">
<input id="type" name="type" class="type" type="hidden" th:value="${type}">
<input id="cjtpxh" name="cjtpxh" class="cjtpxh" type="hidden" value=""> <input id="cjtpxh" name="cjtpxh" class="cjtpxh" type="hidden" value="">
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
<!--人员基本信息--> <!--人员基本信息-->
<div style="width: 100%;"> <div style="width: 100%;">
<p class="div_title" style="width: 80%;"><img src="zjcj/images/jc-icon.png" class="jc-icon" />人员编号：<span th:text="${rybh}"></span>&nbsp;&nbsp;姓名：<span th:text="${xm}"></span>&nbsp;&nbsp;身份证号：<span th:text="${zjhm}"></span></p> <p class="div_title" style="width: 80%;"><img src="zjcj/images/jc-icon.png" class="jc-icon" />人员编号：<span th:text="${rybh}"></span>&nbsp;&nbsp;姓名：<span th:text="${xm}"></span>&nbsp;&nbsp;身份证号：<span th:text="${zjhm}"></span>&nbsp;&nbsp;&nbsp;&nbsp;<span id="iftstext" style="color: red"></span></p>
<button type="button" onclick="toSave()" style="float: right; height: 40px;margin-top: -30px;width: 100px;height:36px;line-height:36px;border-radius: 5px;border: 1px solid #fff;background:-webkit-linear-gradient(#b7b3b3,#b1b1b1,#828282);cursor: pointer;color:#fff;border: 1px solid #fff;background:-webkit-linear-gradient(#1713ec,#7972e6,#0000f7);color:#fff;"><span>信息保存</span></button> <button type="button" onclick="toSave()" style="float: right; height: 40px;margin-top: -30px;width: 100px;height:36px;line-height:36px;border-radius: 5px;border: 1px solid #fff;background:-webkit-linear-gradient(#b7b3b3,#b1b1b1,#828282);cursor: pointer;color:#fff;border: 1px solid #fff;background:-webkit-linear-gradient(#1713ec,#7972e6,#0000f7);color:#fff;"><span>信息保存</span></button>
<div class="condition"> <div class="condition">
<table style="width:100%;border:none;border-collapse: collapse;text-align:left;" class="cx_table_tj zjxxcjTable"> <table style="width:100%;border:none;border-collapse: collapse;text-align:left;" class="cx_table_tj zjxxcjTable">
...@@ -374,7 +375,12 @@ ...@@ -374,7 +375,12 @@
function addZjzpimg() {//初始化数据 function addZjzpimg() {//初始化数据
debugger;
var type = $("#type").val();
if (type != null && type == "1") {
}else{
$("#iftstext").text("（信息推送至足迹系统失败）");
}
var isflag = $("#isflag").val(); var isflag = $("#isflag").val();
if (isflag != null && isflag == "1") { if (isflag != null && isflag == "1") {
$.messager.alert("提示","信息保存成功！"); $.messager.alert("提示","信息保存成功！");
......
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