Commit 16ffc990 by wangling

20190327---wangling---更新数据表时间的将之前的gxsj改为xxrsksj,在上报日志表中添加字段sjbbh

parent 3a5f3781
...@@ -6,6 +6,8 @@ import org.springframework.format.annotation.DateTimeFormat; ...@@ -6,6 +6,8 @@ import org.springframework.format.annotation.DateTimeFormat;
public class Sjsblog extends BaseModel { public class Sjsblog extends BaseModel {
//主键 //主键
private String xxzjbh = null; private String xxzjbh = null;
//数据包编号
private String sjbbh = null;
//业务信息代码 //业务信息代码
private String ywxxdm = null; private String ywxxdm = null;
//表名 //表名
...@@ -42,6 +44,12 @@ public class Sjsblog extends BaseModel { ...@@ -42,6 +44,12 @@ public class Sjsblog extends BaseModel {
public void setXxzjbh(String xxzjbh) { public void setXxzjbh(String xxzjbh) {
this.xxzjbh = xxzjbh; this.xxzjbh = xxzjbh;
} }
public String getSjbbh() {
return sjbbh;
}
public void setSjbbh(String sjbbh) {
this.sjbbh = sjbbh;
}
public String getYwxxdm() { public String getYwxxdm() {
return ywxxdm; return ywxxdm;
} }
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
ROWNUM RN FROM ( ROWNUM RN FROM (
select select
XXZJBH as xxzjbh, XXZJBH as xxzjbh,
SJBBH as sjbbh,
YWXXDM as ywxxdm, YWXXDM as ywxxdm,
TBLNAME as tblname, TBLNAME as tblname,
KEYVALUE as keyvalue, KEYVALUE as keyvalue,
...@@ -23,6 +24,7 @@ ...@@ -23,6 +24,7 @@
BDZT as bdzt, BDZT as bdzt,
BDSJ as bdsj BDSJ as bdsj
from SYS_LOG_SJSB where scbz='0' from SYS_LOG_SJSB where scbz='0'
<if test="sjbbh!=null and sjbbh!=''"> and sjbbh = #{sjbbh, jdbcType=VARCHAR}</if>
<if test="ywxxdm!=null and ywxxdm!=''"> and ywxxdm = #{ywxxdm, jdbcType=VARCHAR}</if> <if test="ywxxdm!=null and ywxxdm!=''"> and ywxxdm = #{ywxxdm, jdbcType=VARCHAR}</if>
<if test="tblname!=null and tblname!=''"> and tblname = #{tblname, jdbcType=VARCHAR}</if> <if test="tblname!=null and tblname!=''"> and tblname = #{tblname, jdbcType=VARCHAR}</if>
<if test="keyvalue!=null and keyvalue!=''"> and keyvalue = #{keyvalue, jdbcType=VARCHAR}</if> <if test="keyvalue!=null and keyvalue!=''"> and keyvalue = #{keyvalue, jdbcType=VARCHAR}</if>
...@@ -43,6 +45,7 @@ ...@@ -43,6 +45,7 @@
<!-- 查询数据上报信息 --> <!-- 查询数据上报信息 -->
<select id="getSjsbxxTotal" parameterType="com.cc.bean.Sjsblog" resultType="java.lang.Integer"> <select id="getSjsbxxTotal" parameterType="com.cc.bean.Sjsblog" resultType="java.lang.Integer">
select count(*) from SYS_LOG_SJSB where scbz='0' select count(*) from SYS_LOG_SJSB where scbz='0'
<if test="sjbbh!=null and sjbbh!=''"> and sjbbh = #{sjbbh, jdbcType=VARCHAR}</if>
<if test="ywxxdm!=null and ywxxdm!=''"> and ywxxdm = #{ywxxdm, jdbcType=VARCHAR}</if> <if test="ywxxdm!=null and ywxxdm!=''"> and ywxxdm = #{ywxxdm, jdbcType=VARCHAR}</if>
<if test="tblname!=null and tblname!=''"> and tblname = #{tblname, jdbcType=VARCHAR}</if> <if test="tblname!=null and tblname!=''"> and tblname = #{tblname, jdbcType=VARCHAR}</if>
<if test="keyvalue!=null and keyvalue!=''"> and keyvalue = #{keyvalue, jdbcType=VARCHAR}</if> <if test="keyvalue!=null and keyvalue!=''"> and keyvalue = #{keyvalue, jdbcType=VARCHAR}</if>
...@@ -72,7 +75,7 @@ ...@@ -72,7 +75,7 @@
select (CASE WHEN fwzt=0 THEN '正在上报' WHEN fwzt=1 THEN '验证不通过' WHEN fwzt=2 THEN '未上报' WHEN fwzt=19999 THEN '上报失败' WHEN fwzt=10201 THEN '文档不合法' WHEN fwzt=10101 THEN '上报成功' END )as fwzt, select (CASE WHEN fwzt=0 THEN '正在上报' WHEN fwzt=1 THEN '验证不通过' WHEN fwzt=2 THEN '未上报' WHEN fwzt=19999 THEN '上报失败' WHEN fwzt=10201 THEN '文档不合法' WHEN fwzt=10101 THEN '上报成功' END )as fwzt,
(CASE WHEN scbz=0 THEN '未删除' WHEN scbz=1 THEN '已删除' END )as scbz, (CASE WHEN scbz=0 THEN '未删除' WHEN scbz=1 THEN '已删除' END )as scbz,
(CASE WHEN bdzt=0 THEN '通过' WHEN bdzt=1 THEN '不通过' END )as bdzt, (CASE WHEN bdzt=0 THEN '通过' WHEN bdzt=1 THEN '不通过' END )as bdzt,
xxzjbh,ywxxdm,tblname,keyvalue,sbztdesc,lrsj,gxsj,fhsj xxzjbh,sjbbh,ywxxdm,tblname,keyvalue,sbztdesc,lrsj,gxsj,fhsj
from SYS_LOG_SJSB where scbz='0' from SYS_LOG_SJSB where scbz='0'
<if test="xxzjbh!=null and xxzjbh!=''"> and xxzjbh = #{xxzjbh, jdbcType=VARCHAR}</if> <if test="xxzjbh!=null and xxzjbh!=''"> and xxzjbh = #{xxzjbh, jdbcType=VARCHAR}</if>
<if test="tblname!=null and tblname!=''"> and tblname = #{tblname, jdbcType=VARCHAR}</if> <if test="tblname!=null and tblname!=''"> and tblname = #{tblname, jdbcType=VARCHAR}</if>
...@@ -80,9 +83,9 @@ ...@@ -80,9 +83,9 @@
</select> </select>
<!-- 根据主键编号更新数据对应的上报时间 --> <!-- 根据主键编号更新数据对应的上报时间 -->
<update id="updateSbsj" parameterType="com.cc.bean.Sjsb"> <update id="updateSbsj" parameterType="com.cc.bean.Sjsb">
update ${tblname} set gxsj = sysdate where 1=1 update ${tblname} set xxrsksj = sysdate where 1=1
<if test="keyname!=null and keyname!=''"> <!-- ids是map的一个key --> <if test="keyname!=null and keyname!=''"> <!-- ids是map的一个key -->
and ${keyname} in ($xxzjbhs) and ${keyname} in (${xxzjbhs})
</if> </if>
</update> </update>
<!-- 新增 --> <!-- 新增 -->
......
...@@ -49,6 +49,12 @@ ...@@ -49,6 +49,12 @@
<td colspan="6" style="height:20px;"></td> <td colspan="6" style="height:20px;"></td>
</tr> </tr>
<tr> <tr>
<td class="ar" width="13.3%">数据包编号:</td>
<td width="20%">
<span class="textbox">
<input name="sjbbh" id="sjbbh" type="text" placeholder="" style="border:none;width: 100%;"/>
</span>
</td>
<td class="ar" width="13.3%">表名称:</td> <td class="ar" width="13.3%">表名称:</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
...@@ -61,17 +67,6 @@ ...@@ -61,17 +67,6 @@
<input name="keyvalue" id="keyvalue" type="text" placeholder="" style="border:none;width: 100%;"/> <input name="keyvalue" id="keyvalue" type="text" placeholder="" style="border:none;width: 100%;"/>
</span> </span>
</td> </td>
<td class="ar" width="13.3%">服务状态:</td>
<td width="20%">
<select class="select-td" name="fwzt" id="fwzt">
<option value="" selected = "selected">------请选择------</option>
<option value="2">未上报</option>
<option value="0">正在上报</option>
<option value="1">验证不通过</option>
<option value="10101">上报成功</option>
<option value="19999">上报失败</option>
</select>
</td>
</tr> </tr>
<tr> <tr>
<td class="ar" width="13.3%">请求开始时间:</td> <td class="ar" width="13.3%">请求开始时间:</td>
...@@ -90,13 +85,16 @@ ...@@ -90,13 +85,16 @@
onFocus="WdatePicker({minDate:'#F{$dp.$D(\'lrsjStart\')}',dateFmt:'yyyy-MM-dd HH:mm'})"/> onFocus="WdatePicker({minDate:'#F{$dp.$D(\'lrsjStart\')}',dateFmt:'yyyy-MM-dd HH:mm'})"/>
</span> </span>
</td> </td>
<td class="ar" width="13.3%">比对状态:</td> <td class="ar" width="13.3%">服务状态:</td>
<td width="20%"> <td width="20%">
<select class="select-td" name="bdzt" id="bdzt"> <select class="select-td" name="fwzt" id="fwzt">
<option value="" selected = "selected">------请选择------</option> <option value="" selected = "selected">------请选择------</option>
<option value="0">通过</option> <option value="2">未上报</option>
<option value="1">不通过</option> <option value="1">验证不通过</option>
</select> <option value="0">正在上报</option>
<option value="10101">上报成功</option>
<option value="19999">上报失败</option>
</select>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -116,8 +114,14 @@ ...@@ -116,8 +114,14 @@
onFocus="WdatePicker({minDate:'#F{$dp.$D(\'gxsjStart\')}',dateFmt:'yyyy-MM-dd HH:mm'})"/> onFocus="WdatePicker({minDate:'#F{$dp.$D(\'gxsjStart\')}',dateFmt:'yyyy-MM-dd HH:mm'})"/>
</span> </span>
</td> </td>
<td class="ar" ></td> <td class="ar" width="13.3%">比对状态:</td>
<td width="20%"> </td> <td width="20%">
<select class="select-td" name="bdzt" id="bdzt">
<option value="" selected = "selected">------请选择------</option>
<option value="0">通过</option>
<option value="1">不通过</option>
</select>
</td>
</tr> </tr>
<tr> <tr>
<td class="ar" width="13.3%">回执开始时间:</td> <td class="ar" width="13.3%">回执开始时间:</td>
...@@ -160,8 +164,8 @@ ...@@ -160,8 +164,8 @@
<thead> <thead>
<tr> <tr>
<th><input id="checkAll" class="checkAll checbox16" type="checkbox" value=""><label for="checkAll">全选</label></th> <th><input id="checkAll" class="checkAll checbox16" type="checkbox" value=""><label for="checkAll">全选</label></th>
<th>表名称</th> <th>数据包编号</th>
<th>业务代码</th> <th>表名称</th>
<th>主键值</th> <th>主键值</th>
<th>服务状态</th> <th>服务状态</th>
<th>比对状态</th> <th>比对状态</th>
...@@ -200,9 +204,9 @@ ...@@ -200,9 +204,9 @@
var tableid = "sbsjList"; var tableid = "sbsjList";
var queryColumns =[ var queryColumns =[
{data: "",width:'7%',render: function(data, type, row, meta) {return nulltostr("<input class='checbox16' name='choose' type='checkbox' value='"+row.xxzjbh+"' />");}}, {data: "",width:'7%',render: function(data, type, row, meta) {return nulltostr("<input class='checbox16' name='choose' type='checkbox' value='"+row.xxzjbh+"' />");}},
{data: "tblname",width:'12%',render: function(data, type, row, meta) {return nulltostr(data);}}, {data: "sjbbh",width:'12%',render: function(data, type, row, meta) {return nulltostr(data);}},
{data: "ywxxdm",width:'10%',render: function(data, type, row, meta) {return nulltostr(data);}}, {data: "tblname",width:'12%',render: function(data, type, row, meta) {return nulltostr(data);}},
{data: "keyvalue",width:'20%',render: function(data, type, row, meta) {return nulltostr(data+"<span onclick=\"showYche(this,'"+(row.xxzjbh)+"')\";><img src='sjsblog/img/asjxx_ychy.png' style='width:20px;position: relative;'/></span>");}}, {data: "keyvalue",width:'18%',render: function(data, type, row, meta) {return nulltostr(data+"<span onclick=\"showYche(this,'"+(row.xxzjbh)+"')\";><img src='sjsblog/img/asjxx_ychy.png' style='width:20px;position: relative;'/></span>");}},
{data: "fwzt",width:'10%',render: function(data, type, row, meta) {return nulltostrfwzt(data);}}, {data: "fwzt",width:'10%',render: function(data, type, row, meta) {return nulltostrfwzt(data);}},
{data: "bdzt",width:'8%',render: function(data, type, row, meta) {return nulltostrbdzt(data);}}, {data: "bdzt",width:'8%',render: function(data, type, row, meta) {return nulltostrbdzt(data);}},
{data: "lrsj",width:'11%',render: function(data, type, row, meta) {if(data){data=data.substring(0,19);}return nulltostr(data);}}, {data: "lrsj",width:'11%',render: function(data, type, row, meta) {if(data){data=data.substring(0,19);}return nulltostr(data);}},
...@@ -210,6 +214,7 @@ ...@@ -210,6 +214,7 @@
{data: "fhsj",width:'11%',render: function(data, type, row, meta) {if(data){data=data.substring(0,19);}return nulltostr(data);}} {data: "fhsj",width:'11%',render: function(data, type, row, meta) {if(data){data=data.substring(0,19);}return nulltostr(data);}}
] ; ] ;
var data = {}; var data = {};
data["sjbbh"] = $("#sjbbh").val();
data["tblname"] = $("#tblname").val(); data["tblname"] = $("#tblname").val();
data["keyvalue"] = $("#keyvalue").val(); data["keyvalue"] = $("#keyvalue").val();
data["fwzt"] = $("#fwzt").val(); data["fwzt"] = $("#fwzt").val();
...@@ -318,6 +323,7 @@ ...@@ -318,6 +323,7 @@
return tabelDataServer; return tabelDataServer;
}; };
function doClear(){ function doClear(){
$("#sjbbh").val('');
$("#tblname").val(''); $("#tblname").val('');
$("#keyvalue").val(''); $("#keyvalue").val('');
$("#fwzt").val(''); $("#fwzt").val('');
...@@ -368,7 +374,6 @@ ...@@ -368,7 +374,6 @@
}); });
} }
function shangbao() { function shangbao() {
debugger
//开始上报 //开始上报
obj = document.getElementsByName("choose"); obj = document.getElementsByName("choose");
check_val = []; check_val = [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment