Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zczlService
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
曹崟
zczlService
Commits
0cdad0ec
Commit
0cdad0ec
authored
May 17, 2019
by
caoyin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改指令统计的bug:当开始或结束时间没有被选择时,会导致指令发布开始时间与结束时间都被置为null的bug
parent
9b4661be
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
4 deletions
+17
-4
src/main/java/com/founder/zczl/controller/ZczlController.java
+16
-4
src/main/resources/version.txt
+1
-0
No files found.
src/main/java/com/founder/zczl/controller/ZczlController.java
View file @
0cdad0ec
...
@@ -325,9 +325,12 @@ public class ZczlController {
...
@@ -325,9 +325,12 @@ public class ZczlController {
Date
fbsj_e
=
null
;
Date
fbsj_e
=
null
;
try
{
try
{
fbsj_s
=
sdf
.
parse
(
fbsj_s_str
);
fbsj_s
=
sdf
.
parse
(
fbsj_s_str
);
fbsj_e
=
sdf
.
parse
(
fbsj_e_str
);
}
catch
(
ParseException
e
)
{
}
catch
(
ParseException
e
)
{
fbsj_s
=
null
;
fbsj_s
=
null
;
}
try
{
fbsj_e
=
sdf
.
parse
(
fbsj_e_str
);
}
catch
(
ParseException
e
)
{
fbsj_e
=
null
;
fbsj_e
=
null
;
}
}
//统计时公安厅的单位==总队,显示总队和支队的统计信息
//统计时公安厅的单位==总队,显示总队和支队的统计信息
...
@@ -425,9 +428,12 @@ public class ZczlController {
...
@@ -425,9 +428,12 @@ public class ZczlController {
Date
fbsj_e
=
null
;
Date
fbsj_e
=
null
;
try
{
try
{
fbsj_s
=
sdf
.
parse
(
fbsj_s_str
);
fbsj_s
=
sdf
.
parse
(
fbsj_s_str
);
fbsj_e
=
sdf
.
parse
(
fbsj_e_str
);
}
catch
(
ParseException
e
)
{
}
catch
(
ParseException
e
)
{
fbsj_s
=
null
;
fbsj_s
=
null
;
}
try
{
fbsj_e
=
sdf
.
parse
(
fbsj_e_str
);
}
catch
(
ParseException
e
)
{
fbsj_e
=
null
;
fbsj_e
=
null
;
}
}
//统计时公安厅的单位==总队,显示总队和支队的统计信息
//统计时公安厅的单位==总队,显示总队和支队的统计信息
...
@@ -2571,9 +2577,12 @@ public class ZczlController {
...
@@ -2571,9 +2577,12 @@ public class ZczlController {
Date
fbsj_e
=
null
;
Date
fbsj_e
=
null
;
try
{
try
{
fbsj_s
=
sdf
.
parse
(
fbsj_s_str
);
fbsj_s
=
sdf
.
parse
(
fbsj_s_str
);
fbsj_e
=
sdf
.
parse
(
fbsj_e_str
);
}
catch
(
ParseException
e
)
{
}
catch
(
ParseException
e
)
{
fbsj_s
=
null
;
fbsj_s
=
null
;
}
try
{
fbsj_e
=
sdf
.
parse
(
fbsj_e_str
);
}
catch
(
ParseException
e
)
{
fbsj_e
=
null
;
fbsj_e
=
null
;
}
}
//统计时公安厅的单位==总队,显示总队和支队的统计信息
//统计时公安厅的单位==总队,显示总队和支队的统计信息
...
@@ -2709,9 +2718,12 @@ public class ZczlController {
...
@@ -2709,9 +2718,12 @@ public class ZczlController {
Date
fbsj_e
=
null
;
Date
fbsj_e
=
null
;
try
{
try
{
fbsj_s
=
sdf
.
parse
(
fbsj_s_str
);
fbsj_s
=
sdf
.
parse
(
fbsj_s_str
);
fbsj_e
=
sdf
.
parse
(
fbsj_e_str
);
}
catch
(
ParseException
e
)
{
}
catch
(
ParseException
e
)
{
fbsj_s
=
null
;
fbsj_s
=
null
;
}
try
{
fbsj_e
=
sdf
.
parse
(
fbsj_e_str
);
}
catch
(
ParseException
e
)
{
fbsj_e
=
null
;
fbsj_e
=
null
;
}
}
...
...
src/main/resources/version.txt
View file @
0cdad0ec
...
@@ -50,5 +50,6 @@ version=@project.version@
...
@@ -50,5 +50,6 @@ version=@project.version@
#30.增加指令移交功能 01:将之前联络员签收的指令,移交给同单位的另外一个人负责(避免出差导致指令不能及时回报的问题)
#30.增加指令移交功能 01:将之前联络员签收的指令,移交给同单位的另外一个人负责(避免出差导致指令不能及时回报的问题)
#31.添加配置 01:跨域登录成功时返回成功提示
#31.添加配置 01:跨域登录成功时返回成功提示
#32.新增指令审批指定人功能 01:新增指定审批人功能(指定具有审批权限且具备该指令业务的审批权限的人进行审批)
#32.新增指令审批指定人功能 01:新增指定审批人功能(指定具有审批权限且具备该指令业务的审批权限的人进行审批)
#33.修改指令统计的bug 01:当开始或结束时间没有被选择时,会导致指令发布开始时间与结束时间都被置为null的bug
————————————————————@project.version@-——————————————————————————
————————————————————@project.version@-——————————————————————————
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