Skip to content

H
hnxtbaboot
Commit 0f7aadb6 by yangliang
Options

海南一体化采集修改BUG

parent bd8acd5a
Showing with 72 additions and 44 deletions
src/main/java/com/founder/model/AutoTbStRy.java
......@@ -188,6 +188,7 @@ public class AutoTbStRy implements Serializable {
private String RGdzw; //滚动指纹检查结果
private String RZw; //掌纹检查结果
private String RRx; //人像检查结果
private String RZj; //足迹检查结果
private String bz; //录入时间
private String rysx; //录入时间
private String zjleftxxbh;//左足图片信息编号
......@@ -1728,4 +1729,36 @@ public class AutoTbStRy implements Serializable {
public void setTssfdmStr(String tssfdmStr) {
this.tssfdmStr = tssfdmStr;
}
public String getRZj() {
return RZj;
}
public void setRZj(String RZj) {
this.RZj = RZj;
}
public String getThjl() {
return thjl;
}
public void setThjl(String thjl) {
this.thjl = thjl;
}
public String getDxjl() {
return dxjl;
}
public void setDxjl(String dxjl) {
this.dxjl = dxjl;
}
public String getXnsf() {
return xnsf;
}
public void setXnsf(String xnsf) {
this.xnsf = xnsf;
}
}
\ No newline at end of file
src/main/resources/mapper/AutoTbXwRycjSqlMap.xml
......@@ -93,6 +93,8 @@
<result column="R_WZXX" property="RWzxx" jdbcType="VARCHAR"/>
<result column="R_PMZW" property="RPmzw" jdbcType="VARCHAR"/>
<result column="R_RX" property="RRx" jdbcType="VARCHAR"/>
<result column="R_ZW" property="RZw" jdbcType="VARCHAR"/>
<result column="R_ZJ" property="RZj" jdbcType="VARCHAR"/>
<result column="BZ" property="bz" jdbcType="VARCHAR"/>
<result column="JCJG" property="jcjg" jdbcType="VARCHAR"/>
<result column="SJJBXX" property="sjjbxx" jdbcType="VARCHAR"/>
......@@ -197,7 +199,7 @@
(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,
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
AFIS_QUALITY_CK.R_GDZW,AFIS_QUALITY_CK.R_WZXX,AFIS_QUALITY_CK.R_PMZW,AFIS_QUALITY_CK.R_RX,AFIS_QUALITY_CK.R_ZW,AFIS_QUALITY_CK.R_ZJ,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)
<if test="lrdwdm != null and lrdwdm != ''">
and LRDWDM like #{entity.lrdwdm , jdbcType=VARCHAR }||'%'
......
src/main/resources/mapper/SsxdwpCjSqlMapper.xml
......@@ -72,7 +72,7 @@
RYBH,
WPBH,
XDWP_WPLXDM,
(select name from sys_dictitem s where s.groupid='CODE_SAWP' and s.code = wp.XDWP_WPLXDM) as xdwp_wplxdmStr,
(select name from sys_dictitem s where s.groupid='CODE_SAWPFL' and s.code = wp.XDWP_WPLXDM) as xdwp_wplxdmStr,
XDWP_WPMC,
XDWP_PPXH,
XDWP_ZP,
......
src/main/resources/static/xtba/zljc/js/zljc.js
......@@ -167,14 +167,14 @@ function updatejcjg(wzxx,gdzw,pmzw,rx,zw,zj){
addClassChangeBhg("pmzh",pmzws[8]);
addClassChangeBhg("pmzx",pmzws[9]);
}
//if(zw!=null&&zw!=""&&zw.length>=3){
// addClassChangeBhg("zszw",zws[0]);
// addClassChangeBhg("yszw",zws[1]);
//}
//if(zj!=null&&zj!=""&&zj.length>=3){
// addClassChangeBhg("zz",zjs[0]);
// addClassChangeBhg("yz",zjs[1]);
//}
if(zw!=null&&zw!=""&&zw.length>=3){
addClassChangeBhg("zszw",zws[0]);
addClassChangeBhg("yszw",zws[1]);
}
if(zj!=null&&zj!=""&&zj.length>=3){
addClassChangeBhg("zz",zjs[0]);
addClassChangeBhg("yz",zjs[1]);
}
}
......@@ -440,21 +440,21 @@ function changeJcjg(name,num){
$("#RPmzw").val((pmzw.substring(0,18))+num);
}
//else if(name=="zszw"){
// var zw= $("#RZw").val();
// $("#RZw").val(num+(zw.substring(1,zw.length)));
//}else if(name=="yszw"){
// var zw= $("#RZw").val();
// $("#RZw").val((zw.substring(0,2))+num);
//}
else if(name=="zszw"){
var zw= $("#RZw").val();
$("#RZw").val(num+(zw.substring(1,zw.length)));
}else if(name=="yszw"){
var zw= $("#RZw").val();
$("#RZw").val((zw.substring(0,2))+num);
}
//else if(name=="zz"){
// var zj= $("#RZj").val();
// $("#RZj").val(num+(zj.substring(1,zj.length)));
//}else if(name=="yz"){
// var zj= $("#RZj").val();
// $("#RZj").val((zj.substring(0,2))+num);
//}
else if(name=="zz"){
var zj= $("#RZj").val();
$("#RZj").val(num+(zj.substring(1,zj.length)));
}else if(name=="yz"){
var zj= $("#RZj").val();
$("#RZj").val((zj.substring(0,2))+num);
}
}
var BARCODE;
......@@ -493,7 +493,7 @@ function saveZljc(jcjg){
$("#jcjg").val(jcjg);
var clue = jcjg=="0"?"合格":"不合格";
if(jcjg=="0"){
if(wzxx!="1"||gdzw!="1-1-1-1-1-1-1-1-1-1"||pmzw!="1-1-1-1-1-1-1-1-1-1"||rx!="1-1-1"){
if(wzxx!="1"||gdzw!="1-1-1-1-1-1-1-1-1-1"||pmzw!="1-1-1-1-1-1-1-1-1-1"||rx!="1-1-1"||zw!="1-1"||zj!="1-1"){
$.messager.alert( '提示',"存在不合格的信息，请确保所有项合格后再标记合格！");
return;
}
......
src/main/resources/templates/rygl/addryxx.html
......@@ -1297,7 +1297,7 @@
if(status == "success"){
rs = rstemp.apiReturn;
}else{
alert("打印指纹卡信息失败，错误状态："+status);
//alert("打印指纹卡信息失败，错误状态："+status);
rs = "";
}
},
......
src/main/resources/templates/sswp/addsswpxx.html
......@@ -67,7 +67,7 @@
<td class="ar">物品类型：</td>
<td>
<span class="textbox-wrap">
<input type="text" style="height: 30px;width: 100%;" id="xdwp_wplxdm" name="xdwp_wplxdm" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_SAWP',method:'get',textField : 'text', valueField : 'id'"/>
<input type="text" style="height: 30px;width: 100%;" id="xdwp_wplxdm" name="xdwp_wplxdm" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_SAWPFL',method:'get',textField : 'text', valueField : 'id'"/>
<input type="hidden" id="xdwp_wplxdmStr" th:value="${ssxdwp.xdwp_wplxdm}"/>
</span>
</td>
......
src/main/resources/templates/yhkcj/addyhkxx.html
......@@ -115,7 +115,7 @@
<td class="ar">发卡地区：</td>
<td>
<span class="textbox-wrap">
<input type="text" style="height: 30px;width: 100%;" id="fkdq" name="fkdq" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_SAWP',method:'get',textField : 'text', valueField : 'id'"/>
<input type="text" style="height: 30px;width: 100%;" id="fkdq" name="fkdq" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_XZQH',method:'get',textField : 'text', valueField : 'id'"/>
<input type="hidden" id="fkdqStr" th:value="${yhkxx.fkdq}"/>
</span>
</td>
......@@ -188,7 +188,7 @@ $(function(){
editData();
doQuery();
})
openCombotree('fkdq');
//保存和更新
function toSave(){
//var num=avalidate();
......
src/main/resources/templates/zljc/zljc.html
......@@ -31,10 +31,8 @@
<li><a><span class="menu-span-s">右手指纹</span></a></li>
</ul>
</li>
<!--
<li><a class="menu-a"><i class="fa fa-hand-paper-o fa-new"></i><span class="menu-span">掌纹</span></a> </li>
<li><a class="menu-a"><i class="fa fa-street-view fa-new"></i><span class="menu-span">足迹</span></a> </li>
-->
<li class="last">顶部</li>
</ul>
</div>
......@@ -535,7 +533,7 @@
</div>
</div>
<!--掌纹
<!--掌纹-->
<div class="zljc-list">
<p class="div_title"><img src="static/xtba/zljc/images/jc-icon.png" class="jc-icon" />掌纹</p>
<div class="condition" id="layer-photos-zw">
......@@ -567,8 +565,8 @@
</div>
</div>
</div>
-->
<!--足迹
<!--足迹-->
<div class="zljc-list">
<p class="div_title"><img src="static/xtba/zljc/images/jc-icon.png" class="jc-icon" />足迹</p>
<div class="condition" id="layer-photos-zj">
......@@ -598,7 +596,7 @@
</div>
</div>
</div>
-->
<table style="width:100%;">
<tr>
<td class="" style="text-align: right; width: 81px;">备注</td>
......@@ -687,13 +685,8 @@
<td id="pmy4"><span class="bhg-span-c">不完整</span></td>
<td id="pmy5"><span class="bhg-span-c">不清晰</span></td>
</tr>
<tr>
<th class="btx"><span class="required">*</span>不合格原因</th>
<td colspan="8"><textarea id="bzs" rows="1"></textarea></td>
</tr>
</tbody>
</table>
<!--
<table class="zzw-table">
<caption>掌纹</caption>
<thead>
......@@ -733,7 +726,6 @@
</tr>
</tbody>
</table>
-->
</div>
</div>
</div>
......@@ -819,8 +811,8 @@
getPmImage($("#szzwbhStr").val(),"8");
getPmImage($("#szzwbhStr").val(),"9");*/
getPmImage($("#szzwbhStr").val(),$("#rybhStr").val(),$("#zjhmStr").val());
//getZmzwImage($("#szzwbhStr").val());
//getZjImage($("#rybhStr").val(),$("#zjhmStr").val());
getZmzwImage($("#szzwbhStr").val());
getZjImage($("#rybhStr").val(),$("#zjhmStr").val());
var wzxxjg = $("#wzxxStr").val();
if(wzxxjg==null||wzxxjg==""){
wzxxjg = $("#wzxx").val();
......@@ -1008,7 +1000,7 @@
}
}
}
if(key=="21") {
if(key=="12") {
var gdxdhw_y = data[key];
if (gdxdhw_y != null && gdxdhw_y != "") {
if (gdxdhw_y.indexOf("data:img/jpg;base64") >= 0) {
......
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