人员采集，足迹推送结果展示

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

@@ -2731,7 +2731,10 @@ public class TbXwRycjController {
         String imgstrs = null;
         try {
             long startTime = System.currentTimeMillis();//获取开始时间
-            if (zwbh != null && zwbh.indexOf("4302") == 0) {
+            if (zwbh != null && zwbh.indexOf("4301") == 0) {
+                imgstrs = hu.getJsonString("http://65.38.37.115:8082/data/getPSNRollByRybh?rybh=" + zwbh);//株洲
+                //imgstrs = hu.getJsonString("http://10.185.207.31:8082/data/getPSNRollByRybh?rybh="+zwbh);
+            }else if (zwbh != null && zwbh.indexOf("4302") == 0) {
                 imgstrs = hu.getJsonString("http://65.65.66.27:8081/data/getPSNRollByRybh?rybh=" + zwbh);//株洲
                 //imgstrs = hu.getJsonString("http://10.185.207.31:8082/data/getPSNRollByRybh?rybh="+zwbh);
             } else {
@@ -2797,7 +2800,10 @@ public class TbXwRycjController {
         String imgstrs = null;
         try {
             long startTime = System.currentTimeMillis();//获取开始时间
-            if (zwbh != null && zwbh.indexOf("4302") == 0) {
+            if (zwbh != null && zwbh.indexOf("4301") == 0) {
+                imgstrs = hu.getJsonString("http://65.38.37.115:8082/data/getPSNPlainByRybh?rybh=" + zwbh);//株洲
+                //imgstrs = hu.getJsonString("http://10.185.207.31:8082/data/getPSNRollByRybh?rybh="+zwbh);
+            }else if (zwbh != null && zwbh.indexOf("4302") == 0) {
                 imgstrs = hu.getJsonString("http://65.65.66.27:8081/data/getPSNPlainByRybh?rybh=" + zwbh);//株洲
                 //imgstrs = hu.getJsonString("http://10.185.207.31:8082/data/getPSNPlainByRybh?rybh="+zwbh);
             } else {

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

@@ -256,6 +256,7 @@ public class AutoTbStRy implements Serializable {
 
     private String zj;//是否采集足迹
     private String zjts;//足迹是否全部推送成功
+    private String tsjgmx;//推送结果描述
     private String hm;//是否采集虹膜
     private String sw;//是否采集声纹
     private String sjjbxx;//是否采集手机基本信息
@@ -271,6 +272,13 @@ public class AutoTbStRy implements Serializable {
     private String rwbh;//任务编号
     private String fssj;//发送比对时间
 
+    public String getTsjgmx() {
+        return tsjgmx;
+    }
+
+    public void setTsjgmx(String tsjgmx) {
+        this.tsjgmx = tsjgmx;
+    }
 
     public String getZjts() {
         return zjts;

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

@@ -45,8 +45,15 @@ public class AutoTbStRyDto implements Serializable {
     private String zmzpStr64;       //正面
     private String cmzpStr64;       //左侧面
     private String zc;              //足长
+    private String zwfkxx;          //指纹反馈信息
 
+    public String getZwfkxx() {
+        return zwfkxx;
+    }
 
+    public void setZwfkxx(String zwfkxx) {
+        this.zwfkxx = zwfkxx;
+    }
 
     public String getZc() {
         return zc;

src/main/resources/mapper/AutoTbXwRycjSqlMap.xml

@@ -313,6 +313,7 @@
         (select count(1) from tb_xw_ythcj_sw s where s.rybh=TB_RY_RYCJ.rybh) as SW,
         (select count(1) from tb_xw_ythcj_zj s where s.rybh=TB_RY_RYCJ.rybh) as ZJ,
         (select count(1) from tb_xw_ythcj_zj s where s.rybh=TB_RY_RYCJ.rybh and (s.SFTS = '0' or s.SFTS is null)  ) as ZJTS,
+        (select s.tsjgmx from tb_xw_ythcj_zj s where s.rybh =TB_RY_RYCJ.rybh and (s.SFTS = '0' or s.SFTS is null) and ROWNUM =1 )as TSJGMX,
         (select count(1) from tb_xw_ythcj_yhkjbxx s where s.rybh=TB_RY_RYCJ.rybh) as YHK,
         (select count(1) from tb_xw_ythcj_ssxdwp s where s.rybh=TB_RY_RYCJ.rybh) as SSWP,
         (select count(1) from tb_ph_fzxyrsjgl s where s.xyrbh=TB_RY_RYCJ.rybh) as SJJBXX,

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

@@ -617,6 +617,10 @@
                     formatter: function (val, row, index) {
                         var zj = row.zj;
                         var zjts = row.zjts;
+                        var tsjgmx = row.tsjgmx;
+                        if (tsjgmx ==null){
+                            tsjgmx = "数据推送中，请稍后查看";
+                        }
                         var rstStr;
                         if (zj == null || zj == "" || zj <= 0) {
                             rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='足迹'>×</span>";
@@ -624,7 +628,7 @@
                             if (zjts <=0 ){
                                 rstStr = "<span style='color: green;font-size: 20px;font-weight: bold;' title='足迹全部推送成功！'>√</span>";
                             }else {
-                                rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='足迹未推送成功！'>√</span>";
+                                rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title="+tsjgmx+">√</span>";
                             }
                         }
                         return rstStr;
@@ -947,6 +951,10 @@
                     formatter: function (val, row, index) {
                         var zj = row.zj;
                         var zjts = row.zjts;
+                        var tsjgmx = row.tsjgmx;
+                        if (tsjgmx ==null){
+                            tsjgmx = "数据推送中，请稍后查看";
+                        }
                         var rstStr;
                         if (zj == null || zj == "" || zj <= 0) {
                             rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='足迹'>×</span>";
@@ -954,7 +962,7 @@
                             if (zjts <=0 ){
                                 rstStr = "<span style='color: green;font-size: 20px;font-weight: bold;' title='足迹全部推送成功！'>√</span>";
                             }else {
-                                rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='足迹未推送成功！'>√</span>";
+                                rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title="+tsjgmx+">√</span>";
                             }
                         }
                         return rstStr;