修改银行卡采集功能

src/main/java/com/founder/dao/YhkxxCjDao.java

 package com.founder.dao;
 
 import com.founder.model.TbXwYthcjYhkjbxx;
+import com.founder.model.TbXwYthcjYhkjyjl;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 
@@ -11,10 +12,17 @@ import java.util.Map;
 @Mapper
 public interface YhkxxCjDao {
 
-    public int insertYhkxx(TbXwYthcjYhkjbxx yhkjbxx);
-    public int updateYhkxx(TbXwYthcjYhkjbxx yhkjbxx);
-    public int deleteYhkxx(String xxzjbh);
-    public TbXwYthcjYhkjbxx getYhkxxByXxzjbh(String xxzjbh);
-    public Integer queryPageCount(Map<String, Object> map);
-    public List<TbXwYthcjYhkjbxx> queryPageList(Map<String, Object> map);
+    public int insertYhkjbxx(TbXwYthcjYhkjbxx yhkjbxx);
+    public int updateYhkjbxx(TbXwYthcjYhkjbxx yhkjbxx);
+    public int deleteYhkjbxx(String xxzjbh);
+    public TbXwYthcjYhkjbxx getYhkjbxxByXxzjbh(String xxzjbh);
+    public Integer queryYhkjbxxPageCount(Map<String, Object> map);
+    public List<TbXwYthcjYhkjbxx> queryYhkjbxxPageList(Map<String, Object> map);
+
+    public int insertYhkjyjl(TbXwYthcjYhkjyjl yhkjyjl);
+    public int updateYhkjyjl(TbXwYthcjYhkjyjl yhkjyjl);
+    public int deleteYhkjyjl(String xxzjbh);
+    public TbXwYthcjYhkjyjl getYhkjyjlByXxzjbh(String xxzjbh);
+    public Integer queryYhkjyjlPageCount(Map<String, Object> map);
+    public List<TbXwYthcjYhkjyjl> queryYhkjyjlPageList(Map<String, Object> map);
 }

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

@@ -14,15 +14,21 @@ public class TbXwYthcjYhkjbxx implements Serializable {
     public String xm;//姓名
     public String yhkmc;//银行卡名称
     public String yhklx;//银行卡类型
+    public String yhklxStr;//银行卡类型
     public Date zjwxrq;//证件无效日期
+    public String zjwxrqStr;//证件无效日期
     public String fkdq;//发卡地区(字典项，符合GB/T 2659)
+    public String fkdqStr;//发卡地区(字典项，符合GB/T 2659)
     public String khh;//开户行
     public String zjlx;//证件类型
+    public String zjlxStr;//证件类型
     public String zjhm;//证件号码
     public String blxx;//保留信息
     public String khhh;//开户行号
     public Date khrq;//开户日期
+    public String khrqStr;//开户日期
     public Date xhrq;//销户日期
+    public String xhrqStr;//销户日期
     public String fjsxid;//附加属性 ID
     public String sczt;//删除状态,0未删除 ，1已删除
     public Date scsj;//删除时间
@@ -33,6 +39,9 @@ public class TbXwYthcjYhkjbxx implements Serializable {
     public String lrr_policemanid;//录入人警号
     public String xxsc_pdbz;//删除标志
 
+    public String khrqQsrq;
+    public String khrqJzrq;
+
     public String getXxzjbh() {
         return xxzjbh;
     }
@@ -224,4 +233,68 @@ public class TbXwYthcjYhkjbxx implements Serializable {
     public void setXxsc_pdbz(String xxsc_pdbz) {
         this.xxsc_pdbz = xxsc_pdbz;
     }
+
+    public String getKhrqQsrq() {
+        return khrqQsrq;
+    }
+
+    public void setKhrqQsrq(String khrqQsrq) {
+        this.khrqQsrq = khrqQsrq;
+    }
+
+    public String getKhrqJzrq() {
+        return khrqJzrq;
+    }
+
+    public void setKhrqJzrq(String khrqJzrq) {
+        this.khrqJzrq = khrqJzrq;
+    }
+
+    public String getYhklxStr() {
+        return yhklxStr;
+    }
+
+    public void setYhklxStr(String yhklxStr) {
+        this.yhklxStr = yhklxStr;
+    }
+
+    public String getZjwxrqStr() {
+        return zjwxrqStr;
+    }
+
+    public void setZjwxrqStr(String zjwxrqStr) {
+        this.zjwxrqStr = zjwxrqStr;
+    }
+
+    public String getFkdqStr() {
+        return fkdqStr;
+    }
+
+    public void setFkdqStr(String fkdqStr) {
+        this.fkdqStr = fkdqStr;
+    }
+
+    public String getZjlxStr() {
+        return zjlxStr;
+    }
+
+    public void setZjlxStr(String zjlxStr) {
+        this.zjlxStr = zjlxStr;
+    }
+
+    public String getKhrqStr() {
+        return khrqStr;
+    }
+
+    public void setKhrqStr(String khrqStr) {
+        this.khrqStr = khrqStr;
+    }
+
+    public String getXhrqStr() {
+        return xhrqStr;
+    }
+
+    public void setXhrqStr(String xhrqStr) {
+        this.xhrqStr = xhrqStr;
+    }
 }

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

@@ -12,13 +12,18 @@ public class TbXwYthcjYhkjyjl implements Serializable {
     public String rybh;//人员编号
     public String yhkkh;//银行卡卡号
     public Date jyrq;//交易日期
+    public String jyrqStr;//交易日期
     public Date jysj;//交易时间
+    public String jysjStr;//交易时间
     public String sqje;//授权金额
     public String qtje;//其它金额
     public String xzqh;//行政区划，字典项，符合GB/T 2260－2007
+    public String xzqhStr;//行政区划，字典项，符合GB/T 2260－2007
     public String jyhbdm;//交易货币代码，字典项，符合 GBT 12406-2008
+    public String jyhbdmStr;//交易货币代码，字典项，符合 GBT 12406-2008
     public String shmc;//商户名称
     public String jylx;//交易类型
+    public String jylxStr;//交易类型
     public String yyjyjsq;//应用交易计数器
     public Date gxsj;//更新时间
     public Date cjsj;//创建时间
@@ -170,4 +175,44 @@ public class TbXwYthcjYhkjyjl implements Serializable {
     public void setXxsc_pdbz(String xxsc_pdbz) {
         this.xxsc_pdbz = xxsc_pdbz;
     }
+
+    public String getJyrqStr() {
+        return jyrqStr;
+    }
+
+    public void setJyrqStr(String jyrqStr) {
+        this.jyrqStr = jyrqStr;
+    }
+
+    public String getJysjStr() {
+        return jysjStr;
+    }
+
+    public void setJysjStr(String jysjStr) {
+        this.jysjStr = jysjStr;
+    }
+
+    public String getXzqhStr() {
+        return xzqhStr;
+    }
+
+    public void setXzqhStr(String xzqhStr) {
+        this.xzqhStr = xzqhStr;
+    }
+
+    public String getJyhbdmStr() {
+        return jyhbdmStr;
+    }
+
+    public void setJyhbdmStr(String jyhbdmStr) {
+        this.jyhbdmStr = jyhbdmStr;
+    }
+
+    public String getJylxStr() {
+        return jylxStr;
+    }
+
+    public void setJylxStr(String jylxStr) {
+        this.jylxStr = jylxStr;
+    }
 }

src/main/java/com/founder/service/IYhkCjService.java

+package com.founder.service;
+
+import com.founder.model.TbXwSsxdwp;
+import com.founder.model.TbXwYthcjYhkjbxx;
+import com.founder.model.TbXwYthcjYhkjyjl;
+import com.founder.utils.EasyUIPage;
+
+public interface IYhkCjService {
+    /**
+     * 获取所有银行卡基本信息
+     * @param yhkjbxx
+     * @return
+     */
+    public EasyUIPage queryYhkjbxxPage(EasyUIPage page, TbXwYthcjYhkjbxx yhkjbxx);
+    /**
+     * 保存银行卡基本信息
+     * @param yhkjbxx
+     * @return
+     */
+    Boolean saveYhkjbxx(TbXwYthcjYhkjbxx yhkjbxx, String ssdw);
+    /**
+     * 获取银行卡基本信息
+     * @param xxzjbh
+     * @return
+     */
+    TbXwYthcjYhkjbxx getYhkjbxxByXxzjbh(String xxzjbh);
+
+    /**
+     * 修改银行卡基本信息
+     * @param yhkjbxx
+     * @return
+     */
+    Boolean updateYhkjbxx(TbXwYthcjYhkjbxx yhkjbxx, String ssdw);
+
+    /**
+     * 删除银行卡基本信息
+     * @param xxzjbh
+     * @return
+     */
+    Boolean deleteYhkjbxx(String xxzjbh);
+
+
+    /**
+     * 获取所有银行卡交易记录信息
+     * @param yhkjyjl
+     * @return
+     */
+    public EasyUIPage queryYhkjyjlPage(EasyUIPage page, TbXwYthcjYhkjyjl yhkjyjl);
+    /**
+     * 保存银行卡交易记录信息
+     * @param yhkjyjl
+     * @return
+     */
+    Boolean saveYhkjyjl(TbXwYthcjYhkjyjl yhkjyjl, String ssdw);
+    /**
+     * 获取银行卡交易记录信息
+     * @param xxzjbh
+     * @return
+     */
+    TbXwYthcjYhkjyjl getYhkjyjlByXxzjbh(String xxzjbh);
+
+    /**
+     * 修改银行卡交易记录信息
+     * @param yhkjyjl
+     * @return
+     */
+    Boolean updateYhkjyjl(TbXwYthcjYhkjyjl yhkjyjl, String ssdw);
+
+    /**
+     * 删除银行卡交易记录信息
+     * @param xxzjbh
+     * @return
+     */
+    Boolean deleteYhkjyjl(String xxzjbh);
+
+}

src/main/java/com/founder/service/IYhkxxCjService.java

-package com.founder.service;
-
-import com.founder.model.TbXwSsxdwp;
-import com.founder.model.TbXwYthcjYhkjbxx;
-import com.founder.utils.EasyUIPage;
-
-public interface IYhkxxCjService {
-    public EasyUIPage queryYhkxxPage(EasyUIPage page, TbXwYthcjYhkjbxx yhkjbxx);
-    /**
-     * 保存随身携带物品信息
-     * @param yhkjbxx
-     * @return
-     */
-    Boolean saveYhkxx(TbXwYthcjYhkjbxx yhkjbxx);
-    /**
-     * 获取随身携带物品信息
-     * @param xxzjbh
-     * @return
-     */
-    TbXwYthcjYhkjbxx getYhkxxByXxzjbh(String xxzjbh);
-
-    /**
-     * 修改随身携带物品信息
-     * @param yhkjbxx
-     * @return
-     */
-    Boolean updateYhkxx(TbXwYthcjYhkjbxx yhkjbxx);
-
-    /**
-     * 删除随身携带物品信息
-     * @param xxzjbh
-     * @return
-     */
-    Boolean deleteYhkxx(String xxzjbh);
-
-
-}

src/main/java/com/founder/service/impl/YhkxxCjServiceImpl.java → src/main/java/com/founder/service/impl/YhkCjServiceImpl.java

 package com.founder.service.impl;
 
 
+import com.founder.dao.SsxdwpxxCjDao;
 import com.founder.dao.YhkxxCjDao;
+import com.founder.jwzhDao.JwzhDao;
+import com.founder.model.TbXwSsxdwp;
 import com.founder.model.TbXwYthcjYhkjbxx;
-import com.founder.service.IYhkxxCjService;
+import com.founder.model.TbXwYthcjYhkjyjl;
+import com.founder.service.ISsxdwpCjService;
+import com.founder.service.IYhkCjService;
 import com.founder.utils.EasyUIPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -14,18 +19,23 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Service
-public class YhkxxCjServiceImpl implements IYhkxxCjService {
+public class YhkCjServiceImpl implements IYhkCjService {
 
     @Autowired
     private YhkxxCjDao yhkxxCjDao;
+    @Autowired
+    private JwzhDao jwzhDao;
 
     @Override
-    public Boolean saveYhkxx(TbXwYthcjYhkjbxx yhkjbxx) {
+    public Boolean saveYhkjbxx(TbXwYthcjYhkjbxx yhkjbxx, String ssdw) {
         Boolean b = false;
         try {
-            int a = yhkxxCjDao.insertYhkxx(yhkjbxx);
+            int a = yhkxxCjDao.insertYhkjbxx(yhkjbxx);
             if (a > 0){
                 b = true;
+                if(ssdw!=null&&"14".equals(ssdw.substring(0,2))) {
+                    //jwzhDao.insertXdwpxx(yhkjbxx);
+                }
             }
         }catch (Exception e){
             System.out.println("插入随身物品数据失败"+e);
@@ -34,17 +44,20 @@ public class YhkxxCjServiceImpl implements IYhkxxCjService {
     }
 
     @Override
-    public TbXwYthcjYhkjbxx getYhkxxByXxzjbh(String xxzjbh) {
-        return yhkxxCjDao.getYhkxxByXxzjbh(xxzjbh);
+    public TbXwYthcjYhkjbxx getYhkjbxxByXxzjbh(String xxzjbh) {
+        return yhkxxCjDao.getYhkjbxxByXxzjbh(xxzjbh);
     }
 
     @Override
-    public Boolean updateYhkxx(TbXwYthcjYhkjbxx yhkjbxx) {
+    public Boolean updateYhkjbxx(TbXwYthcjYhkjbxx yhkjbxx,String ssdw) {
         Boolean b = false;
         try {
-            int a = yhkxxCjDao.updateYhkxx(yhkjbxx);
+            int a = yhkxxCjDao.updateYhkjbxx(yhkjbxx);
             if (a > 0){
                 b = true;
+                if(ssdw!=null&&"14".equals(ssdw.substring(0,2))) {
+                    //jwzhDao.updateXdwpxx(yhkjbxx);
+                }
             }
         }catch (Exception e){
             System.out.println("修改随身物品数据失败"+e);
@@ -53,10 +66,10 @@ public class YhkxxCjServiceImpl implements IYhkxxCjService {
     }
 
     @Override
-    public Boolean deleteYhkxx(String xxzjbh) {
+    public Boolean deleteYhkjbxx(String xxzjbh) {
         Boolean b = false;
         try {
-            int a = yhkxxCjDao.deleteYhkxx(xxzjbh);
+            int a = yhkxxCjDao.deleteYhkjbxx(xxzjbh);
             if (a > 0){
                 b = true;
             }
@@ -67,7 +80,7 @@ public class YhkxxCjServiceImpl implements IYhkxxCjService {
     }
 
     @Override
-    public EasyUIPage queryYhkxxPage(EasyUIPage page, TbXwYthcjYhkjbxx yhkjbxx) {
+    public EasyUIPage queryYhkjbxxPage(EasyUIPage page, TbXwYthcjYhkjbxx yhkjbxx) {
         Map<String, Object> map = new HashMap<>();
         String djdw = yhkjbxx.getLrdwdm();
         if(djdw!=null&&djdw!=""){
@@ -86,17 +99,106 @@ public class YhkxxCjServiceImpl implements IYhkxxCjService {
         String sort = page.getSort();
         String order = page.getOrder();
         if (StringUtils.isEmpty(sort)) { // 默认排序
-            sort = "DJSJ";
+            sort = "CJSJ";
             order = "desc";
         }
         map.put("sort", sort);
         map.put("order", order);
         map.put("entity", yhkjbxx);
-        page.setTotal(yhkxxCjDao.queryPageCount(map));
+        page.setTotal(yhkxxCjDao.queryYhkjbxxPageCount(map));
+        if (page.getTotal() == 0) {
+            page.setRows(new ArrayList<>());
+        } else {
+            page.setRows(yhkxxCjDao.queryYhkjbxxPageList(map));
+        }
+        return page;
+    }
+
+
+    @Override
+    public Boolean saveYhkjyjl(TbXwYthcjYhkjyjl yhkjyjl, String ssdw) {
+        Boolean b = false;
+        try {
+            int a = yhkxxCjDao.insertYhkjyjl(yhkjyjl);
+            if (a > 0){
+                b = true;
+                if(ssdw!=null&&"14".equals(ssdw.substring(0,2))) {
+                    //jwzhDao.insertXdwpxx(yhkjyjl);
+                }
+            }
+        }catch (Exception e){
+            System.out.println("插入随身物品数据失败"+e);
+        }
+        return b;
+    }
+
+    @Override
+    public TbXwYthcjYhkjyjl getYhkjyjlByXxzjbh(String xxzjbh) {
+        return yhkxxCjDao.getYhkjyjlByXxzjbh(xxzjbh);
+    }
+
+    @Override
+    public Boolean updateYhkjyjl(TbXwYthcjYhkjyjl yhkjyjl,String ssdw) {
+        Boolean b = false;
+        try {
+            int a = yhkxxCjDao.updateYhkjyjl(yhkjyjl);
+            if (a > 0){
+                b = true;
+                if(ssdw!=null&&"14".equals(ssdw.substring(0,2))) {
+                    //jwzhDao.updateXdwpxx(yhkjyjl);
+                }
+            }
+        }catch (Exception e){
+            System.out.println("修改随身物品数据失败"+e);
+        }
+        return b;
+    }
+
+    @Override
+    public Boolean deleteYhkjyjl(String xxzjbh) {
+        Boolean b = false;
+        try {
+            int a = yhkxxCjDao.deleteYhkjyjl(xxzjbh);
+            if (a > 0){
+                b = true;
+            }
+        }catch (Exception e){
+            System.out.println("删除随身物品数据失败"+e);
+        }
+        return b;
+    }
+
+    @Override
+    public EasyUIPage queryYhkjyjlPage(EasyUIPage page, TbXwYthcjYhkjyjl yhkjyjl) {
+        Map<String, Object> map = new HashMap<>();
+        String djdw = yhkjyjl.getLrdwdm();
+        if(djdw!=null&&djdw!=""){
+            if (djdw.substring(2, 12).equals("0000000000")) {//省
+                yhkjyjl.setLrdwdm(djdw.substring(0,2));
+            } else if (djdw.substring(4, 12).equals("00000000")) {//市
+                yhkjyjl.setLrdwdm(djdw.substring(0,4));
+            }else if(djdw.substring(6, 12).equals("000000")){ //县
+                yhkjyjl.setLrdwdm(djdw.substring(0,6));
+            }else if(djdw.substring(8, 12).equals("0000")){ //所
+                yhkjyjl.setLrdwdm(djdw.substring(0,8));
+            }
+        }
+        map.put("begin", page.getBegin());
+        map.put("end", page.getEnd());
+        String sort = page.getSort();
+        String order = page.getOrder();
+        if (StringUtils.isEmpty(sort)) { // 默认排序
+            sort = "CJSJ";
+            order = "desc";
+        }
+        map.put("sort", sort);
+        map.put("order", order);
+        map.put("entity", yhkjyjl);
+        page.setTotal(yhkxxCjDao.queryYhkjyjlPageCount(map));
         if (page.getTotal() == 0) {
             page.setRows(new ArrayList<>());
         } else {
-            page.setRows(yhkxxCjDao.queryPageList(map));
+            page.setRows(yhkxxCjDao.queryYhkjyjlPageList(map));
         }
         return page;
     }

src/main/resources/static/ryswtz/css/btn-ico.css

@@ -61,7 +61,7 @@ body .lf50{width:50%;float:left;}
 .btn_hg,.btn_cx,.btn_qkcxtj{text-decoration: none;}
 .cx_table_tj,.cx_table_tj tr th, .cx_table_tj tr td { font-weight: 600;border:2px solid #fff;padding:0 8px;}/*text-indent:10px;*/
 .td_bg{font-weight: 600;background-image:linear-gradient(to bottom,#f8fbfb 0,#e4f5f5 100%);background-repeat: repeat-x;}
-.h_title_jc,.h_title_gd,.h_title_rx,.h_title_zl,.h_title_cx,.h_title_ryxxxq,.h_title_xnsfxx,.h_title_hyxxxq{
+.h_title_jc,.h_title_gd,.h_title_rx,.h_title_zl,.h_title_cx,.h_title_ryxxxq,.h_title_ajxxxq,.h_title_xnsfxx,.h_title_hyxxxq{
     float: left;
     display: inline-block;
     height: 80px;
@@ -74,6 +74,7 @@ body .lf50{width:50%;float:left;}
 .h_title_zl{background: url(../images/zljc.png);width:400px;}
 .h_title_cx{background: url(../images/ryxxxq.png);width:400px;}
 .h_title_ryxxxq{background: url(../images/ryswtzxx.png);width:400px;}
+.h_title_ajxxxq{background: url(../images/ajswtzxx.png);width:400px;}
 .h_title_xnsfxx{background: url(../images/xnsfxx.png);width:400px;}
 .h_title_hyxxxq{background: url(../images/hyxxxq.png);width:400px;}
 .result .bhg-span-c{cursor: pointer;}

src/main/resources/static/xtba/login/css/style-hn.css

@@ -835,4 +835,4 @@ body {
 .radar03{line-height: 40em;}
 .radar .scanning-circle .radar-scanner {
   width: 40em;
-}
+}}

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

@@ -1485,13 +1485,7 @@
 		}
 		//银行卡采集
 		function yhkcj(){
-			debugger;
-			var buff = "";
-			var buffs = "";
-			var re  = ICC_GetInfo("01","U","1","A",icflag ,"A","", Buff);
-			alert("1="+re+"========"+buff);
-			var res  = HD_ICC_GetTxDetail("01","U","1","A",icflag ,"", Buff);
-			alert("2="+res+"========"+buffs);
+			window.open("/toYhkxxcj?rybh="+$("#rybh").val()+"&xm="+$("#xm").val()+"&gmsfhm="+$("#gmsfhm").val());
 		}
 
 		//随身物品采集
@@ -1828,7 +1822,7 @@
 					<div id="ryzjxx" style="display:none;">
 						<div class="input-group l1 br">
 							<span class="input-group-addon" style="width:32%; height:32px;">足迹类型</span>
-							<input id="zjlxdm" name="zjlxdm" type="text"   style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_ZJLX',method:'get',textField : 'text', valueField : 'id'" />
+							<input id="zjlxdm" name="zjlxdm" type="text"   style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_YTHCJ_ZJLX',method:'get',textField : 'text', valueField : 'id'" />
 							<input type="hidden" id="zjlxdmStr" th:value="${ryxx.zjlxdm}"/>
 						</div>
 
@@ -2010,7 +2004,7 @@
 					</div>
 					<div class="input-group l1"  style="margin-left: 27px;">
 						<span class="input-group-addon" style="width:32%; height:32px;">样本类型</span>
-						<input id="dnayblxdm" name="dnayblxdm" type="text"    style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_YBLX',method:'get',textField : 'text', valueField : 'id'" />
+						<input id="dnayblxdm" name="dnayblxdm" type="text"    style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_YTHCJ_DNAYBLX',method:'get',textField : 'text', valueField : 'id'" />
 						<input type="hidden" id="dnayblxdmStr" th:value="${ryxx.dnayblxdm}"/>
 					</div>
 					<div class="input-group l1" style="width: 900px;">
@@ -2162,10 +2156,10 @@
 		<li><a href="#"><i class="fa fa-barcode"></i> 笔迹信息采集（建设中）</a></li>
 		<li><a href="#"><i class="fa fa-barcode"></i> 社会信息导入（建设中）</a></li>
 		<li><a href="#"><i class="fa fa-barcode"></i> 关系人信息采集（建设中）</a></li>
-		<!-- <li id="hmts"><a onclick="hmts()" href="#"><i class="fa fa-barcode"></i> 虹膜推送</a></li>
+		<li id="hmts"><a onclick="hmts()" href="#"><i class="fa fa-barcode"></i> 虹膜推送</a></li>
 		<li id="hmcy"><a onclick="hmcy()" href="#"><i class="fa fa-barcode"></i> 虹膜查验</a></li>
 		<li id="hmhy"><a onclick="hmhy()" href="#"><i class="fa fa-barcode"></i> 虹膜核验</a></li>
-		<li><a href="javascript:prtzw()"><i class="fa fa-print"></i> 打印指纹卡</a></li>
+        <!-- <li><a href="javascript:prtzw()"><i class="fa fa-print"></i> 打印指纹卡</a></li>
         <li name="qxsbflag"><a onclick="showScan()"><i class="fa fa-barcode"></i> 指纹卡扫描</a></li>
         <li><a href="javascript:saveBiCj()"><i class="fa fa-address-card-o"></i> 采集笔迹</a></li>
         <li><a href="javascript:window.open('http://10.188.45.120:8080/FARS')"><i class="fa fa-address-card-o"></i> 人像比对</a></li>

src/main/resources/templates/sswp/sswpcxlist.html

@@ -179,6 +179,8 @@
         function doClear(){
             $("form[name='ssxdwpxxForm']") .find("input").val('');
             $("#rybh").val($("#asjxgrybh").val());
+            $("#xdwp_wplxdm").combobox("setValue",'');
+            $("#wpysdm").combobox("setValue",'');
         }
 
         //新增

src/main/resources/templates/yhkcj/yhkcxlist.html

@@ -26,15 +26,15 @@
 
 <body  style="overflow: auto" onload="pop();">
     <header class="heade-box">
-        <img src="/static/xtba/ssxdwp/css/images/title_sswpxx.png" class="header-title-img" alt="">
+        <img src="/static/xtba/ssxdwp/css/images/title_yhkxx.png" class="header-title-img" alt="">
     </header>
     <article class="main-cen-box" style="padding: 18px;margin: 13px auto;width: 95%;box-shadow: 2px 2px 23px #909090;">
         <div class="cxtj">
-            <input type="hidden" name="asjxgrybh" id="asjxgrybh" th:value="${asjxgrybh}">
+            <input type="hidden" name="asjxgrybh" id="asjxgrybh" th:value="${rybh}">
             <input type="hidden" name="xm" id="xm" th:value="${xm}">
             <input type="hidden" name="gmsfhm" id="gmsfhm" th:value="${gmsfhm}">
             <form name="yhkxxForm">
-                <input type="hidden" name="rybh" id="rybh" th:value="${asjxgrybh}">
+                <input type="hidden" name="rybh" id="rybh" th:value="${rybh}">
                 <fieldset>
                     <legend>查询条件</legend>
                     <table>
@@ -52,7 +52,7 @@
                                 <td class="ar" width="13.3%">姓名：</td>
                                 <td width="20%">
                                     <span class="textbox">
-                                        <input type="text" style="height: 30px;" id="xm" name="xm" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_SAWP',method:'get',textField : 'text', valueField : 'id'"/>
+                                        <input type="text" name="xm">
                                     </span>
                                 </td>
                                 <td class="ar" width="13.3%">证件号码：</td>
@@ -66,19 +66,19 @@
                                 <td class="ar" width="13.3%">开户时间：</td>
                                 <td width="20%">
                                     <span class="textbox">
-                                        <input type="text" name="khrqQsrq">
+                                        <input type="text" id="khrqQsrq" name="khrqQsrq" class="easyui-datebox"   style="width:100%; height:30px;">
                                     </span>
                                 </td>
                                 <td class="ar" width="13.3%">至：</td>
                                 <td width="20%">
                                     <span class="textbox">
-                                        <input type="text" name="khrqJzrq">
+                                        <input type="text" id="khrqJzrq" name="khrqJzrq" class="easyui-datebox"   style="width:100%; height:30px;">
                                     </span>
                                 </td>
-                                <td class="ar" width="13.3%">银行卡类型：</td>
+                                <td class="ar" width="13.3%">开户行：</td>
                                 <td width="20%">
                                     <span class="textbox">
-                                        <input type="text" style="height: 30px;" id="yhklx" name="yhklx" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_YS',method:'get',textField : 'text', valueField : 'id'"/>
+                                        <input type="text" name="khh">
                                     </span>
                                 </td>
                             </tr>
@@ -98,11 +98,9 @@
         </div>
 
         <div class="main-table-div">
-            <div class="statistics">列表展示
-                <span class="st-span total">0</span>
-            </div>
+            <div class="statistics">列表展示</div>
             <div style="margin-top:10px">
-                <table class="easyui-datagrid" style="border-top:1px dashed #ccc;" id="ssxdwpxxtable">
+                <table class="easyui-datagrid" style="border-top:1px dashed #ccc;" id="yhkjbxxtable">
                 </table>
             </div>
         </div>
@@ -124,7 +122,6 @@
     <script id="scripturlid" src="/static/common/js/checkurl.js?url=${perurl}" type="text/javascript"></script>
     <script>
         function pop(){
-            $("#flrsjStr").datebox("setValue",$("#cxqssj").val());
             doQuery();
         }
         //将表单序列化
@@ -143,19 +140,19 @@
             var table_title = [
                 {title:"操作",field:"xxsc_pdbz",align:'center',color:'gree',width:140,formatter:function(val,row,index){
                     var xxzjbh=row.xxzjbh;
-                    var xdqtwp_wpmc=row.xdqtwp_wpmc;
-                    return "<span style='color: blue;' class='hg-btn' onclick=\"modify('"+xxzjbh+"')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+xxzjbh+"','"+xdqtwp_wpmc+"')\">删除</span>";
+                    var yhkkh=row.yhkkh;
+                    return "<span style='color: blue;' class='hg-btn' onclick=\"modify('"+xxzjbh+"')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+xxzjbh+"','"+yhkkh+"')\">删除</span>";
                 }},
                 {title:"银行卡号",field:"yhkkh",align:'left',width:180},
-                {title:"姓名",field:"xm",align:'left',width:150},
+                {title:"姓名",field:"xm",align:'left',width:120},
                 {title:"证件号码",field:"zjhm",align:'left',width:180},
-                {title:"银行卡类型",field:"yhklx",align:'left',width:200},
+                {title:"银行卡类型",field:"yhklxStr",align:'left',width:200},
                 {title:"开户行",field:"khh",align:'left',width:200},
-                {title:"开户日期",field:"khrq",align:'left',width:80},
-                {title:"销户日期",field:"xhrq",align:'left',width:280}
+                {title:"开户日期",field:"khrqStr",align:'left',width:150},
+                {title:"销户日期",field:"xhrqStr",align:'left',width:150}
             ];
-            $('#yhkxxForm').datagrid({
-                url: "queryYhkxxList",
+            $('#yhkjbxxtable').datagrid({
+                url: "queryYhkjbxxList",
                 columns : [table_title],
                 striped : true,
                 queryParams:serializeObject($("form[name='yhkxxForm']")),
@@ -167,7 +164,7 @@
                 checkOnSelect : false,
                 fit:false,
                 pagination : true,
-                pageSize : 10,
+                pageSize : 20,
                 pageList : [10,20,50,100,200], //rows
                 pageNumber : 1,
                 loadFilter: function(data){
@@ -178,27 +175,29 @@
         //清空
         function doClear(){
             $("form[name='yhkxxForm']") .find("input").val('');
-            $("#asjxgrybh").val($("#rybh").val());
+            $("#rybh").val($("#asjxgrybh").val());
+            $("#khrqQsrq").datebox("setValue",'');
+            $("#khrqJzrq").datebox("setValue",'');
         }
 
         //新增
         function toAddpage(){
-            var url = "/toAddWpxx?asjxgrybh="+$("#rybh").val();
+            var url = "/toAddYhkjbxx?asjxgrybh="+$("#rybh").val();
             window.open(url);
         }
 
         //修改
         function modify(xxzjbh){
-            var url = "/toEditWpxx?asjxgrybh="+$("#rybh").val()+"&xxzjbh="+xxzjbh;
+            var url = "/toEditYhkjbxx?asjxgrybh="+$("#rybh").val()+"&xxzjbh="+xxzjbh;
             window.open(url);
         }
 
         //删除
         function cut(xxzjbh,wpmc){
-            $.messager.confirm('信息删除','确定要删除物品名称为：'+wpmc+'  的信息？', function(r){
+            $.messager.confirm('信息删除','确定要删除卡号为：'+wpmc+'  的信息？', function(r){
                 if(r) {
                     $.ajax({
-                        url:"/toDeleteWpxx?xxzjbh="+xxzjbh,
+                        url:"/toDeleteYhkjbxx?xxzjbh="+xxzjbh,
                         date:{"xxzjbh":xxzjbh},
                         type:"POST",
                         success:function(data){

src/main/resources/templates/yhkcj/yhkdetail.html

@@ -28,8 +28,9 @@
 	<div class="content_wrap">
 		<div class="con-ggh">
 			<legend>银行卡基本信息</legend>
-			<input type="hidden" name="rybh" id="rybh" th:value="${ryxx.rybh}"/>
-			<input type="hidden" name="xxzjbh" id="xxzjbh" th:value="${ryxx.rybh}"/>
+			<input type="hidden" name="rybh" id="rybh" th:value="${yhkxx.rybh}"/>
+			<input type="hidden" name="xxzjbh" id="xxzjbh" th:value="${yhkxx.xxzjbh}"/>
+			<input type="hidden" id="saveflag" name="saveflag" th:value="${saveflag}"/>
 			<table style="width:100%;border-collapse: collapse;background-color: rgba(255,255,255,0.75);text-align:left;" class="hb-content">
 				<tr>
 					<td class="td_r" style="width:10%;"></td>
@@ -40,23 +41,22 @@
 					<td class="td_bg" style="width:20%;"></td>
 				</tr>
 				<tr>
-					<td class="td_c" style="width:30%;" colspan="2" rowspan="6" ><img id="imghead1" name="imghead1"  src="static/zwbdxq/img/img.gif" style="height:168px;"></td>
 					<td class="td_r" style="width:10%;">人员编号：</td>
-					<td class="td_bg" style="width:20%;" th:text="${ryxx.rybh}"></td>
+					<td class="td_bg" style="width:20%;"></td>
 					<td class="td_r" style="width:10%;"></td>
 					<td class="td_bg" style="width:20%;"></td>
 				</tr>
 				<tr>
 					<td class="td_r">姓名：</td>
-					<td class="td_bg" th:text="${ryxx.xm}"></td>
+					<td class="td_bg" th:text="${yhkxx.xm}"></td>
 					<td class="td_r">曾用名：</td>
-					<td class="td_bg" th:text="${ryxx.cym}"></td>
+					<td class="td_bg" th:text="${yhkxx.zjhm}"></td>
 				</tr>
 				<tr>
 					<td class="td_r">证件类型：</td>
 					<td class="td_bg">居民身份证</td>
 					<td class="td_r">证件号码：</td>
-					<td class="td_bg" th:text="${ryxx.zjhm}"></td>
+					<td class="td_bg" th:text="${yhkxx.zjhm}"></td>
 				</tr>
 				<tr>
 					<td class="td_r">性别：</td>