人像查询页面添加足迹推送反馈

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

@@ -255,6 +255,7 @@ public class AutoTbStRy implements Serializable {
     private String bcjrylbdm;//被采集人员类别代码
 
     private String zj;//是否采集足迹
+    private String zjts;//足迹是否全部推送成功
     private String hm;//是否采集虹膜
     private String sw;//是否采集声纹
     private String sjjbxx;//是否采集手机基本信息
@@ -270,6 +271,15 @@ public class AutoTbStRy implements Serializable {
     private String rwbh;//任务编号
     private String fssj;//发送比对时间
 
+
+    public String getZjts() {
+        return zjts;
+    }
+
+    public void setZjts(String zjts) {
+        this.zjts = zjts;
+    }
+
     public String getIfhb() {
         return ifhb;
     }

src/main/resources/mapper/AutoTbXwRycjSqlMap.xml

@@ -312,6 +312,7 @@
         (select count(1) from tb_xw_ythcj_hm s where s.rybh=TB_RY_RYCJ.rybh) as HM,
         (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 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,
@@ -354,6 +355,9 @@
         <if test="entity.zjyw != null and entity.zjyw != '' and entity.zjyw == 1">
             and d.ZJ >0
         </if>
+        <if test="entity.zjyw != null and entity.zjyw != '' and entity.zjyw == 2">
+            and d.ZJTS >0
+        </if>
         <if test="entity.ajlbdm != null and entity.ajlbdm != '' ">
             and d.AJLBDM = #{entity.ajlbdm , jdbcType=VARCHAR }
         </if>

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

@@ -232,6 +232,7 @@
                                     <option value="">------------- 请 选 择 -------------</option>
                                     <option value="0">未采集</option>
                                     <option value="1">已采集</option>
+                                    <option value="2">未推送</option>
                                 </select>
                             </p>
                         </td>
@@ -436,6 +437,7 @@
             showFooter: true,
         });
     });
+
     //将表单序列化
     function serializeObject(form){
         var o={};
@@ -618,7 +620,11 @@
                         if (zj == null || zj == "" || zj <= 0) {
                             rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='足迹'>×</span>";
                         } else {
-                            rstStr = "<span style='color: green;font-size: 20px;font-weight: bold;' title='足迹'>√</span>";
+                            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>";
+                            }
                         }
                         return rstStr;
                     }
@@ -939,11 +945,16 @@
                     width: 60,
                     formatter: function (val, row, index) {
                         var zj = row.zj;
+                        var zjts = row.zjts;
                         var rstStr;
                         if (zj == null || zj == "" || zj <= 0) {
                             rstStr = "<span style='color: red;font-size: 20px;font-weight: bold;' title='足迹'>×</span>";
                         } else {
-                            rstStr = "<span style='color: green;font-size: 20px;font-weight: bold;' title='足迹'>√</span>";
+                            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>";
+                            }
                         }
                         return rstStr;
                     }