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
80d9b1d9
Commit
80d9b1d9
authored
Apr 03, 2019
by
caoyin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加联络员移交指令信息功能 ,将之前联络员分派、签收的指令给改成新的联络员信息
parent
ed86a802
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
331 additions
and
1 deletions
+331
-1
src/main/java/com/founder/model/RyUpdateMessage.java
+97
-0
src/main/java/com/founder/zczl/controller/ZczlController.java
+47
-0
src/main/java/com/founder/zczl/dao/ZczlDao.java
+8
-0
src/main/java/com/founder/zczl/service/IZczlService.java
+6
-0
src/main/java/com/founder/zczl/service/impl/ZczlService.java
+26
-0
src/main/resources/mapper/ZczlMapper.xml
+34
-0
src/main/resources/static/css/style.css
+2
-0
src/main/resources/static/js/llysz.js
+107
-1
src/main/resources/version.txt
+1
-0
src/main/webapp/WEB-INF/jsp/llysz.jsp
+3
-0
No files found.
src/main/java/com/founder/model/RyUpdateMessage.java
0 → 100644
View file @
80d9b1d9
package
com
.
founder
.
model
;
/**
* 移交指令任务时,用于存储交接任务双方的人员信息的实体类
*/
public
class
RyUpdateMessage
{
private
String
oldXm
=
null
;
private
String
oldLxdh
=
null
;
private
String
oldSfzh
=
null
;
private
String
oldDwmc
=
null
;
private
String
oldDwdm
=
null
;
private
String
newXm
=
null
;
private
String
newLxdh
=
null
;
private
String
newSfzh
=
null
;
private
String
newDwmc
=
null
;
private
String
newDwdm
=
null
;
public
String
getOldXm
()
{
return
oldXm
;
}
public
void
setOldXm
(
String
oldXm
)
{
this
.
oldXm
=
oldXm
;
}
public
String
getOldLxdh
()
{
return
oldLxdh
;
}
public
void
setOldLxdh
(
String
oldLxdh
)
{
this
.
oldLxdh
=
oldLxdh
;
}
public
String
getOldSfzh
()
{
return
oldSfzh
;
}
public
void
setOldSfzh
(
String
oldSfzh
)
{
this
.
oldSfzh
=
oldSfzh
;
}
public
String
getOldDwmc
()
{
return
oldDwmc
;
}
public
void
setOldDwmc
(
String
oldDwmc
)
{
this
.
oldDwmc
=
oldDwmc
;
}
public
String
getOldDwdm
()
{
return
oldDwdm
;
}
public
void
setOldDwdm
(
String
oldDwdm
)
{
this
.
oldDwdm
=
oldDwdm
;
}
public
String
getNewXm
()
{
return
newXm
;
}
public
void
setNewXm
(
String
newXm
)
{
this
.
newXm
=
newXm
;
}
public
String
getNewLxdh
()
{
return
newLxdh
;
}
public
void
setNewLxdh
(
String
newLxdh
)
{
this
.
newLxdh
=
newLxdh
;
}
public
String
getNewSfzh
()
{
return
newSfzh
;
}
public
void
setNewSfzh
(
String
newSfzh
)
{
this
.
newSfzh
=
newSfzh
;
}
public
String
getNewDwmc
()
{
return
newDwmc
;
}
public
void
setNewDwmc
(
String
newDwmc
)
{
this
.
newDwmc
=
newDwmc
;
}
public
String
getNewDwdm
()
{
return
newDwdm
;
}
public
void
setNewDwdm
(
String
newDwdm
)
{
this
.
newDwdm
=
newDwdm
;
}
}
src/main/java/com/founder/zczl/controller/ZczlController.java
View file @
80d9b1d9
...
...
@@ -3112,6 +3112,53 @@ public class ZczlController {
return
model
;
}
//查询本单位其他联络员信息
@RequestMapping
(
"/doSearchOtherLlyxx"
)
@ResponseBody
public
String
doSearchOtherLlyxx
(
@RequestParam
(
value
=
"xxzjbh"
)
String
xxzjbh
,
HttpServletRequest
request
){
String
messageHtml
=
""
;
List
<
TbYwZczlLly
>
llyList
=
zczlService
.
getLlyListByXxzjbh
(
xxzjbh
);
if
(
llyList
!=
null
&&
llyList
.
size
()>
0
){
for
(
int
i
=
0
;
i
<
llyList
.
size
();
i
++){
TbYwZczlLly
lly
=
llyList
.
get
(
i
);
messageHtml
+=
"<tr><td><span style='width:100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;display: block;' title='"
+
lly
.
getTruename
()+
"' onclick=changeData('"
+
xxzjbh
+
"','"
+
lly
.
getXxzjbh
()+
"')>"
+
lly
.
getTruename
()+
"</span></td></tr>"
;
}
}
else
{
messageHtml
+=
"<tr><td><span style='color:red;'>无</span></td></tr>"
;
}
return
messageHtml
;
}
//侦查指令删除
@RequestMapping
(
"/doUpdateZlxxByLly"
)
@ResponseBody
public
String
doUpdateZlxxByLly
(
@RequestParam
(
value
=
"oldXxzjbh"
)
String
oldXxzjbh
,
@RequestParam
(
value
=
"newXxzjbh"
)
String
newXxzjbh
,
HttpServletRequest
request
){
String
message
=
"0"
;
//拿到改变前的联络员信息
TbYwZczlLly
oldLlyxx
=
zczlService
.
getLlyxxByXxzjbh
(
oldXxzjbh
);
TbYwZczlLly
newLlyxx
=
zczlService
.
getLlyxxByXxzjbh
(
newXxzjbh
);
RyUpdateMessage
ryUpdateMessage
=
new
RyUpdateMessage
();
ryUpdateMessage
.
setOldXm
(
oldLlyxx
.
getTruename
());
ryUpdateMessage
.
setOldSfzh
(
oldLlyxx
.
getSfzh
());
ryUpdateMessage
.
setOldLxdh
(
oldLlyxx
.
getTelephone
());
ryUpdateMessage
.
setOldDwdm
(
oldLlyxx
.
getUnitcode
());
ryUpdateMessage
.
setOldDwmc
(
oldLlyxx
.
getUnitname
());
ryUpdateMessage
.
setNewXm
(
newLlyxx
.
getTruename
());
ryUpdateMessage
.
setNewSfzh
(
newLlyxx
.
getSfzh
());
ryUpdateMessage
.
setNewLxdh
(
newLlyxx
.
getTelephone
());
ryUpdateMessage
.
setNewDwdm
(
newLlyxx
.
getUnitcode
());
ryUpdateMessage
.
setNewDwmc
(
newLlyxx
.
getUnitname
());
boolean
bool
=
zczlService
.
doUpdateZlxxByLly
(
ryUpdateMessage
);
if
(
bool
){
message
=
"1"
;
}
return
message
;
}
}
...
...
src/main/java/com/founder/zczl/dao/ZczlDao.java
View file @
80d9b1d9
...
...
@@ -132,4 +132,12 @@ public interface ZczlDao {
List
<
TbYwZczl
>
toQueryWqqfbdzczls
(
TbYwZczl
tbYwZczl
);
TbXwJjr
sfjjr
(
Map
map
);
List
<
TbYwZczlLly
>
getLlyListByXxzjbh
(
String
xxzjbh
);
TbYwZczlLly
getLlyxxByXxzjbh
(
String
xxzjbh
);
void
updateQsxx
(
RyUpdateMessage
ryUpdateMessage
);
void
updateFpxx
(
RyUpdateMessage
ryUpdateMessage
);
}
src/main/java/com/founder/zczl/service/IZczlService.java
View file @
80d9b1d9
...
...
@@ -127,4 +127,10 @@ public interface IZczlService {
TbXwJjr
sfjjr
(
Map
map
);
List
<
TbYwZczlFp
>
getBxqAllFpxxOrderByFpsj
(
String
zczlbh
,
String
unitcode
);
List
<
TbYwZczlLly
>
getLlyListByXxzjbh
(
String
xxzjbh
);
TbYwZczlLly
getLlyxxByXxzjbh
(
String
oldXxzjbh
);
boolean
doUpdateZlxxByLly
(
RyUpdateMessage
ryUpdateMessage
);
}
src/main/java/com/founder/zczl/service/impl/ZczlService.java
View file @
80d9b1d9
...
...
@@ -1662,4 +1662,30 @@ public class ZczlService implements IZczlService {
}
return
bxqAllFpxx
;
}
@Override
public
List
<
TbYwZczlLly
>
getLlyListByXxzjbh
(
String
xxzjbh
)
{
return
zczlDao
.
getLlyListByXxzjbh
(
xxzjbh
);
}
@Override
public
TbYwZczlLly
getLlyxxByXxzjbh
(
String
xxzjbh
)
{
return
zczlDao
.
getLlyxxByXxzjbh
(
xxzjbh
);
}
@Override
public
boolean
doUpdateZlxxByLly
(
RyUpdateMessage
ryUpdateMessage
)
{
boolean
bool
=
false
;
try
{
//更新我签收的指令
zczlDao
.
updateQsxx
(
ryUpdateMessage
);
//更新我分派的指令
zczlDao
.
updateFpxx
(
ryUpdateMessage
);
bool
=
true
;
}
catch
(
Exception
e
)
{
throw
new
BaseException
(
"移交失败失败!"
,
e
);
}
return
bool
;
}
}
src/main/resources/mapper/ZczlMapper.xml
View file @
80d9b1d9
...
...
@@ -1636,4 +1636,37 @@
<select
id=
"sfjjr"
parameterType=
"java.util.Map"
resultType=
"com.founder.model.TbXwJjr"
>
select * from TB_XW_JJR where RQ
<![CDATA[>]]>
#{yesterdayDate} and RQ
<![CDATA[<]]>
#{tomorrowDate}
</select>
<select
id=
"getLlyListByXxzjbh"
parameterType=
"java.lang.String"
resultType=
"com.founder.model.TbYwZczlLly"
>
select * from TB_YW_ZCZL_LLY where unitcode= (select unitcode from TB_YW_ZCZL_LLY where xxzjbh=#{xxzjbh, jdbcType=VARCHAR}) and xxscpdbz='0' and xxzjbh!= #{xxzjbh, jdbcType=VARCHAR}
</select>
<select
id=
"getLlyxxByXxzjbh"
parameterType=
"java.lang.String"
resultType=
"com.founder.model.TbYwZczlLly"
>
select * from TB_YW_ZCZL_LLY where xxscpdbz='0' and xxzjbh= #{xxzjbh, jdbcType=VARCHAR}
</select>
<!-- 更新我签收的指令 -->
<update
id=
"updateQsxx"
parameterType=
"com.founder.model.RyUpdateMessage"
>
update TB_YW_ZCZL_FP
set
xxscpdbz='0'
,QSRXM =#{newXm,jdbcType=VARCHAR}
,QSRLXDH =#{newLxdh,jdbcType=VARCHAR}
,QSRGMSFHM =#{newSfzh,jdbcType=VARCHAR}
,QSRGAJGDM =#{newDwdm,jdbcType=VARCHAR}
,QSRDWMC =#{newDwmc,jdbcType=VARCHAR}
where QSRGMSFHM=#{oldSfzh,jdbcType=VARCHAR}
</update>
<!-- 更新我分派的指令 -->
<update
id=
"updateFpxx"
parameterType=
"com.founder.model.RyUpdateMessage"
>
update TB_YW_ZCZL_FP
set
xxscpdbz='0'
,FPRXM =#{newXm,jdbcType=VARCHAR}
,FPRLXDH =#{newLxdh,jdbcType=VARCHAR}
,FPRGMSFHM =#{newSfzh,jdbcType=VARCHAR}
,FPRGAJGDM =#{newDwdm,jdbcType=VARCHAR}
,FPRDWMC =#{newDwmc,jdbcType=VARCHAR}
where FPRGMSFHM=#{oldSfzh,jdbcType=VARCHAR} and YFPBH is not null
</update>
</mapper>
\ No newline at end of file
src/main/resources/static/css/style.css
View file @
80d9b1d9
...
...
@@ -496,3 +496,4 @@ table.datagrid-btable td[field="zlwh"] .datagrid-cell{
.fixed-ewm
{
position
:
absolute
;
left
:
10px
;
bottom
:
75px
;
text-align
:
center
;}
.fixed-ewm
img
{
width
:
130px
;}
.xcx-nc
{
width
:
130px
;
height
:
20px
;
line-height
:
20px
;
text-align
:
center
;
color
:
#fff
;}
.pos
{
position
:
relative
;}
\ No newline at end of file
src/main/resources/static/js/llysz.js
View file @
80d9b1d9
...
...
@@ -5,7 +5,8 @@ $(function(){
function
getColumn
(
row
){
var
str
=
""
;
if
(
row
.
sflly
==
'1'
){
str
=
"<a href=
\"
#
\"
onclick=
\"
del('"
+
row
.
xxzjbh
+
"');
\"
class=
\"
cz
\"
><span style='color: #f70909;'>删除</span></a>"
str
=
"<a href=
\"
#
\"
onclick=
\"
del('"
+
row
.
xxzjbh
+
"');
\"
class=
\"
cz
\"
><span style='color: #f70909;'>删除</span></a>"
;
str
=
str
+
" <a href=
\"
#
\"
onclick=
\"
yj_tk(this,event,'"
+
row
.
xxzjbh
+
"');
\"
class=
\"
cz pos
\"
><span style='color: #7fd015;'>移交</span><div class=
\"
right_po
\"
><table><thead><tr><th width=
\"
100%
\"
>联络员姓名</th></tr></thead><tbody></tbody></tbody></table></div></a>"
}
else
{
str
=
"<a href=
\"
#
\"
onclick=
\"
setLly('"
+
row
.
userId
+
"');
\"
class=
\"
cz
\"
><span style='color: #7fd015;'>设置联络员</span></a>"
}
...
...
@@ -13,6 +14,111 @@ function getColumn(row){
return
str
;
}
function
yj_tk
(
el
,
event
,
xxzjbh
)
{
//查询出本单位的联络员信息
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
({
url
:
'/doSearchOtherLlyxx?xxzjbh='
+
xxzjbh
,
type
:
"post"
,
success
:
function
(
data
)
{
layer
.
close
(
index
);
$
(
el
).
find
(
"tbody"
).
html
(
data
);
}
});
window
.
top
.
aa
(
el
,
event
);
// $('.right_po').dialog('open');
}
//oldXxzjbh---转移前的人员信息主键编号
//newXxzjbh---转移后的人员信息主键编号
function
changeData
(
oldXxzjbh
,
newXxzjbh
){
layer
.
alert
(
'是否将此联络员下的指令分派、签收信息更改为指定的联络员负责(注意:指令回报的人员信息不会改变)'
,
"提示"
,
function
(
res
){
if
(
res
){
layer
.
closeAll
();
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
({
url
:
'/doUpdateZlxxByLly?oldXxzjbh='
+
oldXxzjbh
+
"&newXxzjbh="
+
newXxzjbh
,
type
:
"post"
,
success
:
function
(
data
)
{
layer
.
close
(
index
);
if
(
data
==
'1'
){
//操作成功
layer
.
alert
(
'移交成功'
,
"提示"
,
function
(
res
){
if
(
res
){
doQuery
();
layer
.
closeAll
();
}
});
}
else
{
//操作失败
layer
.
alert
(
'移交失败'
,
"提示"
,
function
(
res
){
if
(
res
){
doQuery
();
layer
.
closeAll
();
}
});
}
},
error
:
function
()
{
layer
.
close
(
index
);
layer
.
alert
(
'移交失败'
,
"提示"
,
function
(
res
){
if
(
res
){
doQuery
();
layer
.
closeAll
();
}
});
}
});
}
});
}
function
aa
(
el
,
event
)
{
var
top
=
$
(
el
).
offset
().
top
;
var
height
=
$
(
window
).
height
();
var
bottom
=
height
-
top
;
var
div_height
=
$
(
el
).
find
(
'.right_po'
).
height
();
$
(
'.right_po'
).
hide
();
if
(
div_height
<
bottom
)
{
$
(
el
).
find
(
'.right_po'
).
show
();
}
else
{
$
(
el
).
find
(
'.right_po'
).
show
().
css
(
"top"
,
-
div_height
+
'px'
);
}
// 解决easyui相应元素设置overflow:hidden属性导致定位的弹窗溢出不显示问题--待定
$
(
'.datagrid-body'
).
css
({
'overflow'
:
'visible'
,
'overflow-x'
:
'visible'
});
$
(
'.datagrid-view2'
).
css
(
'overflow'
,
'visible'
);
$
(
'.datagrid-view'
).
css
(
'overflow'
,
'visible'
);
$
(
'.panel'
).
css
(
'overflow'
,
'visible'
);
$
(
'.panel-body'
).
css
(
'overflow'
,
'visible'
);
event
.
stopPropagation
();
}
$
(
document
).
click
(
function
(
event
)
{
$
(
'.right_po'
).
slideUp
(
200
);
});
//删除联络员信息
function
del
(
xxzjbh
){
var
index
=
layer
.
load
(
1
,
{
...
...
src/main/resources/version.txt
View file @
80d9b1d9
...
...
@@ -46,5 +46,6 @@ version=@project.version@
#26.添加服务公众号 01:添加服务公众号
#27.添加不同民警不同的业务类型指令的审批权限 01:针对目前的五种业务类型,增加五种审批权限,不属于自己审批的业务类型只能查看
#28.修改回报评价判断方式 01:修改回报评价判断方式
#28.增加联络员移交指令信息功能 01:将之前联络员分派、签收的指令给改成新的联络员信息
————————————————————@project.version@-——————————————————————————
src/main/webapp/WEB-INF/jsp/llysz.jsp
View file @
80d9b1d9
...
...
@@ -32,6 +32,9 @@
<link
rel=
"stylesheet"
href=
"/easyui-window/css/icon.css"
>
<link
rel=
"stylesheet"
href=
"/layer/layer.css"
>
<style>
td
[
field
=
"xxzjbh"
]
.datagrid-cell
{
overflow
:
inherit
}
</style>
</head>
<body
style=
"overflow: auto"
>
...
...
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