Commit 7847c16e by yangliang

修改

parent ea9daa96
......@@ -5,6 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableAsync;
import javax.servlet.annotation.MultipartConfig;
......@@ -14,7 +15,7 @@ import javax.servlet.MultipartConfigElement;
/**
* 项目运行启动类
*/
@EnableAsync
@SpringBootApplication
@EnableCaching
public class XtbaBootApplication {
......
......@@ -17,7 +17,7 @@ public class FilterConfig extends WebMvcConfigurerAdapter {
//
registry.addInterceptor(InterceptorConfig).
addPathPatterns("/**").
excludePathPatterns("/","/toLogin","/hncsLogin","/hnzzLogin","/hnxtLogin","/hnhyLogin","/hnsyLogin","/hnyueyLogin","/hnzjjLogin","/hncdLogin","/hnyiyLogin","/hnczLogin","/hnyzLogin","/hnhhLogin","/hnldLogin","/hnxxLogin","/hainanLogin","/neimengLogin","/getSjcntDetail","/noLogin","/saveSwSjXx",
excludePathPatterns("/","/toLogin","/hncsLogin","/hnzzLogin","/hnxtLogin","/hnhyLogin","/hnsyLogin","/hnyueyLogin","/hnzjjLogin","/hncdLogin","/hnyiyLogin","/hnczLogin","/hnyzLogin","/hnhhLogin","/hnldLogin","/hnxxLogin","/hainanLogin","/neimengLogin","/getSjcntDetail","/noLogin","/saveSwSjXx","/saveSwbhXx",
"/saveHmSjXx","/getSwSjXx","/getYthcjryxxByZjhm","/getYthcjUser","/getZfbaUser","/getZwbzJbxxCnt","/getCcbzJbxxCnt","/toswcj",
"/doLogin","/toHome","/static*//**","/refreshCodeCache","/qxdoLogin","/queryNameByCode","/queryTypeCode","/toFjxz","/toCzsmxz","/download/**","/toObjectKJ","/catchimg","/iframe1","/iframe2","/xj","/report","/SavePersonInfo4Nmtc","/singleLoginAct",
"/getYhkDetail","/getSwDetail","/getRyzjzpimages","/getRyzpimages","/getPmimages","/getGdimages"
......
......@@ -1777,7 +1777,7 @@ public class TbXwRycjController {
@ResponseBody
public AutoTbStRy exportRyxx(String rybh,String szzwbh,String xm,String zjhm,String fcsrqStr,String ecsrqStr,
String xbdm, String hjdzXzqhdm, String lrdwdw, String flrsjStr, String elrsjStr,
String jcjg,String r_sjlxdh,String RRx,String dnabh, HttpServletRequest request, HttpServletResponse response) {
String jcjg,String r_sjlxdh,String RRx,String dnabh, HttpServletRequest request,String type, HttpServletResponse response) {
AutoTbStRy xyrxx = new AutoTbStRy();
xyrxx.setRybh(rybh);
......@@ -1796,13 +1796,16 @@ public class TbXwRycjController {
xyrxx.setRRx(RRx);
xyrxx.setDnabh(dnabh);
User user = (User)request.getSession().getAttribute("User");
if(xyrxx.getLrdwdm()==null||"".equals(xyrxx.getLrdwdm())){
if(!"CX".equals(type)&&(xyrxx.getLrdwdm()==null||"".equals(xyrxx.getLrdwdm()))){
xyrxx.setLrdwdm(user.getUnitcode());
}
if(!"CX".equals(type)&&(xyrxx.getXxdjdwGajgjgdm()==null||"".equals(xyrxx.getXxdjdwGajgjgdm()))){
xyrxx.setXxdjdwGajgjgdm(user.getUnitcode());
}
List<AutoTbStRy> ryxxs = rycjService.queryRyxxList(xyrxx);
//excel标题
String[] title = { "人员编号","姓名", "性别", "证件号码","指纹编号","采集时间","采集单位","指纹状态","人像状态","检查结果","人员来源","填表时间","填表单位"};
String[] title = { "人员编号","姓名", "性别", "证件号码","指纹编号","采集时间","采集单位","指纹","人像","虹膜","足迹","声纹","手机","银行卡","检查结果","人员来源","填表时间","填表单位"};
//excel文件名
String fileName = "人员信息"+System.currentTimeMillis()+".xls";
......@@ -1846,33 +1849,59 @@ public class TbXwRycjController {
}else{
content[i][8] = "不合格";
}
if(ryxx.getHm()==null||"".equals(ryxx.getHm())||Integer.valueOf(ryxx.getHm()).intValue()<=0){
content[i][9] = "×";
}else{
content[i][9] = "√";
}
if(ryxx.getZj()==null||"".equals(ryxx.getZj())||Integer.valueOf(ryxx.getZj()).intValue()<=0){
content[i][10] = "×";
}else{
content[i][10] = "√";
}
if(ryxx.getSw()==null||"".equals(ryxx.getSw())||Integer.valueOf(ryxx.getSw()).intValue()<=0){
content[i][11] = "×";
}else{
content[i][11] = "√";
}
if(ryxx.getSjjbxx()==null||"".equals(ryxx.getSjjbxx())||Integer.valueOf(ryxx.getSjjbxx()).intValue()<=0||ryxx.getSjlxrxx()==null||"".equals(ryxx.getSjlxrxx())||Integer.valueOf(ryxx.getSjlxrxx()).intValue()<=0){
content[i][12] = "×";
}else{
content[i][12] = "√";
}
if(ryxx.getYhk()==null||"".equals(ryxx.getYhk())||Integer.valueOf(ryxx.getYhk()).intValue()<=0){
content[i][13] = "×";
}else{
content[i][13] = "√";
}
if("0".equals(ryxx.getJcjg())){
content[i][9] = "合格";
content[i][14] = "合格";
}else if("1".equals(ryxx.getJcjg())){
content[i][9] = "不合格";
content[i][14] = "不合格";
}else if("2".equals(ryxx.getJcjg())){
content[i][9] = "无文档";
content[i][14] = "无文档";
}else if("3".equals(ryxx.getJcjg())){
content[i][9] = "无指纹";
content[i][14] = "无指纹";
}else {
content[i][9] = "未检查";
content[i][14] = "未检查";
}
if("0".equals(ryxx.getTbbz())){
content[i][10] = "新增人员";
content[i][15] = "新增人员";
}else if("1".equals(ryxx.getTbbz())){
content[i][10] = "执法场所";
content[i][15] = "执法场所";
}else if("2".equals(ryxx.getTbbz())){
content[i][10] = "采集平台";
content[i][15] = "采集平台";
}
if(ryxx.getLrsj()!=null){
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateString = formatter.format(ryxx.getLrsj());
content[i][11] = dateString;
content[i][16] = dateString;
}else{
content[i][11] = "";
content[i][16] = "";
}
lrdw=dicItemService.queryNameByCode(ryxx.getLrdwdm(),"CODE_UNIT");
content[i][12] = lrdw;
content[i][17] = lrdw;
}
//创建HSSFWorkbook
......@@ -2527,7 +2556,20 @@ public class TbXwRycjController {
AutoTbRyZp ryzp_pd1 = null;// 正面照片
AutoTbRyZp ryzp_pd2 = null;// 左侧面照片
AutoTbRyZp ryzp_pd3 = null;// 右侧面照片
if(xyrC.getZmzpxxbh()!=null&&!"".equals(xyrC.getZmzpxxbh())){
String savePath = "/personphoto/"+ rybhstr.substring(rybhstr.length() - 10, rybhstr.length() - 4)+ "/" + rybhstr.substring(rybhstr.length() - 3, rybhstr.length());
//String hcfilePath = request.getServletContext().getRealPath("/").replaceAll("\\\\","/");
AutoTbRyZp ryzp_pd = null;// 判断照片编号是否有对应照片
Param param = paramService.getParamById("0100");
String zplj = param.getParamvalue();
String filePath = zplj;
filePath = filePath+savePath;
File filejia2 = new File(filePath+"/"+rybhstr+"2.jpg");
if (filejia2.exists()) {
String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"2.jpg");
if(zpBase64!=null&&!"".equals(zpBase64)){
zmzpzpbwflag=false;
}
}else if(xyrC.getZmzpxxbh()!=null&&!"".equals(xyrC.getZmzpxxbh())){
ryzp_pd1 = tbRyRyzpService.getTbRyRyzpById(xyrC.getZmzpxxbh(),xyrC.getLrdwdm());
if(ryzp_pd1!=null){
bytes=ryzp_pd1.getDzwjnr();
......@@ -2538,7 +2580,13 @@ public class TbXwRycjController {
}
}
if(xyrC.getCmzpxxbh()!=null&&!"".equals(xyrC.getCmzpxxbh())){
File filejia3 = new File(filePath+"/"+rybhstr+"3.jpg");
if (filejia3.exists()) {
String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"3.jpg");
if(zpBase64!=null&&!"".equals(zpBase64)){
cmzpzpzpbwflag=false;
}
}else if(xyrC.getCmzpxxbh()!=null&&!"".equals(xyrC.getCmzpxxbh())){
ryzp_pd2 = tbRyRyzpService.getTbRyRyzpById(xyrC.getCmzpxxbh(),xyrC.getLrdwdm());
if(ryzp_pd2!=null){
bytes=ryzp_pd2.getDzwjnr();
......@@ -2549,7 +2597,13 @@ public class TbXwRycjController {
}
}
if(xyrC.getYcmzpxxbh()!=null&&!"".equals(xyrC.getYcmzpxxbh())){
File filejia4 = new File(filePath+"/"+rybhstr+"4.jpg");
if (filejia4.exists()) {
String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"4.jpg");
if(zpBase64!=null&&!"".equals(zpBase64)){
ycmzpzpbwflag=false;
}
}else if(xyrC.getYcmzpxxbh()!=null&&!"".equals(xyrC.getYcmzpxxbh())){
ryzp_pd3 = tbRyRyzpService.getTbRyRyzpById(xyrC.getYcmzpxxbh(),xyrC.getLrdwdm());
if(ryzp_pd3!=null){
bytes=ryzp_pd3.getDzwjnr();
......
......@@ -68,6 +68,92 @@ public class XsjsbzController {
easyUIPage=ajswtzService.queryZwbzPage(easyUIPage,zwbz);
return easyUIPage;
}
@RequestMapping("/exportExcelToZwbzxx")
@ResponseBody
public TbXsjszyZwZwbzJbxx exportZwbzxx(String srcbarcode, String destbarcode, String srcseqno, String destseqno, String affirmunitcode,
String la_type,String fbzsj, String ebzsj,HttpServletRequest request, HttpServletResponse response) {
TbXsjszyZwZwbzJbxx bzxx = new TbXsjszyZwZwbzJbxx();
bzxx.setSrcbarcode(srcbarcode);
bzxx.setDestbarcode(destbarcode);
bzxx.setSrcseqno(srcseqno);
bzxx.setDestseqno(destseqno);
bzxx.setLa_type(la_type);
bzxx.setFbzsj(fbzsj);
bzxx.setEbzsj(ebzsj);
bzxx.setAffirmunitcode(affirmunitcode);
User user = (User)request.getSession().getAttribute("User");
List<TbXsjszyZwZwbzJbxx> bzxxs = ajswtzService.getZwbzJbxx(bzxx);
//excel标题
String[] title = {"现场指纹编号","指纹序号","案件名称","捺印指纹编号","指位","姓名", "身份证号","比中类型","比中时间","比中单位"};
//excel文件名
String fileName = "指纹比中信息"+System.currentTimeMillis()+".xls";
//sheet名
String sheetName = "指纹比中信息";
String [][] content = new String[bzxxs.size()][];
String xb="";
String mz="";
String hjqh="";
for (int i = 0; i < bzxxs.size(); i++) {
TbXsjszyZwZwbzJbxx zwbzxx = bzxxs.get(i);
content[i] = new String[title.length];
if("LA".equals(zwbzxx.getLa_type())){
content[i][0] = zwbzxx.getSrcbarcode();
content[i][1] = zwbzxx.getSrcseqno();
content[i][3] = zwbzxx.getDestbarcode();
content[i][4] = zwbzxx.getDestseqno();
content[i][7] = "正查";
}else{
content[i][0] = zwbzxx.getDestbarcode();
content[i][1] = zwbzxx.getDestseqno();
content[i][3] = zwbzxx.getSrcbarcode();
content[i][4] = zwbzxx.getSrcseqno();
content[i][7] = "倒查";
}
content[i][2] = zwbzxx.getAjmc();
content[i][5] = zwbzxx.getBdyxm();
content[i][6] = zwbzxx.getBdyzjhm();
content[i][8] = zwbzxx.getAffirmtime();
content[i][9] = dicItemService.queryNameByCode(zwbzxx.getAffirmunitcode(),"CODE_UNIT");
}
//创建HSSFWorkbook
HSSFWorkbook wb = ExportExcels.getHSSFWorkbook(sheetName, title, content, null);
//响应到客户端
try {
this.setResponseHeader(response, fileName);
OutputStream os = response.getOutputStream();
wb.write(os);
os.flush();
os.close();
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
//发送响应流方法
public void setResponseHeader(HttpServletResponse response, String fileName) {
try {
try {
fileName = new String(fileName.getBytes(),"ISO8859-1");
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
response.setContentType("application/octet-stream;charset=ISO8859-1");
response.setHeader("Content-Disposition", "attachment;filename="+ fileName);
response.addHeader("Pargam", "no-cache");
response.addHeader("Cache-Control", "no-cache");
} catch (Exception ex) {
ex.printStackTrace();
}
}
@RequestMapping("/queryCcbzList")
@ResponseBody
public EasyUIPage queryZlccrwPage(@ModelAttribute TbXsjszyZwZwbzJbxx zwbz,
......
......@@ -52,6 +52,7 @@ public class AutoTbRyZp implements Serializable {
private String xzcm;
private String sfcj;
private String tmtzms;
public String sfts;//推送状态
public static long getSerialVersionUID() {
return serialVersionUID;
......@@ -273,6 +274,14 @@ public class AutoTbRyZp implements Serializable {
this.sfcj = sfcj;
}
public String getSfts() {
return sfts;
}
public void setSfts(String sfts) {
this.sfts = sfts;
}
@Override
public String toString() {
return "AutoTbRyZp{" +
......
......@@ -27,6 +27,7 @@ public class TbStSw implements Serializable {
//声纹数据
public byte[] swsj;
public String swsjStr;
//音频总时长
public String zsc;
......@@ -322,4 +323,12 @@ public class TbStSw implements Serializable {
public void setCjcs(int cjcs) {
this.cjcs = cjcs;
}
public String getSwsjStr() {
return swsjStr;
}
public void setSwsjStr(String swsjStr) {
this.swsjStr = swsjStr;
}
}
......@@ -20,6 +20,7 @@ public class TbXwYthcjZj implements Serializable {
public String xzpp;//鞋子品牌
public String xzcm;//鞋子尺码
public String sfcj;//是否残疾
public String sfts;//推送状态
public String sbxh;//设备型号
public String gxsj;//更新时间
public String cjsj;//创建时间
......@@ -345,4 +346,12 @@ public class TbXwYthcjZj implements Serializable {
public void setIftscg(String iftscg) {
this.iftscg = iftscg;
}
public String getSfts() {
return sfts;
}
public void setSfts(String sfts) {
this.sfts = sfts;
}
}
......@@ -87,6 +87,18 @@ public class AutoTbXwRycjServiceImpl extends BaseService<AutoTbStRy> implements
entity.setLrdwdm(djdw.substring(0,8));
}
}
String yhdw = entity.getXxdjdwGajgjgdm();
if(yhdw!=null&&yhdw!=""){
if (yhdw.substring(2, 12).equals("0000000000")) {//省
entity.setXxdjdwGajgjgdm(yhdw.substring(0,2));
} else if (yhdw.substring(4, 12).equals("00000000")) {//市
entity.setXxdjdwGajgjgdm(yhdw.substring(0,4));
}else if(yhdw.substring(6, 12).equals("000000")){ //县
entity.setXxdjdwGajgjgdm(yhdw.substring(0,6));
}else if(yhdw.substring(8, 12).equals("0000")){ //所
entity.setXxdjdwGajgjgdm(yhdw.substring(0,8));
}
}
map.put("begin", "0");
map.put("end", "10000");
map.put("sort", "LRSJ");
......
......@@ -90,10 +90,10 @@ public class TestTask {
}
}
if("1".equals(zpbw)&&(rst==null||"".equals(rst))){
AutoTbStRy ryxx=new AutoTbStRy();
Qgckzp qgckzp = new Qgckzp();
ryxx=qgckzp.getQgckAllxxXml(zjhm);
rst = ryxx.getEdzzpStr64();
//AutoTbStRy ryxx=new AutoTbStRy();
//Qgckzp qgckzp = new Qgckzp();
//ryxx=qgckzp.getQgckAllxxXml(zjhm);
//rst = ryxx.getEdzzpStr64();
}
return new AsyncResult<>(rst);
}
......
......@@ -221,6 +221,7 @@
b.ZJSJ dzwjnr,
b.ZJLX zplxdm,
b.ZJBW zpbw,
b.SFTS sfts,
b.XDHWDM xdhwdm,
b.XYDM xydm,
a.ryzpzs
......@@ -238,6 +239,7 @@
b.ZJSJ dzwjnr,
b.ZJLX zjlxdm,
b.ZJBW zpbw,
b.SFTS sfts,
b.XDHWDM xdhwdm,
b.XYDM xydm,
b.XZPP xzpp,
......@@ -278,6 +280,7 @@
XZPP,
XZCM,
SFCJ,
SFTS,
XXDJRY_XM,
DJSJ,
XXDJDW_GAJGJGDM,
......@@ -307,6 +310,8 @@
<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 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 or entity.lrr == ''">,NULL </if>
<if test="entity.lrsj != null">, #{entity.lrsj , jdbcType=TIMESTAMP }</if>
......@@ -373,6 +378,8 @@
<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 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 or entity.dzwjnr == ''">ZJSJ=NULL, </if>
<if test="entity.gxsj != null">gxsj=#{entity.gxsj , jdbcType=TIMESTAMP },</if>
......
......@@ -124,6 +124,13 @@
return o;
}
function doQuery(){
alert("4");
$("#RCcdwStr").val($("#RCcdw").combobox("getValue"));
alert("3"+dateTimes($("#minccsjStr").combobox("setValue")));
$("#minccsj").val(dateTimes($("#minccsjStr").combobox("setValue")));
alert("2"+dateTimes($("#maxccsjStr").combobox("setValue")));
$("#maxccsj").val(dateTimes($("#maxccsjStr").combobox("setValue")));
alert("1");
$('#ryxxTable').datagrid({
url: "rycjqktj",
columns : [[
......@@ -286,25 +293,11 @@
function doExportExcel(){
var rybh = $("#rybh").val();
var szzwbh = $("#szzwbh").val();
var xm = $("#xm").val();
var zjhm = $("#zjhm").val();
var fcsrqStr = $("#fcsrqStr").val();
var ecsrqStr = $("#ecsrqStr").val();
var jcjg = $("#jcjg").val();
var xbdm = $("#xbdm").val();
var hjdzXzqhdm = $("#hjdzXzqhdm").val();
var lrdwdm = $("#lrdwdm").val();
var lrr = $("#lrr").val();
var flrsjStr = $("#flrsjStr").val();
var elrsjStr = $("#elrsjStr").val();
var jcjg = $("#jcjg").val();
var RRx = $("#RRx").val();
var r_sjlxdh = $("#r_sjlxdh").val();
var dnabh = $("#dnabh").val();
window.location.href="/exportExcelToRyxx?rybh="+rybh+"&zjhm="+zjhm+"&xm="+xm+"&szzwbh="+szzwbh+"&jcjg="+jcjg+"&xbdm="+xbdm+"&hjdzXzqhdm="+hjdzXzqhdm+"&RRx="+RRx+"&r_sjlxdh="+r_sjlxdh+"&dnabh="+dnabh
+"&lrdwdm="+lrdwdm+"&fcsrqStr="+fcsrqStr+"&ecsrqStr="+ecsrqStr+"&lrr="+lrr+"&flrsjStr="+flrsjStr+"&elrsjStr="+elrsjStr;
var ccdw = $("#RCcdwStr").val();
var minccsj = $("#minccsj").val();
var maxccsj = $("#maxccsj").val();
var unitgrade = $("#unitgrade").val();
window.location.href="/exportExcelToRycjtj?ccdw="+ccdw+"&ftjsj="+minccsj+"&etjsj="+maxccsj+"&grade="+unitgrade;
}
function setCodeText(id,code,type){
......@@ -331,6 +324,16 @@
$.messager.alert( '提示',"请选择数量大于0的进行查看!");
}
}
function dateTimes(tjdate) {
if (tjdate == undefined || tjdate == '') {
return "";
}
var month = tjdate.getMonth() + 1;
var day = tjdate.getDate();
return tjdate.getFullYear() + '-' + getFormatDate(month) + '-' + getFormatDate(day);
}
</script>
</body>
</html>
\ No newline at end of file
......@@ -453,7 +453,7 @@
}
return rstStr;
}},
{title:"人像",field:"rrx",align:'center',color:'gree',width:70,formatter:function(val,row,index){
{title:"人像",field:"rrx",align:'center',color:'gree',width:60,formatter:function(val,row,index){
var rrx=row.rrx;
var zmzpxxbh=row.zmzpxxbh;
var cmzpxxbh=row.cmzpxxbh;
......@@ -469,7 +469,7 @@
}
return rstStr;
}},
{title:"虹膜",field:"hm",align:'center',color:'gree',width:70,formatter:function(val,row,index){
{title:"虹膜",field:"hm",align:'center',color:'gree',width:60,formatter:function(val,row,index){
var hm=row.hm;
var rstStr;
if(hm==null||hm==""||hm<=0){
......@@ -479,7 +479,7 @@
}
return rstStr;
}},
{title:"足迹",field:"zj",align:'center',color:'gree',width:70,formatter:function(val,row,index){
{title:"足迹",field:"zj",align:'center',color:'gree',width:60,formatter:function(val,row,index){
var zj=row.zj;
var rstStr;
if(zj==null||zj==""||zj<=0){
......@@ -489,7 +489,7 @@
}
return rstStr;
}},
{title:"声纹",field:"sw",align:'center',color:'gree',width:70,formatter:function(val,row,index){
{title:"声纹",field:"sw",align:'center',color:'gree',width:60,formatter:function(val,row,index){
var sw=row.sw;
var rstStr;
if(sw==null||sw==""||sw<=0){
......@@ -499,7 +499,7 @@
}
return rstStr;
}},
{title:"手机",field:"sjjbxx",align:'center',color:'gree',width:70,formatter:function(val,row,index){
{title:"手机",field:"sjjbxx",align:'center',color:'gree',width:60,formatter:function(val,row,index){
var sjjbxx=row.sjjbxx;
var sjlxrxx=row.sjlxrxx;
var rstStr;
......@@ -510,7 +510,7 @@
}
return rstStr;
}},
{title:"银行卡",field:"yhk",align:'center',color:'gree',width:80,formatter:function(val,row,index){
{title:"银行卡",field:"yhk",align:'center',color:'gree',width:60,formatter:function(val,row,index){
var yhk=row.yhk;
var rstStr;
if(yhk==null||yhk==""||yhk<=0){
......
......@@ -132,8 +132,12 @@
};
function downloadfile(filename){
window.open("/downloadfile?filename="+filename+"&rybh="+$("#rybh").val())
function downloadfile(filename,wjlj){
if(filename==null||filename==""){
window.open(wjlj);
}else{
window.open("/downloadfile?filename="+filename+"&rybh="+$("#rybh").val());
}
};
function closepage(){
......@@ -196,8 +200,9 @@
var xxzjbh=row.xxzjbh;
var ypsj=row.ypsjStr;
var wjmc=row.wjmc;
var wjlj=row.wjlj;
//"<span style='color: blue;' class='hg-btn' onclick=\"playVoice()\">播放</span>&nbsp;&nbsp;&nbsp;&nbsp;" +
return "<span style='color: red;' onclick=\"downloadfile('"+wjmc+"')\">下载</span>&nbsp;&nbsp;&nbsp;&nbsp;" +
return "<span style='color: red;' onclick=\"downloadfile('"+wjmc+"','"+wjlj+"')\">下载</span>&nbsp;&nbsp;&nbsp;&nbsp;" +
"<span style='color: red;' onclick=\"cut('"+xxzjbh+"','"+wjmc+"')\">删除</span>";
}},
{title:"声纹名称",field:"wjmc",align:'left',width:220},
......
......@@ -29,6 +29,7 @@
<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="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="">
......@@ -52,7 +53,7 @@
<!--人员基本信息-->
<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>
<div class="condition">
<table style="width:100%;border:none;border-collapse: collapse;text-align:left;" class="cx_table_tj zjxxcjTable">
......@@ -257,10 +258,30 @@
} else if (data.Code == 10) {
var context = "data:img/jpg;base64," + data.Context;
//alert(data.Index);
$("#img"+numtemp).attr('value', context);
$("#content"+numtemp).attr('src', context);
var cjtpxh = $("#cjtpxh").val();
$("#cjtpxh").attr('value', cjtpxh+"xd"+numtemp+",");
if (data.Check == -1){
$.messager.confirm('提示', '足迹完整度不合格,是否进行保存?', function (r) {
if (r) {
$("#img" + numtemp).attr('value', context);
$("#content" + numtemp).attr('src', context);
var cjtpxh = $("#cjtpxh").val();
$("#cjtpxh").attr('value', cjtpxh + "xd" + numtemp + ",");
}
});
}else if (data.Check == -2){
$.messager.confirm('提示', '采集方向不合格,是否进行保存?', function (r) {
if (r) {
$("#img" + numtemp).attr('value', context);
$("#content" + numtemp).attr('src', context);
var cjtpxh = $("#cjtpxh").val();
$("#cjtpxh").attr('value', cjtpxh + "xd" + numtemp + ",");
}
});
}else{
$("#img"+numtemp).attr('value', context);
$("#content"+numtemp).attr('src', context);
var cjtpxh = $("#cjtpxh").val();
$("#cjtpxh").attr('value', cjtpxh+"xd"+numtemp+",");
}
}
} else {
if (data.Code == 2) {
......@@ -390,6 +411,11 @@
function addZjzpimg() {//初始化数据
var type = $("#type").val();
if (type != null && type == "1") {
}else{
$("#iftstext").text("(信息推送至足迹系统失败)");
}
var isflag = $("#isflag").val();
if (isflag != null && isflag == "1") {
$.messager.alert("提示","信息保存成功!");
......
......@@ -83,6 +83,7 @@
<div style="width: 100%; float: left; text-align: center;height: 44px;line-height: 44px;">
<a class="btn_a btn_search" onclick="doQuery()">查询</a>
<a class="btn_a btn_empty" onclick="doClear()">清空</a>
<a href="javascript:doExportExcel();" class="btn btn_dc">导出</a>
</div>
</td>
</tr>
......@@ -256,6 +257,16 @@
function toXsjsDetail(nyzwbh, xczwbh) {
window.open("/getXsjsbdxq?nyzwbh=" +nyzwbh+"&xczwbh="+xczwbh);
}
function doExportExcel(){
var srcbarcode = $("#srcbarcode").val();
var destbarcode = $("#destbarcode").val();
var la_type = $("#la_type").val();
var fbzsj = $("#fbzsj").val();
var ebzsj = $("#ebzsj").val();
var affirmunitcode = $("#affirmunitcode").val();
window.location.href="/exportExcelToZwbzxx?srcbarcode="+srcbarcode+"&destbarcode="+destbarcode+"&la_type="+la_type+"&fbzsj="+fbzsj+"&ebzsj="+ebzsj+"&affirmunitcode="+affirmunitcode;
}
</script>
</body>
......
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