Merge remote-tracking branch 'remotes/master/master' into caopeng_bate1

pom.xml

@@ -206,6 +206,12 @@
             <artifactId>poi</artifactId>
             <version>3.9</version>
         </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.3</version>
+        </dependency>
+
     </dependencies>
     <build>
         <finalName>cqnt</finalName>

src/main/java/com/founder/interservice/bkxx/controller/BkController.java

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Controller
@@ -44,16 +43,15 @@ public class BkController {
         return "/bkxx/bkxxlist";
     }
 
-    @RequestMapping(value ="/saveBkxx",method = {RequestMethod.GET,RequestMethod.POST})
-    public void saveBkxx(Bkxx bkxx){
-        if(bkxx != null){
-            bkService.insertBkxx(bkxx);
-        }
+    @RequestMapping(value ="/saveBkxx",method = {RequestMethod.POST})
+    @ResponseBody
+    public String saveBkxx( Bkxx bkxx){
+        return bkService.saveBkxx(bkxx);
     }
 
-    @RequestMapping(value = "/queryBkxxList")
+    @RequestMapping(value = "/queryBkxxList",method = {RequestMethod.GET,RequestMethod.POST})
     @ResponseBody
-    public Map<String,Object> queryBkxxList(@RequestBody BkxxFilter bkxxFilter,
+    public Map<String,Object> queryBkxxList(BkxxFilter bkxxFilter,
                                             @RequestParam(value = "page",defaultValue = "0") int page,
                                             @RequestParam(value = "rows",defaultValue = "0") int rows){
         Map<String,Object> objectMap = new HashMap<>();
@@ -71,4 +69,15 @@ public class BkController {
         }
         return objectMap;
     }
+
+    @RequestMapping("/updateBkztByXxzjbh")
+    @ResponseBody
+    public String updateBkztByXxzjbh(@RequestParam String  xxzjbh,@RequestParam String bkzt) {
+        Bkxx bkxx =new Bkxx();
+        bkxx.setXxzjbh(xxzjbh);
+        bkxx.setBkzt(bkzt);
+        bkService.updateBkxx(bkxx);
+        return "success";
+    }
+
 }

src/main/java/com/founder/interservice/bkxx/model/Bkxx.java

 package com.founder.interservice.bkxx.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-
-import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 @Entity
@@ -14,16 +14,39 @@ import java.util.Date;
 public class Bkxx {
     @Id
     private String xxzjbh;//信息主键编号
-    private String bkbsh; //布控标识号
+    private String bkdxhm;
+    private String bkdxlx;
+    private String bkdxlxmc;
+    private String bklx;
+    private String bkyj;
+    private String bkyq;
+    private String asjbh ;//案事件编号
+    @JSONField(format = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date bksj_start ;
+
+    @JSONField(format = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date bksj_end;
+    private String sqr_sfzh;
+    private String sqr_xm;
+    private String sqr_jh;
+    private String sqr_lxdh;
+    private String bkzt;//布控状态（0正常；1停止）
+    @JSONField(format = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date djsj;//登记时间
+    private String bkqx;//布控期限
+
+  /*  private String bkbsh; //布控标识号
     private String bshlxdm; //布控号类型代码
     private String bshlxmc;//布控号类型名称
-    private String asjbh ;//案事件编号
     private String bkrSfzh; //布控人身份证号
     private String bkrXm;//布控人姓名
     private String bkrJh;//布控人警号
     private String bkrLxdh;//布控人联系电话
-    private Date bkKssj;//布控开始时间
-    private String bkzt;//布控状态（0正常；1停止）
-    private Date djsj;//登记时间
+    private Date bkKssj;//布控开始时间*/
+
+
 
 }

src/main/java/com/founder/interservice/bkxx/model/BkxxFilter.java

@@ -5,13 +5,19 @@ import lombok.Data;
 @Data
 public class BkxxFilter {
     private String xxzjbh;//信息主键编号
-    private String bkbsh; //布控标识号
-    private String bshlxdm; //布控号类型代码
+    private String bkdxhm; //布控标识号
+    private String bkdxlx; //布控号类型代码
     private String asjbh ;//案事件编号
-    private String bkrSfzh; //布控人身份证号
-    private String bkrXm;//布控人姓名
-    private String bkrJh;//布控人警号
+    private String sqr_sfzh; //布控人身份证号
+    private String sqr_xm;//布控人姓名
+    private String sqr_jh;//布控人警号
     private String bkzt;//布控状态（0正常；1停止）
     private int startNum;
     private int endNum;
+
+
+    private String bkdxlxmc;
+    private String bksj_start;
+    private String bksj_end;
+    private String bkztmc;
 }

src/main/java/com/founder/interservice/bkxx/repository/BkxxRepository.java

+package com.founder.interservice.bkxx.repository;
+
+import com.founder.interservice.bkxx.model.Bkxx;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+
+public interface BkxxRepository extends JpaRepository<Bkxx,String> {
+
+
+}

src/main/java/com/founder/interservice/bkxx/service/BkService.java

@@ -17,12 +17,7 @@ import java.util.Map;
  */
 public interface BkService {
 
-    /**
-     * 保存布控信息
-     * @param bkxx
-     * @return
-     */
-    public void insertBkxx(Bkxx bkxx);
+    public String saveBkxx(Bkxx bkxx) ;
 
     /**
      * 分页查询布控信息
@@ -31,5 +26,5 @@ public interface BkService {
      * @throws InterServiceException
      */
     Map<String, Object> selectBkxxListPage(BkxxFilter bkxxFilter);
-
+    public int updateBkxx(Bkxx bkxx);
 }

src/main/java/com/founder/interservice/bkxx/service/impl/BkServiceImpl.java

@@ -2,35 +2,43 @@ package com.founder.interservice.bkxx.service.impl;
 
 import com.founder.interservice.bkxx.model.Bkxx;
 import com.founder.interservice.bkxx.model.BkxxFilter;
+import com.founder.interservice.bkxx.repository.BkxxRepository;
 import com.founder.interservice.bkxx.service.BkService;
 import com.founder.interservice.exception.InterServiceException;
 import com.founder.interservice.mapper.xzxt.BkxxMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 @Service
 public class BkServiceImpl implements BkService{
 
     @Autowired
     private BkxxMapper bkxxMapper;
+    @Autowired
+    BkxxRepository bkxxRepository;
 
     @Override
-    public void insertBkxx(Bkxx bkxx) {
+    public String saveBkxx(Bkxx bkxx) {
         //先查询是否存在这条数据（案事件编号、布控人警号、布控标识号、布控类型）
-        List<Bkxx> bkxxList = bkxxMapper.selectBkxx(bkxx);
-        if(bkxxList != null && bkxxList.size() > 0){
-            String flag = "已存在";
+        //获取客户端查询条件
+        String flag="success";
+        int bkxxs = bkxxMapper.selectBkxx(bkxx);
+        if(bkxxs<1){
+            bkxx.setXxzjbh(get32UUID());
+            bkxx.setDjsj(new Date());
+            bkxxRepository.save(bkxx);
         }else{
-            String uuid = UUID.randomUUID().toString().replaceAll("-","");
-            uuid = uuid.substring(0,uuid.length()-2);
-            bkxx.setXxzjbh(uuid);
-            bkxxMapper.insertBkxx(bkxx);
+             flag = "error";//已存在
+        }
+        return flag;
     }
+    //32位UUID
+    public static String get32UUID(){
+        UUID id=UUID.randomUUID();
+        String[] idd=id.toString().split("-");
+        return idd[0]+idd[1]+idd[2]+idd[3]+idd[4];
     }
 
     /**
@@ -41,11 +49,16 @@ public class BkServiceImpl implements BkService{
     @Override
     public Map<String, Object> selectBkxxListPage(BkxxFilter bkxxFilter) throws InterServiceException{
         Map<String, Object> resultMap = new HashMap<>();
-        List<Bkxx> bkxxLists = bkxxMapper.selectBkxxListPage(bkxxFilter);
+        List<BkxxFilter> bkxxLists = bkxxMapper.selectBkxxListPage(bkxxFilter);
         int total = bkxxMapper.selectBkxxListPageTotalCount(bkxxFilter);
         resultMap.put("rows",bkxxLists);
         resultMap.put("total",total);
         return resultMap;
     }
 
+    @Override
+    public int updateBkxx(Bkxx bkxx){
+        return bkxxMapper.updateBkxx(bkxx);
+    }
+
 }

src/main/java/com/founder/interservice/config/filter/LogFilter.java

@@ -50,6 +50,11 @@ public class LogFilter implements Filter {
         String projectName = httpServletRequest.getParameter("projectName");
         String objTypeCode = httpServletRequest.getParameter("objType");
         String reqUri = httpServletRequest.getRequestURI();
+        if(reqUri.equals("/saveBkxx")||reqUri.equals("/updateBkztByXxzjbh")){//这两个url不进行过滤。如果过滤的话就必须传yhCate=00&projectName=00这两个参数。
+            //往下执行
+            filterChain.doFilter(httpServletRequest, servletResponse);
+        }
+        else{
             RequestLog requestLog = new RequestLog();
             requestLog.setRzlsh(KeyUtil.getUniqueKey("L"));
             requestLog.setFwsj(new Date());
@@ -139,6 +144,8 @@ public class LogFilter implements Filter {
             }
         }
 
+    }
+
     /**
      * 过滤器销毁方法
      */
@@ -146,4 +153,6 @@ public class LogFilter implements Filter {
     public void destroy() {
         System.out.println("过滤器销毁.............");
     }
+
+
 }

src/main/java/com/founder/interservice/mapper/xzxt/BkxxMapper.java

@@ -3,13 +3,16 @@ package com.founder.interservice.mapper.xzxt;
 import com.founder.interservice.bkxx.model.Bkxx;
 import com.founder.interservice.bkxx.model.BkxxFilter;
 import com.founder.interservice.exception.InterServiceException;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Mapper
 @Repository
 public interface BkxxMapper {
-    List<Bkxx> selectBkxx(Bkxx bkxx);
+    int selectBkxx(Bkxx bkxx);
 
     void insertBkxx(Bkxx bkxx);
 
@@ -19,7 +22,7 @@ public interface BkxxMapper {
      * @return
      * @throws InterServiceException
      */
-    List<Bkxx> selectBkxxListPage(BkxxFilter bkxxFilter);
+    List<BkxxFilter> selectBkxxListPage(BkxxFilter bkxxFilter);
 
     /**
      * 查询布控信息总数（和分页嵌套使用）
@@ -28,4 +31,9 @@ public interface BkxxMapper {
      * @throws InterServiceException
      */
     int selectBkxxListPageTotalCount(BkxxFilter bkxxFilter);
+
+    @Update("update tb_st_bkxx set bkzt=#{bkzt} where xxzjbh=#{xxzjbh}")
+    public int updateBkxx(Bkxx bkxx);
+
+
 }

src/main/resources/mybatis/mapper/xzxt/BkxxMapper.xml

@@ -3,23 +3,23 @@
 <mapper namespace="com.founder.interservice.mapper.xzxt.BkxxMapper">
 
     <sql id = "bkxx_where_sql">
-        <if test="bkbsh != null and bkbsh != ''">
-            and t.BKBSH like CONCAT('%',#{bkbsh},'%')
+        <if test="bkdxhm != null and bkdxhm != ''">
+            and t.bkdxhm  like '%' || #{bkdxhm , jdbcType=VARCHAR } || '%'
         </if>
-        <if test="bshlxdm != null and bshlxdm != '' ">
-            and t.BSH_LXDM like CONCAT('%',#{bshlxdm},'%')
+        <if test="bkdxlx != null and bkdxlx != '' ">
+            and t.bkdxlx = #{bkdxlx}
         </if>
-        <if test="bkrJh != null and bkrJh != ''">
-            and t.BKR_JH like CONCAT('%',#{bkrJh},'%')
+        <if test="sqr_jh != null and sqr_jh != ''">
+            and t.sqr_jh like CONCAT(CONCAT('%',#{sqr_jh}),'%')
         </if>
         <if test="asjbh != null and asjbh != ''">
-            and t.ASJBH like CONCAT('%',#{asjbh},'%')
+            and t.ASJBH  LIKE '%' || #{asjbh , jdbcType=VARCHAR } || '%'
         </if>
-        <if test="bkrXm != null and bkrXm != ''">
-            and t.BKRXM like CONCAT('%',#{bkrXm},'%')
+        <if test="sqr_xm != null and sqr_xm != ''">
+            and t.sqr_xm like CONCAT(CONCAT('%',#{sqr_xm}),'%')
         </if>
-        <if test="bkrSfzh != null and bkrSfzh != ''">
-            and t.BKRSFZH like CONCAT('%',#{bkrSfzh},'%')
+        <if test="sqr_sfzh != null and sqr_sfzh != ''">
+            and t.sqr_sfzh like CONCAT(CONCAT('%',#{sqr_sfzh}),'%')
         </if>
         <if test="bkzt != null and bkzt != ''">
             and t.BKZT = #{bkzt}
@@ -30,72 +30,103 @@
         INSERT INTO TB_ST_BKXX
           (
           xxzjbh,
-          bkbsh,
-          bshlxdm,
-          bshlxmc,
+           bkdxhm,
+           bkdxlx,
+          bkdxlxmc,
+          bklx,
+          bkyj,
+          bkyq,
           asjbh,
-          bkr_Sfzh,
-          bkr_Xm,
-          bkr_Jh,
-          bkr_Lxdh,
-          bk_Kssj,
+          bksj_start ,
+          bksj_end,
+         sqr_sfzh,
+         sqr_xm,
+         sqr_jh,
+         sqr_lxdh,
          bkzt,
-          djsj
+         djsj,
+         bkqx
           )
         VALUES
           (
           #{xxzjbh},
-          #{bkbsh},
-          #{bshlxdm },
-          #{bshlxmc },
-          #{asjbh },
-          #{bkrSfzh },
-          #{bkrXm},
-          #{bkrJh},
-          #{bkrLxdh},
-          SYSDATE,
+          #{bkdxhm},
+          #{bkdxlx },
+          #{bkdxlxmc },
+          #{bklx },
+          #{bkyj },
+          #{bkyq},
+           #{asjbh},
+          #{bksj_start},
+          #{bksj_end},
+          #{sqr_sfzh},
+           #{sqr_xm},
+            #{sqr_jh},
+             #{sqr_lxdh},
               #{bkzt},
-          SYSDATE)
+          SYSDATE,
+          bkqx)
     </insert>
 
     <select id="selectBkxx" parameterType="com.founder.interservice.bkxx.model.Bkxx" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM TB_ST_BKXX t
         <where>
-            <include refid = "bkxx_where_sql" />
+              1=1
+            <if test="sqr_jh != null and sqr_jh != ''">
+                AND t.sqr_jh= #{sqr_jh, jdbcType=VARCHAR }
+            </if>
+            <if test="asjbh != null and asjbh != ''">
+                and t.ASJBH= #{ASJBH, jdbcType=VARCHAR }
+            </if>
+            <if test="bkdxhm != null and bkdxhm != ''">
+                and t.bkdxhm= #{bkdxhm, jdbcType=VARCHAR }
+            </if>
+            <if test="bkdxlx != null and bkdxlx != '' ">
+                and t.bkdxlx= #{bkdxlx, jdbcType=VARCHAR }
+            </if>
+
         </where>
     </select>
     <!-- 布控信息列表查询界面 分页查询 -->
-    <select id = "selectBkxxListPage" parameterType="com.founder.interservice.bkxx.model.BkxxFilter" resultType="com.founder.interservice.bkxx.model.Bkxx">
-        select
-          t2.*
+    <select id="selectBkxxListPage" parameterType="com.founder.interservice.bkxx.model.BkxxFilter" resultType="com.founder.interservice.bkxx.model.BkxxFilter">
+        select *
         from (
-            select t1.*,
-            t1.rownum as rn
+        select
+        t1.*,
+        rownum as rn
         from (
-                SELECT
+        select
         t.XXZJBH as xxzjbh,
-                    t.BKBSH as bkbsh,
-                    t.BSHLXDM as bshlxdm,
-                    t.BSHLXMC as bshlxmc,
+        t.bkdxhm as bkdxhm,
+        t.bkdxlx,
+        t.bkdxlxmc,
         t.ASJBH as asjbh,
-                    t.BKR_SFZH as bkrSfzh,
-                    t.BKR_XM as bkrXm,
-                    t.BKR_JH as bkrJh,
-                    t.BKR_LXDH as bkrLxdh,
-                    t.BK_KSSJ as bkKssj,
-                    t.BKZT as spzt,
+        t.sqr_sfzh,
+        t.sqr_xm,
+        t.sqr_jh,
+        t.sqr_lxdh,
+
+        to_char(t.bksj_start,'yyyy-mm-dd') as bksj_start,
+        to_char(t.bksj_end,'yyyy-mm-dd') as bksj_end,
+        case when t.bkzt = '0' then '布控中'
+        when t.bkzt = '1' then '已撤销'
+        else 　　 ''
+        end
+        as bkztmc,
+        t.bkzt,
         t.DJSJ as djsj
         FROM TB_ST_BKXX t
         <where>
-                    <include refid = "bkxx_where_sql" />
+            <include refid="bkxx_where_sql"/>
         </where>
-            ) t1
+        order by t.DJSJ desc
+        )t1
         <where>
-                t1.rownum <![CDATA[ <= ]]> #{endNum }
+            and rownum <![CDATA[ <= ]]> #{endNum }
         </where>
         ) t2
         <where>
-            t2.rn <![CDATA[ >= ]]> #{startNum }
+            rn <![CDATA[ > ]]> #{startNum }
         </where>
     </select>
     <select id = "selectBkxxListPageTotalCount" parameterType="com.founder.interservice.bkxx.model.BkxxFilter" resultType="int">
@@ -104,5 +135,5 @@
     <where>
         <include refid = "bkxx_where_sql" />
     </where>
-    </select>
+</select>
 </mapper>
\ No newline at end of file

src/main/resources/static/css/style_bkxx.css

@@ -145,7 +145,7 @@ a.left-list-ftitle:hover{
     border-bottom: 1px dashed #ccc;
     color: #666;
     font-weight: bold;
-    width: 99%;
+    width: 100%;
 }
 .cxtj table{
     border: 1px solid #ccc;
@@ -164,7 +164,7 @@ a.left-list-ftitle:hover{
     height: 34px;
     line-height: 34px;
 }
-.cxtj table .textbox ,.layout_table .textbox ,.layout_table_fp .textbox{
+.cxtj table td>.textbox ,.layout_table td>.textbox ,.layout_table_fp td>.textbox{
     display: inline-block;
     height: 28px;
     line-height: 28px;
@@ -172,6 +172,8 @@ a.left-list-ftitle:hover{
     border-radius: 4px;
     width: 80%;
 }
+.textbox .textbox{top:-2px;}
+.textbox .textbox-text{padding:0px !important;}
 .cxtj table .textbox-3{
     width:92.5%;
 }

src/main/resources/static/js/bkxxInsert.js

+ $(function(){
+        $.extend($.fn.validatebox.defaults.rules, {
+            imei: {
+                validator: function (value) {
+                    var re=/^([A-Za-z0-9]{15})$/;
+                    return re.test(value);
+                },
+                message: "输入正确的(15位数字(英文字母))IMEI号!"
+            },
+            imsi: {
+                validator: function (value) {
+                    var re=/^([0-9]{15})$/;
+                    return re.test(value);
+                },
+                message: "输入正确的(15位数字)IMSI号!"
+            },
+            mobile: {
+                validator : function(value) {
+                    return /(^[1][3|4|5|7|8]{1}\d{9}$)/.test(value);
+                },
+                message : "请输入正确的移动电话"
+            },
+            cphm: {
+                validator: function (value) {
+                    var re=/^[\u4e00-\u9fa5]{1}[A-Z]{1}[A-Z_0-9]{5}$/;
+                    return re.test(value);
+                },
+
+                message: "请输入正确的车牌号码"
+            },
+            idCode:{
+                validator:function(value,param){
+                    return /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value);
+                },
+                message: '请输入正确的身份证号'
+            },
+            QQ: {
+                validator: function (value, param) {
+                    return /^[1-9]\d{4,10}$/.test(value);
+                },
+                message: 'QQ号码不正确'
+            },
+            maxLength: {
+                validator: function (value, param) {
+                    if (param) {
+                        if (param[0] != undefined) {
+                            var len = $.trim(value.replace(/[^\x00-\xff]/g,'aaa')).length;
+                            if (len > param[0]) {
+                                return false;
+                            }
+                        }
+                    }
+                    return true;
+                },
+                message: "输入最多输入 {0} 个字符,一个汉字等于三个字符"
+            }
+
+
+        })
+
+    $("#bkdxlx").combobox({
+         onChange: function (lx,o) {
+             var validStr="";
+             if(lx=="001"){//手机
+                 validStr=['mobile'];
+             }else if(lx=="002"){//QQ号码
+                 validStr=['QQ'];
+             }else if(lx=="003"){//微信号码
+
+             }else if(lx=="004"){//身份证号
+                 validStr=['idCode'];
+             }else if(lx=="005"){//车牌号
+                 validStr=['cphm'];
+             }else if(lx=="009"){//微信ID
+
+             }else if(lx=="006"){//IMSI
+                 validStr=['imsi'];
+             }else if(lx=="007"){//IMEI
+                 validStr=['imei'];
+             }
+             if(validStr!=""){
+                 $("#bkdxhm").textbox({
+                     required: true,
+                     validType:validStr
+                 });
+             }
+         }
+     });
+
+    });
+
+ function submit() {
+     var bkdxlxmc=$('#bkdxlx').combobox('getText');//获取下拉框的文本
+     $('#bkdxlxmc').val(bkdxlxmc);
+     var bkdxlx=$("#bkdxlx").combobox('getValue');
+     $("#bkdxlx").combobox({
+         required: true
+     });
+     $("#bkdxlx").combobox('setValue',bkdxlx);
+
+
+     console.info($('#form1').serialize())
+     console.info($('#form1').serializeArray())
+
+     if($('#form1').form('enableValidation').form('validate')){
+         $.ajax({
+             method : 'post',
+             url : 'saveBkxx',
+             dateType:'json',
+             data : $('#form1').serializeArray(),
+             success:function(data){
+                 if(data=="success"){
+                     $.messager.show({title:'提示',msg:'保存成功'});
+                 }else{
+                     $.messager.show({title:'提示',msg:'数据已存在，不可重复提交'});
+                 }
+             },
+             error:function(e) {
+                 $.messager.show({title:'提示',msg:"出错："+e});
+             }
+         })
+     }
+
+ }
+
 function checkfinish(){
     var day1=new Date($("#bksj_start").val());
     var day2=new Date($("#bksj_end").val());
@@ -6,17 +131,10 @@ function checkfinish(){
         $("#bkqx").val(z);
     }
 }
-
-/**
- * 保存布控信息
- */
-function doSave(){
-    alert("保存成功！");
-}
 function doClear(){
-    $("#bkdxlx option:first").prop("selected","selected");
-    $("#bkdxhm").val("");
-    $("#bklx option:first").prop("selected","selected");
+    $("#bkdxlx").combobox('setValue',"");
+    $("#bkdxhm").textbox('setValue',"");
+    $("#bklx").combobox('setValue',"");
     $("#bkyj").val("");
     $("#bkyq").val("");
     $("#sqr_xm").val('');

src/main/resources/static/sql/S026.20190307_chentian_布控信息表增加字段以及修改字段长度.txt

+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S026',0);
+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S026',0);
+COMMIT;
+-------------------------------------------------------------------------------------------
+
+-- Add/modify columns
+alter table TB_ST_BKXX add BKQX VARCHAR2(100);
+-- Add comments to the columns
+comment on column TB_ST_BKXX.BKQX
+  is '布控期限';
+
+ alter table TB_ST_BKXX modify(XXZJBH varchar2(32));
+
+-------------------------------------------------------------------------------------------
+UPDATE XZXT.SYS_DBLOG SET STATUS=1 WHERE SID='S026';
+COMMIT;
\ No newline at end of file

src/main/webapp/WEB-INF/jsp/bkxx/bkxxlist.jsp

@@ -24,18 +24,34 @@
 				<tr>
 					<td class="td_r" style="width:10%;"> 案事件编号：</td>
 					<td style="width:20%;"><input name="asjbh" id="asjbh"/></td>
-					<td class="td_r" style="width:10%;"> 布控标识号：</td>
-					<td style="width:20%;"><input name="bkbsh" id="bkbsh"/></td>
-					<td class="td_r" style="width:10%;"> 标识号类别：</td>
-					<td style="width:20%;"><input name="bshlbdm" id="bshlbdm"/></td>
+					<td class="td_r" style="width:10%;"> 布控对象号码：</td>
+					<td style="width:20%;"><input name="bkdxhm" id="bkdxhm"/></td>
+					<td class="td_r" style="width:10%;"> 布控对象类型：</td>
+					<td style="width:20%;">
+
+						<select name = "bkdxlx" id = "bkdxlx"    style="height:26px;">
+							<option value="">--请选择--</option>
+
+								<option value="001">手机号码</option>
+								<option value="002">QQ号码</option>
+								<option value="003">微信号码</option>
+								<option value="004">身份证号</option>
+								<option value="005">车牌号</option>
+								<option value="009">微信ID</option>
+
+								<option value="006">IMSI</option>
+								<option value="007">IMEI</option>
+
+						</select>
+					</td>
 				</tr>
 				<tr>
 					<td class="td_r" style="width:10%;"> 布控人姓名：</td>
-					<td style="width:20%;"><input name="bkrXm" id="bkrXm"/></td>
+					<td style="width:20%;"><input name="sqr_xm" id="sqr_xm"/></td>
 					<td class="td_r" style="width:15%;"> 布控人身份证号：</td>
-					<td style="width:20%;"><input name="bkrSfzh" id="bkrSfzh"/></td>
+					<td style="width:20%;"><input name="sqr_sfzh" id="sqr_sfzh"/></td>
 					<td class="td_r" style="width:10%;"> 布控人警号：</td>
-					<td style="width:20%;"><input name="bkrJh" id="bkrJh"/></td>
+					<td style="width:20%;"><input name="sqr_jh" id="sqr_jh"/></td>
 				</tr>
 				<tr>
 					<td class="td_r" style="width:10%;"> 布控状态：</td>
@@ -74,39 +90,50 @@
 
     function clear(){
         $("#asjbh").val('');
-        $("#bkbsh").val('');
-        $("#bshlbdm").val('');
-        $("#bkrXm").val('');
-        $("#bkrSfzh").val('');
-        $("#bkrJh").val('');
-        $("#bkzt").datebox("setValue","");
+        $("#bkdxhm").val('');
+        $("#bkdxlx").val('');
+        $("#sqr_xm").val('');
+        $("#sqr_sfzh").val('');
+        $("#sqr_jh").val('');
+        $('input:radio[name="bkzt"]').removeAttr('checked');
     }
 
     function queryBkxxList(){
         var  param= {
             "asjbh":$("#asjbh").val().trim(),
-            "bkbsh":$("#bkbsh").val().trim(),
-            "bshlbdm":$("#bshlbdm").val().trim(),
-            "bkrXm":$("#bkrXm").val().trim(),
-            "bkrSfzh":$("#bkrSfzh").val().trim(),
-			"bkrJh":$("#bkrJh").val().trim(),
-            "bkzt":$("#bkzt").datebox("getValue"),
+            "bkdxhm":$("#bkdxhm").val().trim(),
+            "bkdxlx":$("#bkdxlx").val().trim(),
+            "sqr_xm":$("#sqr_xm").val().trim(),
+            "sqr_sfzh":$("#sqr_sfzh").val().trim(),
+			"sqr_jh":$("#sqr_jh").val().trim(),
+            "bkzt":$("input[name='bkzt']:checked").val(),
             "yhCate":"00",
             "projectName":"刑专智慧侦查脑图"
         };
         var table_title = [
-            {title:"案事件编号",field:"asjbh",align:'center',width:'15%'},
-            {title:"布控标识号",field:"bkbsh",align:'center',width:'12%'},
-            {title:"标识号类别",field:"bshlbdm",align:'center',width:'12%'},
-            {title:"已布控时间",field:"ybksj",align:'center',width:'12%'},
-            {title:"布控人姓名",field:"bkrXm",align:'center',width:'10%'},
-            {title:"布控人身份证号",field:"bkrSfzh",align:'center',width:'15%'},
-            {title:"布控人警号",field:"bkrJh",align:'center',width:'8%'},
-            {title:"布控状态",field:"bkzt",align:'center',width:'8%'},
-            {title:"布控时间",field:"bksj",align:'center',width:'15%'},
+            {title:"案事件编号",field:"asjbh",align:'center',width:'12%'},
+            {title:"布控对象号码",field:"bkdxhm",align:'center',width:'10%'},
+            {title:"布控对象类型",field:"bkdxlxmc",align:'center',width:'8%'},
+            {title:"布控人姓名",field:"sqr_xm",align:'center',width:'10%'},
+            {title:"布控人身份证号",field:"sqr_sfzh",align:'center',width:'15%'},
+            {title:"布控人警号",field:"sqr_jh",align:'center',width:'7%'},
+            {title:"布控开始时间",field:"bksj_start",align:'center',width:'9%'},
+            {title:"布控结束时间",field:"bksj_end",align:'center',width:'9%'},
+            {title:"布控状态",field:"bkztmc",align:'center',width:'10%'},
+            {title : '操作', field : 'opt', align : 'center',width:'10%', formatter :
+                    function(value, row, index) {
+                        var str = "";
+                        if(row.bkzt==0){
+                            str += '<span class="icon_chakan"><a href="javascript:ck(\'' + row.xxzjbh +'\');"  title="撤控">撤控</a></span>';
+						}
+                        return str;
+
+                    }
+            }
+
     ];
         $("#recordLogTable").datagrid({
-            url: "/queryTrackList",
+            url: "/queryBkxxList",
             columns : [table_title],
             queryParams:param,
             striped: true,
@@ -123,6 +150,35 @@
             }
         });
     }
+
+
+    function ck(xxzjbh){  //撤控操作
+        $.messager.confirm("操作提示", "您确定要撤控吗？", function (data) {
+            if (data) {
+                $.ajax({
+                    url : "updateBkztByXxzjbh",
+					data:{xxzjbh:xxzjbh,bkzt:1},
+                    success:function(data){
+                        if(data=="success"){
+                            $.messager.alert({
+                                title:'提示信息' ,
+                                msg:'撤控成功！',
+                                fn:function(){
+                                    window.location.reload();
+                                }
+                            });
+						}
+
+                    },
+                    error:function(e) {
+                        $.messager.show({title:'提示',msg:"出错："+e});
+                    }
+                })
+            }
+        });
+    }
+
+
 </script>
-</body>局
+</body>
 </html>
\ No newline at end of file