Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bigdatainterservice
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
曹鹏
bigdatainterservice
Commits
c6fcbd2f
Commit
c6fcbd2f
authored
May 08, 2019
by
chentian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
布控追踪时间增加年月日,精确布控期限算法
parent
cc413c89
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
42 additions
and
12 deletions
+42
-12
src/main/java/com/founder/interservice/bkxx/model/Bkxx.java
+4
-4
src/main/resources/mybatis/mapper/xzxt/BkxxMapper.xml
+2
-2
src/main/resources/static/js/bkxxInsert.js
+32
-2
src/main/webapp/WEB-INF/jsp/bkxx/bkxxInsert.jsp
+2
-2
src/main/webapp/WEB-INF/jsp/bkxx/gjzzInsert.jsp
+2
-2
No files found.
src/main/java/com/founder/interservice/bkxx/model/Bkxx.java
View file @
c6fcbd2f
...
...
@@ -28,12 +28,12 @@ public class Bkxx {
private
String
bkyq
;
private
String
asjbh
;
//案事件编号
private
String
sms
;
//是否短信通知(0:否 1:是)
@JSONField
(
format
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JSONField
(
format
=
"yyyy-MM-dd
HH:mm:ss
"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
private
java
.
util
.
Date
bksj_start
;
@JSONField
(
format
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JSONField
(
format
=
"yyyy-MM-dd
HH:mm:ss
"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
private
java
.
util
.
Date
bksj_end
;
private
String
sqr_sfzh
;
private
String
sqr_xm
;
...
...
src/main/resources/mybatis/mapper/xzxt/BkxxMapper.xml
View file @
c6fcbd2f
...
...
@@ -114,8 +114,8 @@
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,
to_char(t.bksj_start,'yyyy-mm-dd
HH24:mi:ss
') as bksj_start,
to_char(t.bksj_end,'yyyy-mm-dd
HH24:mi:ss
') as bksj_end,
case when t.bkzt = '0' then '布控中'
when t.bkzt = '1' then '已撤销'
else ''
...
...
src/main/resources/static/js/bkxxInsert.js
View file @
c6fcbd2f
...
...
@@ -140,8 +140,38 @@ function checkfinish(){
var
day1
=
new
Date
(
$
(
"#bksj_start"
).
val
());
var
day2
=
new
Date
(
$
(
"#bksj_end"
).
val
());
if
(
$
(
"#bksj_start"
).
val
()
&&
$
(
"#bksj_end"
).
val
()
!=
""
){
var
z
=
(
day2
-
day1
)
/
86400000
+
"天"
;
$
(
"#bkqx"
).
val
(
z
);
//计算天数
var
timediff
=
day2
-
day1
;
var
days
=
parseInt
(
timediff
/
86400000
);
//计算小时数
var
remain
=
timediff
%
86400000
;
var
hours
=
parseInt
(
remain
/
3600000
);
//计算分钟数
var
remain
=
remain
%
3600000
;
var
mins
=
parseInt
(
remain
/
60000
);
//计算秒
var
remain
=
remain
%
60000
;
var
ss
=
parseInt
(
remain
/
1000
);
var
qx
=
""
;
if
(
days
>
0
){
qx
+=
days
+
"日"
;
}
if
(
hours
>
0
){
qx
+=
hours
+
"时"
;
}
if
(
mins
>
0
){
qx
+=
mins
+
"分"
;
}
if
(
ss
>
0
){
qx
+=
ss
+
"秒"
;
}
$
(
"#bkqx"
).
val
(
qx
);
/* var z=(day2-day1)/86400000;
var dayyu=(day2-day1)%86400000;
var z=(day2-day1)/86400000+"天";
$("#bkqx").val(z);*/
}
}
function
doClear
(){
...
...
src/main/webapp/WEB-INF/jsp/bkxx/bkxxInsert.jsp
View file @
c6fcbd2f
...
...
@@ -136,14 +136,14 @@
<td width="20%">
<span class="textbox">
<input id="bksj_start" name="bksj_start" class="val easyui-validatebox Wdate zdy-wdate " data-options="required: true" type="text" onkeypress="return checkDateFmt();"
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'bksj_end\',{d:-15});}',maxDate:'#F{$dp.$D(\'bksj_end\')}'})" />
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd
HH:mm:ss
',minDate:'#F{$dp.$D(\'bksj_end\',{d:-15});}',maxDate:'#F{$dp.$D(\'bksj_end\')}'})" />
</span>
</td>
<td class="ar" width="13.3%"><span class="red">*</span>至:</td>
<td width="20%">
<span class="textbox">
<input id="bksj_end" name="bksj_end" class="val easyui-validatebox Wdate zdy-wdate " data-options="required: true" type="text" onkeypress="return checkDateFmt();"
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'bksj_start\')}',maxDate:'#F{$dp.$D(\'bksj_start\',{d:15});}'})"/>
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd
HH:mm:ss
',minDate:'#F{$dp.$D(\'bksj_start\')}',maxDate:'#F{$dp.$D(\'bksj_start\',{d:15});}'})"/>
</span>
</td>
...
...
src/main/webapp/WEB-INF/jsp/bkxx/gjzzInsert.jsp
View file @
c6fcbd2f
...
...
@@ -105,14 +105,14 @@
<td width="20%">
<span class="textbox">
<input id="bksj_start" name="bksj_start" class="val easyui-validatebox Wdate zdy-wdate " data-options="required: true" type="text" onkeypress="return checkDateFmt();"
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'bksj_end\',{d:-15});}',maxDate:'#F{$dp.$D(\'bksj_end\')}'})" />
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd
HH:mm:ss
',minDate:'#F{$dp.$D(\'bksj_end\',{d:-15});}',maxDate:'#F{$dp.$D(\'bksj_end\')}'})" />
</span>
</td>
<td class="ar" width="13.3%"><span class="red">*</span>至:</td>
<td width="20%">
<span class="textbox">
<input id="bksj_end" name="bksj_end" class="val easyui-validatebox Wdate zdy-wdate " data-options="required: true" type="text" onkeypress="return checkDateFmt();"
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'bksj_start\')}',maxDate:'#F{$dp.$D(\'bksj_start\',{d:15});}'})"/>
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd
HH:mm:ss
',minDate:'#F{$dp.$D(\'bksj_start\')}',maxDate:'#F{$dp.$D(\'bksj_start\',{d:15});}'})"/>
</span>
</td>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment