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
3ee561a1
Commit
3ee561a1
authored
Apr 09, 2019
by
caoyin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加指令移交功能,将之前联络员签收的指令,移交给同单位的另外一个人负责(避免出差导致指令不能及时回报的问题
parent
80d9b1d9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
269 additions
and
7 deletions
+269
-7
src/main/java/com/founder/zczl/controller/ZczlController.java
+17
-2
src/main/java/com/founder/zczl/dao/ZczlDao.java
+6
-0
src/main/java/com/founder/zczl/service/IZczlService.java
+2
-0
src/main/java/com/founder/zczl/service/impl/ZczlService.java
+28
-1
src/main/resources/mapper/ZczlMapper.xml
+40
-0
src/main/resources/static/css/style.css
+51
-3
src/main/resources/static/js/listWfzdzczl.js
+88
-0
src/main/resources/version.txt
+2
-1
src/main/webapp/WEB-INF/jsp/wfzdzczl.jsp
+35
-0
No files found.
src/main/java/com/founder/zczl/controller/ZczlController.java
View file @
3ee561a1
...
...
@@ -3130,8 +3130,6 @@ public class ZczlController {
return
messageHtml
;
}
//侦查指令删除
@RequestMapping
(
"/doUpdateZlxxByLly"
)
@ResponseBody
public
String
doUpdateZlxxByLly
(
@RequestParam
(
value
=
"oldXxzjbh"
)
String
oldXxzjbh
,
@RequestParam
(
value
=
"newXxzjbh"
)
String
newXxzjbh
,
HttpServletRequest
request
){
...
...
@@ -3160,6 +3158,23 @@ public class ZczlController {
return
message
;
}
//侦查指令移交
@RequestMapping
(
"/doYj"
)
@ResponseBody
public
Map
doYj
(
TbYwZczlFp
tbYwZczlFp
,
HttpServletRequest
request
){
Map
map
=
new
HashMap
();
String
flag
=
"0"
;
//拿到登录用户
User
user
=
(
User
)
request
.
getSession
().
getAttribute
(
"user"
);
boolean
bool
=
zczlService
.
doYj
(
tbYwZczlFp
,
user
.
getIdentitycard
());
if
(
bool
){
flag
=
"1"
;
}
map
.
put
(
"flag"
,
flag
);
return
map
;
}
}
src/main/java/com/founder/zczl/dao/ZczlDao.java
View file @
3ee561a1
...
...
@@ -140,4 +140,10 @@ public interface ZczlDao {
void
updateQsxx
(
RyUpdateMessage
ryUpdateMessage
);
void
updateFpxx
(
RyUpdateMessage
ryUpdateMessage
);
User
getUserByUser
(
User
u
);
void
updateQsxxByMapForYj
(
Map
map
);
void
updateFpxxByMapForYj
(
Map
map
);
}
src/main/java/com/founder/zczl/service/IZczlService.java
View file @
3ee561a1
...
...
@@ -133,4 +133,6 @@ public interface IZczlService {
TbYwZczlLly
getLlyxxByXxzjbh
(
String
oldXxzjbh
);
boolean
doUpdateZlxxByLly
(
RyUpdateMessage
ryUpdateMessage
);
boolean
doYj
(
TbYwZczlFp
tbYwZczlFp
,
String
identitycard
);
}
src/main/java/com/founder/zczl/service/impl/ZczlService.java
View file @
3ee561a1
...
...
@@ -1684,7 +1684,34 @@ public class ZczlService implements IZczlService {
zczlDao
.
updateFpxx
(
ryUpdateMessage
);
bool
=
true
;
}
catch
(
Exception
e
)
{
throw
new
BaseException
(
"移交失败失败!"
,
e
);
throw
new
BaseException
(
"移交失败!"
,
e
);
}
return
bool
;
}
@Override
public
boolean
doYj
(
TbYwZczlFp
tbYwZczlFp
,
String
identitycard
)
{
boolean
bool
=
false
;
Map
map
=
new
HashMap
();
map
.
put
(
"oldSfzh"
,
identitycard
);
map
.
put
(
"fpbh"
,
tbYwZczlFp
.
getFpbh
());
map
.
put
(
"zczlbh"
,
tbYwZczlFp
.
getZczlbh
());
String
qsrjh
=
tbYwZczlFp
.
getQsrjh
();
User
u
=
new
User
();
u
.
setPolicemanid
(
qsrjh
);
//通过警号拿到人员信息
User
user
=
zczlDao
.
getUserByUser
(
u
);
map
.
put
(
"newSfzh"
,
user
.
getIdentitycard
());
map
.
put
(
"newXm"
,
user
.
getTrueName
());
map
.
put
(
"newLxdh"
,
user
.
getTelephone
());
try
{
//更新我签收的指令
zczlDao
.
updateQsxxByMapForYj
(
map
);
//更新我分派的指令
zczlDao
.
updateFpxxByMapForYj
(
map
);
bool
=
true
;
}
catch
(
Exception
e
)
{
throw
new
BaseException
(
"移交失败!"
,
e
);
}
return
bool
;
}
...
...
src/main/resources/mapper/ZczlMapper.xml
View file @
3ee561a1
...
...
@@ -1669,4 +1669,43 @@
,FPRDWMC =#{newDwmc,jdbcType=VARCHAR}
where FPRGMSFHM=#{oldSfzh,jdbcType=VARCHAR} and YFPBH is not null
</update>
<select
id=
"getUserByUser"
parameterType=
"com.founder.model.User"
resultType=
"com.founder.model.User"
>
select TRUE_NAME trueName,
UNITCODE unitcode,
IDENTITYCARD identitycard,
TELEPHONE telephone,
GRADE grade,
USERNAME username,
UNITNAME unitname,
PASSWORD password,
POLICEMANID policemanid
from sys_user where SCBZ='0' and OPEN_FLAG='1'
<if
test=
"policemanid!=null and policemanid!=''"
>
and POLICEMANID=#{policemanid, jdbcType=VARCHAR}
</if>
<if
test=
"username!=null and username!=''"
>
and username=#{username, jdbcType=VARCHAR}
</if>
<if
test=
"unitcode!=null and unitcode!=''"
>
and UNITCODE=#{unitcode, jdbcType=VARCHAR}
</if>
</select>
<!-- 更新我签收的指令-用于移交 -->
<update
id=
"updateQsxxByMapForYj"
parameterType=
"java.util.Map"
>
update TB_YW_ZCZL_FP
set
xxscpdbz='0'
,QSRXM =#{newXm,jdbcType=VARCHAR}
,QSRLXDH =#{newLxdh,jdbcType=VARCHAR}
,QSRGMSFHM =#{newSfzh,jdbcType=VARCHAR}
where FPBH=#{fpbh,jdbcType=VARCHAR}
</update>
<!-- 更新我分派的指令-用于移交 -->
<update
id=
"updateFpxxByMapForYj"
parameterType=
"java.util.Map"
>
update TB_YW_ZCZL_FP
set
xxscpdbz='0'
,FPRXM =#{newXm,jdbcType=VARCHAR}
,FPRLXDH =#{newLxdh,jdbcType=VARCHAR}
,FPRGMSFHM =#{newSfzh,jdbcType=VARCHAR}
where FPRGMSFHM=#{oldSfzh,jdbcType=VARCHAR} and YFPBH is not null and ZCZLBH=#{zczlbh,jdbcType=VARCHAR}
</update>
</mapper>
\ No newline at end of file
src/main/resources/static/css/style.css
View file @
3ee561a1
...
...
@@ -159,7 +159,7 @@ a.left-list-ftitle:hover{
height
:
34px
;
line-height
:
34px
;
}
.cxtj
table
.textbox
,
.layout_table
.textbox
,
.layout_table_fp
.textbox
{
.cxtj
table
.textbox
,
.layout_table
.textbox
,
.layout_table_fp
.textbox
,
.layout_table_yj
.textbox
{
display
:
inline-block
;
height
:
28px
;
line-height
:
28px
;
...
...
@@ -170,7 +170,7 @@ a.left-list-ftitle:hover{
.cxtj
table
.textbox-3
{
width
:
92.5%
;
}
.cxtj
table
input
,
.layout_table
input
,
.layout_table_fp
input
{
.cxtj
table
input
,
.layout_table
input
,
.layout_table_fp
input
,
.layout_table_yj
input
{
/*height: 26px;*/
line-height
:
26px
;
margin-top
:
-4px
;
...
...
@@ -179,7 +179,7 @@ a.left-list-ftitle:hover{
.cxtj
table
.panel-noscroll
{
border
:
none
;
}
.cxtj
table
input
[
type
=
file
],
.layout_table
input
[
type
=
file
],
.layout_table_fp
input
[
type
=
file
]
{
.cxtj
table
input
[
type
=
file
],
.layout_table
input
[
type
=
file
],
.layout_table_fp
input
[
type
=
file
]
,
.layout_table_yj
input
[
type
=
file
]
{
border
:
1px
solid
#ccc
;
}
.radil_td
{
...
...
@@ -326,6 +326,15 @@ a.left-list-ftitle:hover{
left
:
0
;
display
:
none
;
}
.mask_yj
{
width
:
100%
;
height
:
100%
;
position
:
fixed
;
background
:
rgba
(
0
,
0
,
0
,
0.5
);
top
:
0
;
left
:
0
;
display
:
none
;
}
div
.layout
{
width
:
800px
;
position
:
fixed
;
...
...
@@ -411,6 +420,45 @@ div.layout_fp{
border
:
1px
solid
#ccc
;
width
:
92%
;
}
div
.layout_yj
{
width
:
800px
;
position
:
fixed
;
left
:
50%
;
top
:
50%
;
margin-left
:
-400px
;
margin-top
:
-250px
;
box-shadow
:
5px
5px
15px
rgba
(
0
,
0
,
0
,
0.4
);
background
:
#fff
;
border-radius
:
8px
;
display
:
none
;
}
.layout_header_yj
{
height
:
40px
;
background
:
#274776
;
line-height
:
40px
;
border-radius
:
8px
8px
0
0
;
}
.layout_content_yj
{
padding
:
20px
5px
30px
5px
;
}
.layout_header_yj
span
{
font-size
:
13px
;
color
:
#f1f1f1
;
margin-left
:
15px
;
}
.layout_table_yj
{
width
:
100%
;
}
.layout_table_yj
td
{
height
:
34px
;
line-height
:
34px
;
}
.layout_table_yj
textarea
{
resize
:
vertical
;
border
:
1px
solid
#ccc
;
width
:
92%
;
}
/*回报签收标签*/
.re_hqzt
{
border
:
1px
solid
#ccc
;
...
...
src/main/resources/static/js/listWfzdzczl.js
View file @
3ee561a1
...
...
@@ -224,6 +224,7 @@ function getCzColumn(row){
}
if
(
row
.
nffp
==
'1'
){
str
=
str
+
"<a href=
\"
#
\"
onclick=
\"
toFp('"
+
row
.
zczlbh
+
"');
\"
class=
\"
cz xzA
\"
><span style='color: #217cb1;'>分派 </span></a>"
;
str
=
str
+
"<a href=
\"
#
\"
onclick=
\"
toYj('"
+
row
.
zczlbh
+
"','"
+
row
.
fpbh
+
"');
\"
class=
\"
cz xzA
\"
><span style='color: #217cb1;'>移交 </span></a>"
;
}
//查看回报详情
/*if(row.sfczhbxx=='1'){
...
...
@@ -292,6 +293,84 @@ function removeHasFile(){
$
(
"#hbfjEmpty"
).
css
(
"display"
,
"none"
);
}
//显示移交界面
function
toYj
(
zczlbh
,
fpbh
){
$
(
'.mask_yj'
).
show
();
$
(
'.layout_yj'
).
fadeIn
(
800
);
$
(
"#fpbh_yj"
).
val
(
fpbh
);
$
(
"#zczlbh_yj"
).
val
(
zczlbh
);
}
//移交侦查指令信息
function
doYj
(){
var
jsrPolicemanid
=
$
(
"#qsrjh_yj"
).
combotree
(
'getValue'
);
//接收人警号
if
(
jsrPolicemanid
==
""
||
jsrPolicemanid
==
null
){
layer
.
alert
(
"接收人员必选!"
,
"提示"
);
return
;
}
layer
.
confirm
(
'是否确定移交?'
,
{
btn
:
[
'确定'
,
'取消'
]
//按钮
},
function
(){
var
index
=
layer
.
load
(
1
,
{
content
:
'数据加载中...'
,
shade
:
[
0.35
,
'#fff'
],
success
:
function
(
layero
)
{
/*layero.css('padding-left', '30px');*/
layero
.
find
(
'.layui-layer-content'
).
css
({
'padding-top'
:
'40px'
,
'width'
:
'70px'
,
'background-position-x'
:
'16px'
});
}
});
$
.
ajax
({
type
:
"POST"
,
//方法类型
dataType
:
"json"
,
//预期服务器返回的数据类型
url
:
"/doYj"
,
data
:
$
(
'#yjForm'
).
serialize
(),
success
:
function
(
data
)
{
layer
.
close
(
index
);
if
(
data
.
flag
==
0
){
layer
.
alert
(
'移交失败'
,
"提示"
,
function
(
res
){
if
(
res
){
layer
.
closeAll
();
}
});
}
else
if
(
data
.
flag
==
1
){
layer
.
alert
(
'移交成功'
,
"提示"
,
function
(
res
){
if
(
res
){
yjfh
();
doQuery
();
layer
.
closeAll
();
}
});
}
else
{
layer
.
alert
(
data
.
flag
,
"提示"
,
function
(
res
){
if
(
res
){
layer
.
closeAll
();
}
});
}
},
error
:
function
()
{
layer
.
close
(
index
);
layer
.
alert
(
'移交失败'
,
"提示"
,
function
(
res
){
if
(
res
){
yjfh
();
layer
.
closeAll
();
}
});
}
});
},
function
(){
layer
.
closeAll
(
'dialog'
);
//强行关闭询问框
});
}
//显示分派界面
function
toFp
(
zczlbh
){
$
(
'.mask_fp'
).
show
();
...
...
@@ -597,6 +676,15 @@ function fpfh(){
$
(
"#qsrjh"
).
combotree
(
'setValue'
,
''
);
}
//移交相关界面返回
function
yjfh
(){
$
(
"#fpbh_yj"
).
val
(
""
);
$
(
"#zczlbh_yj"
).
val
(
""
);
$
(
'.mask_yj'
).
hide
();
$
(
'.layout_yj'
).
fadeOut
(
500
);
$
(
"#qsrjh_yj"
).
combotree
(
'setValue'
,
''
);
}
function
qs
(
fpbh
){
var
index
=
layer
.
load
(
1
,
{
...
...
src/main/resources/version.txt
View file @
3ee561a1
...
...
@@ -46,6 +46,7 @@ version=@project.version@
#26.添加服务公众号 01:添加服务公众号
#27.添加不同民警不同的业务类型指令的审批权限 01:针对目前的五种业务类型,增加五种审批权限,不属于自己审批的业务类型只能查看
#28.修改回报评价判断方式 01:修改回报评价判断方式
#28.增加联络员移交指令信息功能 01:将之前联络员分派、签收的指令给改成新的联络员信息
#29.增加联络员移交指令信息功能 01:将之前联络员分派、签收的指令给改成新的联络员信息
#30.增加指令移交功能 01:将之前联络员签收的指令,移交给同单位的另外一个人负责(避免出差导致指令不能及时回报的问题)
————————————————————@project.version@-——————————————————————————
src/main/webapp/WEB-INF/jsp/wfzdzczl.jsp
View file @
3ee561a1
...
...
@@ -341,9 +341,43 @@
</div>
</form>
</div>
<div
class=
"mask_yj"
></div>
<div
class=
"layout_yj"
>
<div
class=
"layout_header_yj"
>
<span>
移交信息
</span>
</div>
<form
name=
"yjForm"
id=
"yjForm"
>
<input
name=
"fpbh"
id=
"fpbh_yj"
type=
"hidden"
>
<input
name=
"zczlbh"
id=
"zczlbh_yj"
type=
"hidden"
>
<div
class=
"layout_content_yj"
>
<table
class=
"layout_table_yj"
>
<tr>
<td
class=
"ar necessary"
width=
"15%"
>
接收人员:
</td>
<td
width=
"35%"
>
<span
class=
"textbox"
style=
"width:220px;"
>
<input
type=
"text"
id=
"qsrjh_yj"
name=
"qsrjh"
class=
"val easyui-combotree"
data-options=
"url: '/queryTypeCode?type=CODE_JY&startId=<%=unitcode %>',method:'get',fit:true,textField : 'text', valueField : 'id'"
/>
</span>
</td>
</tr>
<tr>
<td
class=
"empty"
colspan=
"4"
></td>
</tr>
<tr>
<td
colspan=
"4"
style=
"text-align:center;"
>
<a
class=
"btn_a btn_add"
onclick=
"doYj()"
>
移交
</a>
<a
class=
"btn_a btn_search"
onclick=
"yjfh()"
>
返回
</a>
</td>
</tr>
</table>
</div>
</form>
</div>
</html>
<script>
openCombotree
(
'qsrgajgdm'
);
openCombotree
(
'qsrjh'
);
openCombotree
(
'qsrjh_yj'
);
</script>
<script
id=
"scripturlid"
src=
"/common/js/checkurl.js?url=${perurl}"
type=
"text/javascript"
></script>
\ No newline at end of file
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