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

src/main/java/com/founder/controller/ZjCjController.java

@@ -55,6 +55,7 @@ public class ZjCjController {
     @RequestMapping("/toZjCj")
     public ModelAndView toTest(ModelAndView model, HttpServletRequest request,HttpServletResponse response) {
         TbXwYthcjZj zjxx = new TbXwYthcjZj();
+        boolean flg = true;
         Map<String, Object> map = new HashMap<>();
         map.put("rybh", request.getParameter("rybh"));
         List<AutoTbRyZp> zjzpxxs = tbRyRyzpService.getTbRyZjzpListByRybh(map);
@@ -100,6 +101,11 @@ public class ZjCjController {
                 }else if("28".equals(zjzp.getZpbw())){
                     zjxx.setCz_y(GetImageStrsByByte(zjzp.getDzwjnr()));
                 }
+                String sfts = zjzp.getSfts();
+                if("1".equals(sfts)){
+                }else{
+                    flg = false;
+                }
             }
         }
         model.addObject("rybh",request.getParameter("rybh"));
@@ -107,6 +113,11 @@ public class ZjCjController {
         model.addObject("zjhm",request.getParameter("gmsfhm"));
         model.addObject("zjxx",zjxx);
         model.addObject("isflag","0");
+        if(flg){
+            model.addObject("type","1");
+        }else{
+            model.addObject("type","0");
+        }
         model.setViewName("zjcj/zjcj");
         return model;
     }
@@ -121,11 +132,25 @@ public class ZjCjController {
     }
 
     @RequestMapping("/doSaveZjxx")
-    public String doSaveZjxx(TbXwYthcjZj zjxx, Model model, HttpServletRequest request, HttpServletResponse response) {
+    public String doSaveZjxx(TbXwYthcjZj zjxx,String type, Model model, HttpServletRequest request, HttpServletResponse response) {
         User user = (User)request.getSession().getAttribute("User");
         boolean photoflag = true;
         String zzcjimg = null;
         String xmcjimg = null;
+
+        if(zjxx.getSbxh()==null||"".equals(zjxx.getSbxh())){
+            zjxx.setSbxh("50014000");
+        }
+        boolean rst = useryanzheng_zj(user,zjxx,zjxx.getRybh());
+        rst = ryxxToZj(user,zjxx,zjxx.getRybh())==false?false:rst;
+        boolean flg_temp = rst;
+        boolean rstfal = false;
+        if(rst){
+            zjxx.setSfts("1");
+        }else{
+            zjxx.setSfts("0");
+        }
+
         //左足
         if (zjxx.getGdxdhw_z() != null && zjxx.getGdxdhw_z().length() > 0) {
                 if(zjxx.getGdxdhw_z().indexOf("/9j/")>=0){
@@ -135,12 +160,22 @@ public class ZjCjController {
                 }
         }
         if (zzcjimg != null) {
+                if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xd1,")>=0)){
+                    rstfal = xd_zj(user,"1",zjxx.getGdxdhw_z(),zjxx.getRybh(),zjxx.getSbxh(),zjxx.getXzpp(),zjxx.getXzcm());
+                    if(rstfal){
+                        zjxx.setSfts("1");
+                    }else{
+                        zjxx.setSfts("0");
+                    }
+                    rst = rstfal==false?false:rst;
+                }
                 String num = insPicByZj(zzcjimg, zjxx, user, "11", request);
                 if (num == "-1") {
                     photoflag = false;
                 }
         }
         zzcjimg=null;
+        /*
         if (zjxx.getJtxdhw_z() != null && zjxx.getJtxdhw_z().length() > 0) {
             if(zjxx.getJtxdhw_z().indexOf("/9j/")>=0){
                 zzcjimg = zjxx.getJtxdhw_z().substring(zjxx.getJtxdhw_z().indexOf("/9j/"));
@@ -149,11 +184,21 @@ public class ZjCjController {
             }
         }
         if (zzcjimg != null) {
+            if(flg_temp&&zjxx.getCjtpxh().indexOf("xd1,")>=0){
+                rstfal = xd_zj(user,"1",zjxx.getGdxdhw_z(),zjxx.getRybh(),zjxx.getSbxh(),zjxx.getXzpp(),zjxx.getXzcm());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(zzcjimg, zjxx, user, "12", request);
             if (num == "-1") {
                 photoflag = false;
             }
         }
+        */
         xmcjimg = null;
         if (zjxx.getZmzp_z() != null && zjxx.getZmzp_z().length() > 0) {
             if(zjxx.getZmzp_z().indexOf("/9j/")>=0){
@@ -163,6 +208,15 @@ public class ZjCjController {
             }
         }
         if (xmcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xm1,")>=0)){
+                rstfal = xm_zj(user,"1",zjxx.getZmzp_z(),zjxx.getRybh());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(xmcjimg, zjxx, user, "13", request);
             if (num == "-1") {
                 photoflag = false;
@@ -177,6 +231,15 @@ public class ZjCjController {
             }
         }
         if (xmcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xm2,")>=0)){
+                rstfal = xm_zj(user,"2",zjxx.getNczp_z(),zjxx.getRybh());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(xmcjimg, zjxx, user, "14", request);
             if (num == "-1") {
                 photoflag = false;
@@ -191,6 +254,15 @@ public class ZjCjController {
             }
         }
         if (xmcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xm0,")>=0)){
+                rstfal = xm_zj(user,"0",zjxx.getWczp_z(),zjxx.getRybh());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(xmcjimg, zjxx, user, "15", request);
             if (num == "-1") {
                 photoflag = false;
@@ -205,6 +277,16 @@ public class ZjCjController {
             }
         }
         if (xmcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xm10,")>=0)){
+                rstfal = xm_zj(user,"10",zjxx.getHgzp_z(),zjxx.getRybh());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
+
             String num = insPicByZj(xmcjimg, zjxx, user, "16", request);
             if (num == "-1") {
                 photoflag = false;
@@ -219,6 +301,15 @@ public class ZjCjController {
             }
         }
         if (xmcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xm11,")>=0)){
+                rstfal = xm_zj(user,"11",zjxx.getXd_z(),zjxx.getRybh());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(xmcjimg, zjxx, user, "17", request);
             if (num == "-1") {
                 photoflag = false;
@@ -233,6 +324,16 @@ public class ZjCjController {
             }
         }
         if (zzcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xd3,")>=0)){
+                rstfal = xd_zj(user,"3",zjxx.getCz_z(),zjxx.getRybh(),zjxx.getSbxh(),zjxx.getXzpp(),zjxx.getXzcm());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
+
             String num = insPicByZj(zzcjimg, zjxx, user, "18", request);
             if (num == "-1") {
                 photoflag = false;
@@ -248,11 +349,21 @@ public class ZjCjController {
             }
         }
         if (zzcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xd2,")>=0)){
+                rstfal = xd_zj(user,"2",zjxx.getGdxdhw_y(),zjxx.getRybh(),zjxx.getSbxh(),zjxx.getXzpp(),zjxx.getXzcm());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(zzcjimg, zjxx, user, "21", request);
             if (num == "-1") {
                 photoflag = false;
             }
         }
+        /*
         zzcjimg=null;
         if (zjxx.getJtxdhw_y() != null && zjxx.getJtxdhw_y().length() > 0) {
             if(zjxx.getJtxdhw_y().indexOf("/9j/")>=0){
@@ -267,6 +378,7 @@ public class ZjCjController {
                 photoflag = false;
             }
         }
+        */
         xmcjimg = null;
         if (zjxx.getZmzp_y() != null && zjxx.getZmzp_y().length() > 0) {
             if(zjxx.getZmzp_y().indexOf("/9j/")>=0){
@@ -276,6 +388,15 @@ public class ZjCjController {
             }
         }
         if (xmcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xm4,")>=0)){
+                rstfal = xm_zj(user,"4",zjxx.getZmzp_y(),zjxx.getRybh());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(xmcjimg, zjxx, user, "23", request);
             if (num == "-1") {
                 photoflag = false;
@@ -290,6 +411,15 @@ public class ZjCjController {
             }
         }
         if (xmcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xm5,")>=0)){
+                rstfal = xm_zj(user,"5",zjxx.getNczp_y(),zjxx.getRybh());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(xmcjimg, zjxx, user, "24", request);
             if (num == "-1") {
                 photoflag = false;
@@ -304,6 +434,15 @@ public class ZjCjController {
             }
         }
         if (xmcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xm3,")>=0)){
+                rstfal = xm_zj(user,"3",zjxx.getWczp_y(),zjxx.getRybh());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(xmcjimg, zjxx, user, "25", request);
             if (num == "-1") {
                 photoflag = false;
@@ -318,6 +457,15 @@ public class ZjCjController {
             }
         }
         if (xmcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xm13,")>=0)){
+                rstfal = xm_zj(user,"13",zjxx.getHgzp_y(),zjxx.getRybh());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(xmcjimg, zjxx, user, "26", request);
             if (num == "-1") {
                 photoflag = false;
@@ -332,6 +480,15 @@ public class ZjCjController {
             }
         }
         if (xmcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xm14,")>=0)){
+                rstfal = xm_zj(user,"14",zjxx.getXd_y(),zjxx.getRybh());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(xmcjimg, zjxx, user, "27", request);
             if (num == "-1") {
                 photoflag = false;
@@ -346,17 +503,27 @@ public class ZjCjController {
             }
         }
         if (zzcjimg != null) {
+            if(flg_temp&&("0".equals(type)||zjxx.getCjtpxh().indexOf("xd4,")>=0)){
+                rstfal = xd_zj(user,"4",zjxx.getCz_y(),zjxx.getRybh(),zjxx.getSbxh(),zjxx.getXzpp(),zjxx.getXzcm());
+                if(rstfal){
+                    zjxx.setSfts("1");
+                }else{
+                    zjxx.setSfts("0");
+                }
+                rst = rstfal==false?false:rst;
+            }
             String num = insPicByZj(zzcjimg, zjxx, user, "28", request);
             if (num == "-1") {
                 photoflag = false;
             }
         }
 
+        /*
         if(zjxx.getSbxh()==null||"".equals(zjxx.getSbxh())){
             zjxx.setSbxh("50014000");
         }
-        boolean rst = useryanzheng_zj(user,zjxx,zjxx.getRybh());
-        rst = ryxxToZj(user,zjxx,zjxx.getRybh())==false?false:rst;
+        //boolean rst = useryanzheng_zj(user,zjxx,zjxx.getRybh());
+        //rst = ryxxToZj(user,zjxx,zjxx.getRybh())==false?false:rst;
         if(zjxx.getCjtpxh().indexOf("xd1,")>=0&&(zjxx.getGdxdhw_z()!=null && zjxx.getGdxdhw_z().length() > 0)){
         //if(zjxx.getGdxdhw_z()!=null && zjxx.getGdxdhw_z().length() > 0){
             rst = xd_zj(user,"1",zjxx.getGdxdhw_z(),zjxx.getRybh(),zjxx.getSbxh(),zjxx.getXzpp(),zjxx.getXzcm())==false?false:rst;
@@ -419,7 +586,7 @@ public class ZjCjController {
         //if(zjxx.getCjtpxh().indexOf("xm15,")>=0&&(zjxx.getJtxdhw_y()!=null && zjxx.getJtxdhw_y().length() > 0)){
             //rst = xm_zj(user,"15",zjxx.getJtxdhw_y(),zjxx.getRybh())==false?false:rst;
         //}
-
+*/
         model.addAttribute("username",user.getUsername());
         model.addAttribute("unitcode",user.getUnitcode());
         model.addAttribute("rybh",zjxx.getRybh());
@@ -428,8 +595,10 @@ public class ZjCjController {
         model.addAttribute("zjxx",zjxx);
         if(rst){
             model.addAttribute("isflag","1");
+            model.addAttribute("type","1");
         }else{
             model.addAttribute("isflag","2");
+            model.addAttribute("type","0");
         }
         return "zjcj/zjcj.html";
     }
@@ -517,12 +686,12 @@ public class ZjCjController {
             ryzp.setXzpp(zjxx.getXzpp());
             ryzp.setXzcm(zjxx.getXzcm());
             ryzp.setSfcj(zjxx.getSfcj());
+            ryzp.setSfts(zjxx.getSfts());
             if (zpxxbh != null && !zpxxbh.equals("")) {
                     xxbhflag = tbRyRyzpService.updateTbRyZjzp(ryzp, user.getUnitcode());
             } else {
                     xxbhflag = tbRyRyzpService.insertTbRyZjzp(ryzp, user.getUnitcode());
             }
-
         } catch (Exception e) {
             return "-1";
         } finally {

src/main/java/com/founder/model/AutoTbRyZp.java

@@ -51,6 +51,7 @@ public class AutoTbRyZp implements Serializable {
     private String xzpp;
     private String xzcm;
     private String sfcj;
+    private String sfts;
     private String tmtzms;
 
     public static long getSerialVersionUID() {
@@ -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{" +

src/main/java/com/founder/model/TbXwYthcjZj.java

@@ -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;//创建时间
@@ -48,8 +49,6 @@ public class TbXwYthcjZj implements Serializable {
 
     public String cjtpxh;
 
-    public String iftscg;
-
     public String getXxzjbh() {
         return xxzjbh;
     }
@@ -338,11 +337,11 @@ public class TbXwYthcjZj implements Serializable {
         this.cjtpxh = cjtpxh;
     }
 
-    public String getIftscg() {
-        return iftscg;
+    public String getSfts() {
+        return sfts;
     }
 
-    public void setIftscg(String iftscg) {
-        this.iftscg = iftscg;
+    public void setSfts(String sfts) {
+        this.sfts = sfts;
     }
 }

src/main/resources/mapper/TbRyRyzpSqlMapper.xml

@@ -243,6 +243,7 @@
         b.XZPP xzpp,
         b.XZCM xzcm,
         b.SFCJ sfcj,
+        b.SFTS sfts,
         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
         where a.rybh = b.rybh
@@ -278,6 +279,7 @@
         XZPP,
         XZCM,
         SFCJ,
+        SFTS,
         XXDJRY_XM,
         DJSJ,
         XXDJDW_GAJGJGDM,
@@ -307,6 +309,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 +377,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>

src/main/resources/templates/khtj/cxlist.html

@@ -82,7 +82,17 @@
             }},
             {title:"姓名",field:"xm",align:'left',width:120},
             {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:"pmzw",align:'center',color:'gree',width:90,formatter:function(val,row,index){
                 var zwfkxx=row.zwfkxx;

src/main/resources/templates/khtj/sjlist.html

@@ -82,7 +82,17 @@
             }},
             {title:"姓名",field:"xm",align:'left',width:120},
             {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){
                 var sjbs=row.sjbs;
                 var rstStr="";

src/main/resources/templates/rygl/addryxx.html

@@ -1251,6 +1251,7 @@
                         }else{
                             ifsj=data.sjcjycode;
                         }
+                        debugger;
                         if(data.ifswcjy=="否"){
                             $("#sw").find("a").removeAttr("href");
                             $("#sw").find("a").removeAttr("onclick");
@@ -1334,106 +1335,65 @@
                 $("#swifcj").attr("src","/static/rygl/img/yes.png");
             }
             debugger;
-
-            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(),
+            var csrq = $("#csrqQsrq").val();
+            if($("#gmsfhm").val()!=null&&$("#gmsfhm").val()!=''&&$("#gmsfhm").val()!="无"){
+                csrq = $("#gmsfhm").val().substr(6,4)+"-"+$("#gmsfhm").val().substr(10,2)+"-"+$("#gmsfhm").val().substr(12,2);
+            }
+            debugger;
+            if(ifsw=="1"){
+                var str = "audiocapture:{"
+                        +"'personNo':'"+$("#rybh").val()+"'"
+                        +",'personName':'"+$("#xm").val()+"'"
+                        +",'cardTypeNo':'111'"
+                        +",'cardNum':'"+$("#gmsfhm").val()+"'"
+                        +",'birthday':'"+csrq+"'"
+                        +",'nationalityNo':'CHN'"
+                        +",'sexNo':'"+$("#xbdm").combobox("getValue")+"'"
+                        +",'ethniciNo':'"+$("#mzdm").combobox("getValue")+"'"
+                        +",'schoolingNo':'"+$("#xldm").combobox("getValue")+"'"
+                        +",'phoneNum':'"+$("#lxdm").val()+"'"
+                        +",'birthAddrNo':'"+$("#hjdzXzqhdm").combobox("getValue")+"'"
+                        +",'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: {
-                        /** 采集人 */
-                        collector: $("#zwcjrStr").val(),
+                    other: {
+                        uploadUrl: "http://127.0.0.1:9200/getSwSjXx",
                     },
-                    caseInfo: {},
-                },
-                other: {
-                    uploadUrl: "http://127.0.0.1:9200/getSwSjXx",
-                },
-            };
-            window.location.href = encodeURI(`audio-capture://${JSON.stringify(obj)}`);
+                };
+                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 @@
                 }else{
                     rstStr = gmsfhm;
                 }
+                return rstStr;
             }},
             {title:"指纹编号",field:"szzwbh",align:'left',width:220},
             {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 @@
             <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">
@@ -374,7 +375,12 @@
 
 
     function addZjzpimg() {//初始化数据
-
+        debugger;
+        var type = $("#type").val();
+        if (type != null && type == "1") {
+        }else{
+            $("#iftstext").text("（信息推送至足迹系统失败）");
+        }
         var isflag = $("#isflag").val();
         if (isflag != null && isflag == "1") {
             $.messager.alert("提示","信息保存成功！");