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
4fbee457
Commit
4fbee457
authored
Apr 03, 2019
by
caoyin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加不同民警不同的业务类型指令的审批权限
parent
4b57bede
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
90 additions
and
3 deletions
+90
-3
src/main/java/com/founder/model/TbYwZczl.java
+19
-0
src/main/java/com/founder/zczl/controller/ZczlController.java
+56
-1
src/main/resources/mapper/ZczlMapper.xml
+7
-0
src/main/resources/static/js/listXywspdzczl.js
+5
-1
src/main/resources/version.txt
+1
-0
src/main/webapp/WEB-INF/jsp/xywspdzczl.jsp
+2
-1
No files found.
src/main/java/com/founder/model/TbYwZczl.java
View file @
4fbee457
...
...
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.util.Date
;
import
java.util.List
;
/**
* 侦查指令
...
...
@@ -15,6 +16,8 @@ import java.util.Date;
@SuppressWarnings
(
"serial"
)
public
class
TbYwZczl
extends
BaseModel
{
private
List
ywbhList
;
//业务编号list
private
String
ifFirst
;
//是否首次查询 no表示非第一次查询
private
String
zlfpdwHtml
=
""
;
//指令分派单位拼接用的html
private
String
zlqszt
=
null
;
//指令签收状态(0-未签收;1-超期未签收;2-已签收;3-超期签收;)
...
...
@@ -857,4 +860,20 @@ public class TbYwZczl extends BaseModel{
public
void
setQqfqrgmsfhm
(
String
qqfqrgmsfhm
)
{
this
.
qqfqrgmsfhm
=
qqfqrgmsfhm
;
}
public
String
getIfFirst
()
{
return
ifFirst
;
}
public
void
setIfFirst
(
String
ifFirst
)
{
this
.
ifFirst
=
ifFirst
;
}
public
List
getYwbhList
()
{
return
ywbhList
;
}
public
void
setYwbhList
(
List
ywbhList
)
{
this
.
ywbhList
=
ywbhList
;
}
}
src/main/java/com/founder/zczl/controller/ZczlController.java
View file @
4fbee457
...
...
@@ -1140,7 +1140,50 @@ public class ZczlController {
,
TbYwZczl
tbYwZczl
,
@RequestParam
(
value
=
"page"
,
defaultValue
=
"0"
)
int
page
,
@RequestParam
(
value
=
"rows"
,
defaultValue
=
"0"
)
int
rows
){
//判断是否第一次查询,第一次查询该值为空,默认显示对应权限的指令
//点击查询后显示所有的指令信息,但是只能对属于自己权限类的进行审批
String
ifFirst
=
tbYwZczl
.
getIfFirst
();
String
perurl
=
(
String
)
request
.
getSession
().
getAttribute
(
"perurl"
);
//拿到权限
//如果是第一次查询判断具体权限,然后查询出对应权限的具体指令
//A010101_01 跨区域系列案件 对应代码 0
//A010101_02 通用 对应代码 1
//A010101_03 非接触性诈骗 对应代码 2
//A010101_04 涉枪类案件 对应代码 3
//A010101_05 刑事技术比中 对应代码 4
if
(
ifFirst
==
null
||
""
.
equals
(
ifFirst
.
trim
())){
//第一次查询
List
ywlxList
=
new
ArrayList
();
if
(
"admin"
.
equals
(
perurl
)){
ywlxList
.
add
(
"0"
);
ywlxList
.
add
(
"1"
);
ywlxList
.
add
(
"2"
);
ywlxList
.
add
(
"3"
);
ywlxList
.
add
(
"4"
);
}
else
{
if
(
perurl
.
indexOf
(
"A010101_01"
)!=-
1
){
ywlxList
.
add
(
"0"
);
}
if
(
perurl
.
indexOf
(
"A010101_02"
)!=-
1
){
ywlxList
.
add
(
"1"
);
}
if
(
perurl
.
indexOf
(
"A010101_03"
)!=-
1
){
ywlxList
.
add
(
"2"
);
}
if
(
perurl
.
indexOf
(
"A010101_04"
)!=-
1
){
ywlxList
.
add
(
"3"
);
}
if
(
perurl
.
indexOf
(
"A010101_05"
)!=-
1
){
ywlxList
.
add
(
"4"
);
}
if
(
ywlxList
==
null
||
ywlxList
.
size
()==
0
){
//未设置具体的单项权限则表示为全部都能审批()
ywlxList
.
add
(
"0"
);
ywlxList
.
add
(
"1"
);
ywlxList
.
add
(
"2"
);
ywlxList
.
add
(
"3"
);
ywlxList
.
add
(
"4"
);
}
}
tbYwZczl
.
setYwbhList
(
ywlxList
);
}
EasyUIPage
easyUIPage
=
new
EasyUIPage
();
easyUIPage
.
setPage
(
page
);
easyUIPage
.
setPagePara
(
rows
);
...
...
@@ -1159,6 +1202,18 @@ public class ZczlController {
objectMap
=
new
HashMap
<>();
objectMap
.
put
(
"zlwh"
,
zczl
.
getZlwh
());
//指令文号
objectMap
.
put
(
"ywlx_str"
,
zczl
.
getYwlx_str
());
//业务类型
//判断是否具有审批权限-------是否具有该业务类型的指令的审批权限(只能查看,不能审批)
if
(
ifFirst
==
null
||
""
.
equals
(
ifFirst
.
trim
())||
"admin"
.
equals
(
perurl
)){
objectMap
.
put
(
"ifsp"
,
"1"
);
//是否能审批 1-能 0-不能
}
else
{
//判断业务类型是否在权限中
String
ywlx
=
zczl
.
getYwlx
();
if
(
perurl
.
indexOf
(
ywlx
)!=-
1
){
objectMap
.
put
(
"ifsp"
,
"1"
);
//是否能审批 1-能 0-不能
}
else
{
objectMap
.
put
(
"ifsp"
,
"0"
);
//是否能审批 1-能 0-不能
}
}
objectMap
.
put
(
"zllx_str"
,
zczl
.
getZllx_str
());
//指令类型
objectMap
.
put
(
"ywmc"
,
zczl
.
getYwmc
());
//业务名称
objectMap
.
put
(
"hbqx"
,
zczl
.
getHbqx
());
//回报期限
...
...
src/main/resources/mapper/ZczlMapper.xml
View file @
4fbee457
...
...
@@ -609,6 +609,13 @@
<if
test=
"ywmc!=null and ywmc!=''"
>
and zczl.ywmc like '%'||#{ywmc, jdbcType=VARCHAR}||'%'
</if>
<if
test=
"zllx!=null and zllx!=''"
>
and zczl.zllx = #{zllx, jdbcType=VARCHAR}
</if>
<if
test=
"ywlx!=null and ywlx!=''"
>
and zczl.ywlx = #{ywlx, jdbcType=VARCHAR}
</if>
<if
test=
"ifFirst!='no'"
>
and zczl.ywlx in
<foreach
collection=
"ywbhList"
item=
"lxlist"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{lxlist, jdbcType=VARCHAR}
</foreach>
</if>
<if
test=
"spsftg!=null and spsftg!=''"
>
and zczl.spsftg = #{spsftg, jdbcType=VARCHAR}
</if>
<if
test=
"zljsdwdm!=null and zljsdwdm!=''"
>
and ${zljsdwdm}
</if>
<if
test=
"fbsj_s!=null and fbsj_s!=''"
>
and zczl.fbsj
<![CDATA[>=]]>
(to_date(#{fbsj_s, jdbcType=VARCHAR},'yyyy-MM-dd'))
</if>
...
...
src/main/resources/static/js/listXywspdzczl.js
View file @
4fbee457
$
(
function
(){
layer
.
alert
(
'点击查询前只能显示具有相应权限业务类型的指令,点击查询后能够显示所有指令!!!'
,
"提示"
);
doQuery
();
})
...
...
@@ -18,7 +19,7 @@ function getSpztColumn(row){
function
getCzColumn
(
row
){
var
str
=
""
//0-未通过 1- 审批通过 2-待审批 3-草稿
if
(
row
.
spsftg
==
'2'
){
if
(
row
.
spsftg
==
'2'
&&
row
.
ifsp
==
'1'
){
str
=
str
+
"<a href=
\"
#
\"
onclick=
\"
sp('"
+
row
.
zczlbh
+
"');
\"
class=
\"
cz xzA
\"
><span style='color: #217cb1;'>审批 </span></a>"
;
}
//查看侦查指令详情
...
...
@@ -226,6 +227,9 @@ var table_title = [
];
function
doQuery
(
obj
){
if
(
'no'
==
obj
){
//非第一次查询
$
(
"#ifFirst"
).
val
(
"no"
);
}
$
(
'#zczlxxtable'
).
datagrid
({
url
:
"/GetXywspdzczlList"
,
columns
:
[
table_title
],
...
...
src/main/resources/version.txt
View file @
4fbee457
...
...
@@ -44,5 +44,6 @@ version=@project.version@
#24.消息中心添加直接定位到回报详情界面的功能 01:消息中心添加直接定位到回报详情界面的功能
#25.本辖区接收的侦查指令详情界面办理过程调整 01:办理过程调整为本辖区只能看到本辖区的回报签收信息不能查看本省的信息
#26.添加服务公众号 01:添加服务公众号
#27.添加不同民警不同的业务类型指令的审批权限 01:针对目前的五种业务类型,增加五种审批权限,不属于自己审批的业务类型只能查看
————————————————————@project.version@-——————————————————————————
src/main/webapp/WEB-INF/jsp/xywspdzczl.jsp
View file @
4fbee457
...
...
@@ -171,6 +171,7 @@
<legend>
需要我审批的侦查指令
</legend>
<table>
<tbody>
<input
type=
"hidden"
id=
"ifFirst"
name=
"ifFirst"
value=
""
>
<!---ifFirst是否是第一次查询,空表示第一次查询,只显示本权限下的业务类型的指令-->
<tr>
<td
colspan=
"6"
style=
"height:20px;"
></td>
</tr>
...
...
@@ -241,7 +242,7 @@
</tr>
<tr>
<td
colspan=
"6"
style=
"text-align:center;"
>
<a
class=
"btn_a btn_search"
onclick=
"doQuery()"
>
查询
</a>
<a
class=
"btn_a btn_search"
onclick=
"doQuery(
'no'
)"
>
查询
</a>
<a
class=
"btn_a btn_empty"
onclick=
"doClear()"
>
清空
</a>
</td>
</tr>
...
...
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