Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
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
常超
map-parent
Commits
5ab0f881
Commit
5ab0f881
authored
Jul 04, 2023
by
Guojunfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
网合平台:侦查专项模块、协查任务模块、审批模块,新增字段补充
parent
2897fd8d
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
176 additions
and
78 deletions
+176
-78
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDetail.java
+3
-0
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDetailDto.java
+3
-0
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Xcrw.java
+20
-0
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRole.java
+35
-0
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRoleDto.java
+3
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java
+8
-71
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java
+14
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxRoleController.java
+78
-4
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ApproveMapper.xml
+2
-0
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/XcrwMapper.xml
+10
-3
wswx_files/内部接口文档/wswx-根据主键id删除侦查专项角色(退出协查任务(参与状态)、取消分享).doc
+0
-0
wswx_files/内部接口文档/wswx-根据主键id更新侦查专项角色(修改参与角色).doc
+0
-0
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDetail.java
View file @
5ab0f881
...
...
@@ -30,6 +30,9 @@ public class ApproveDetail extends Model<ApproveDetail> {
@ApiModelProperty
(
value
=
"审批人id(表示当前审批节点应该让谁来审批)"
)
private
String
auditUserId
;
@ApiModelProperty
(
value
=
"审批人姓名"
)
private
String
auditUserName
;
@ApiModelProperty
(
value
=
"审批时间(记录下啥时候审批的)"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
auditTime
;
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDetailDto.java
View file @
5ab0f881
...
...
@@ -27,6 +27,9 @@ public class ApproveDetailDto extends BaseDto {
@ApiModelProperty
(
value
=
"审批人id(表示当前审批节点应该让谁来审批)"
)
private
String
auditUserId
;
@ApiModelProperty
(
value
=
"审批人姓名"
)
private
String
auditUserName
;
@ApiModelProperty
(
value
=
"审批时间(记录下啥时候审批的)"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
auditTime
;
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Xcrw.java
View file @
5ab0f881
...
...
@@ -192,4 +192,24 @@ public class Xcrw extends Model<Xcrw> {
@TableField
(
exist
=
false
)
private
String
auditStatus
;
@ApiModelProperty
(
value
=
"审批人"
)
@TableField
(
exist
=
false
)
private
String
auditUserId
;
@ApiModelProperty
(
value
=
"审批人姓名"
)
@TableField
(
exist
=
false
)
private
String
auditUserName
;
@ApiModelProperty
(
value
=
"审批时间"
)
@TableField
(
exist
=
false
)
private
String
auditTime
;
@ApiModelProperty
(
value
=
"审批意见"
)
@TableField
(
exist
=
false
)
private
String
auditOpinion
;
@ApiModelProperty
(
value
=
"审批备注"
)
@TableField
(
exist
=
false
)
private
String
auditRemark
;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRole.java
View file @
5ab0f881
...
...
@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.util.Date
;
/**
* @author Godffy
...
...
@@ -56,4 +59,36 @@ public class ZczxRole extends Model<ZczxRole> {
@ApiModelProperty
(
value
=
"分享状态"
)
private
String
zczxFxzt
;
@ApiModelProperty
(
value
=
"录入人"
)
private
String
lrr
;
@ApiModelProperty
(
value
=
"录入人警号"
)
private
String
lrrjh
;
@ApiModelProperty
(
value
=
"录入人单位代码"
)
private
String
lrrdwdm
;
@ApiModelProperty
(
value
=
"录入人单位名称"
)
private
String
lrrdwmc
;
@ApiModelProperty
(
value
=
"入库时间"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
rksj
;
@ApiModelProperty
(
value
=
"更新人"
)
private
String
gxr
;
@ApiModelProperty
(
value
=
"更新人警号"
)
private
String
gxrjh
;
@ApiModelProperty
(
value
=
"更新人单位代码"
)
private
String
gxrdwdm
;
@ApiModelProperty
(
value
=
"更新人单位名称"
)
private
String
gxrdwmc
;
@ApiModelProperty
(
value
=
"更新时间"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
gxsj
;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRoleDto.java
View file @
5ab0f881
...
...
@@ -21,6 +21,9 @@ public class ZczxRoleDto extends BaseDto {
@ApiModelProperty
(
value
=
"侦查专项角色主键"
)
private
String
id
;
@ApiModelProperty
(
value
=
"侦查专项角色主键集合"
)
private
String
[]
ids
;
@ApiModelProperty
(
value
=
"专项编号"
)
private
String
zxbh
;
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java
View file @
5ab0f881
...
...
@@ -97,20 +97,25 @@ public class XcrwController extends ApiController {
if
(
StringUtils
.
isNotBlank
(
xcrwlx
)
&&
"1"
.
equals
(
xcrwlx
))
{
zczx
.
setSffqjzypPdbz
(
"1"
);
xcrw
.
setXcrwjsrzh
(
"441917000000"
);
//技侦网合
xcrw
.
setXcrwjsrdwdm
(
"441917000000"
);
//接收人单位代码
}
else
if
(
StringUtils
.
isNotBlank
(
xcrwlx
)
&&
"2"
.
equals
(
xcrwlx
))
{
zczx
.
setSffqsjwjwhPdbz
(
"1"
);
xcrw
.
setXcrwjsrzh
(
"441905000000"
);
//网警网合
xcrw
.
setXcrwjsrdwdm
(
"441905000000"
);
//接收人单位代码
}
else
if
(
StringUtils
.
isNotBlank
(
xcrwlx
)
&&
"3"
.
equals
(
xcrwlx
))
{
zczx
.
setSffqsjqbwhPdbz
(
"1"
);
xcrw
.
setXcrwjsrzh
(
"441933020000"
);
//情报网合
xcrw
.
setXcrwjsrdwdm
(
"441933020000"
);
//接收人单位代码
}
else
if
(
StringUtils
.
isNotBlank
(
xcrwlx
)
&&
"4"
.
equals
(
xcrwlx
))
{
zczx
.
setSffqfjwhPdbz
(
"1"
);
//分局网合
String
substring
=
unitcode
.
substring
(
0
,
6
);
substring
=
substring
+
"000000"
;
//不是在循环体内不考虑并发
xcrw
.
setXcrwjsrzh
(
substring
);
//登录人的所属分局单位
xcrw
.
setXcrwjsrdwdm
(
substring
);
//接收人单位代码
}
else
if
(
StringUtils
.
isNotBlank
(
xcrwlx
)
&&
"5"
.
equals
(
xcrwlx
))
{
zczx
.
setSffqqtxcPdbz
(
"1"
);
//其他协查
xcrw
.
setXcrwjsrzh
(
xcrwDto
.
getXcrwjsrzh
());
//前端指定接收账号
xcrw
.
setXcrwjsrdwdm
(
xcrwDto
.
getXcrwjsrzh
());
//接收人单位代码
}
xcrwService
.
save
(
xcrw
);
//插入协查任务
zczxService
.
update
(
zczx
,
updateWrapper
);
//更新侦查专项状态
...
...
@@ -142,7 +147,9 @@ public class XcrwController extends ApiController {
String
approveId
=
KeyUtil
.
getUUIDKey
(
"A"
);
approve
.
setId
(
approveId
);
approve
.
setFlowNo
(
xcrwbh
);
//关联协查任务编号
approve
.
setZxbh
(
xcrwDto
.
getZxbh
());
//协查任务关联的侦查专项编号
approve
.
setZxmc
(
xcrwDto
.
getZxmc
());
//协查任务的专项名称
approve
.
setXcrwbh
(
xcrwbh
);
//协查任务编号
approve
.
setXcrwmc
(
xcrwDto
.
getXcrwmc
());
//协查任务名称
approve
.
setAuditStatus
(
"1"
);
//审批业务总的审批状态,待审状态
approve
.
setRksj
(
new
Date
());
//创建时间
...
...
@@ -161,6 +168,7 @@ public class XcrwController extends ApiController {
approveDetail
.
setId
(
KeyUtil
.
getUUIDKey
(
"AD"
));
//明细表主键
approveDetail
.
setAuditId
(
approveId
);
//关联审批主表
approveDetail
.
setAuditUserId
(
xcrwDto
.
getAuditUserId
());
//审批人id(表示当前审批节点应该让谁来审批)
approveDetail
.
setAuditUserName
(
trueName
);
//审批人姓名
approveDetail
.
setAuditUserType
(
xcrwDto
.
getAuditUserType
());
//审批人类型,传1:特指某人
approveDetail
.
setAuditStatus
(
"1"
);
//审批人的审核结果,待审状态
approveDetail
.
setRksj
(
new
Date
());
//入库时间
...
...
@@ -184,82 +192,12 @@ public class XcrwController extends ApiController {
* 2:我代办的任务:分局账号 或 流转给个人 ,只能看到领导审批通过的
*
* @param xcrwDto
* @param request
* @return
*/
@PostMapping
(
"listXcrwForPageOld"
)
@ApiOperation
(
value
=
"查询协查任务列表信息"
)
@OperLog
(
message
=
"查询协查任务列表信息"
,
operation
=
OperationType
.
QUERY
)
public
MapRestResult
listXcrwForPageOld
(
@RequestBody
XcrwDto
xcrwDto
,
HttpServletRequest
request
)
{
IPage
page
=
new
Page
(
xcrwDto
.
getPageNum
(),
xcrwDto
.
getPageSize
());
QueryWrapper
<
Xcrw
>
qw
=
new
QueryWrapper
<>();
// 只查询有效的
qw
.
eq
(
"XXSC_PDBZ"
,
"0"
);
//按协查任务专项编号查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getZxbh
()),
"ZXBH"
,
xcrwDto
.
getZxbh
());
//按协查任务编号查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getXcrwBz
()),
"XCRWBH"
,
xcrwDto
.
getXcrwbh
());
//按案事件编号查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getAsjbh
()),
"ASJBH"
,
xcrwDto
.
getAsjbh
());
//按警情编号查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getJqbh
()),
"JQBH"
,
xcrwDto
.
getJqbh
());
//按要情编号查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getYqbh
()),
"YQBH"
,
xcrwDto
.
getYqbh
());
//按发起人警号(协查任务创建人警号)查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getXcrwcjrjh
()),
"XCRWCJRJH"
,
xcrwDto
.
getXcrwcjrjh
());
// 按创建时间范围(协查任务开始时间)查询
qw
.
ge
(
null
!=
xcrwDto
.
getXcrwkssjKssj
(),
"XCRWKSSJ"
,
xcrwDto
.
getXcrwkssjJssj
());
qw
.
le
(
null
!=
xcrwDto
.
getXcrwkssjKssj
(),
"XCRWKSSJ"
,
xcrwDto
.
getXcrwkssjJssj
());
//按接收单位查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getXcrwjsrdwdm
()),
"XCRWJSRDWDM"
,
xcrwDto
.
getXcrwjsrdwdm
());
//按发起单位查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getXcrwcjrdwdm
()),
"XCRWCJRDWDM"
,
xcrwDto
.
getXcrwcjrdwdm
());
//按审批状态查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getXcrwSpzt
()),
"XCRW_SPZT"
,
xcrwDto
.
getXcrwSpzt
());
//按超时状态查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getXcrwCszt
()),
"XCRW_CSZT"
,
xcrwDto
.
getXcrwCszt
());
//按协查任务类型查
//1:技侦研判
//2:市局网合(网警)研判
//3:市局网合(情报)研判
//4:分局网合
//5:其他协查
qw
.
eq
(
StringUtils
.
isNotBlank
(
xcrwDto
.
getXcrwlx
()),
"XCRWLX"
,
xcrwDto
.
getXcrwlx
());
qw
.
orderByDesc
(
"XCRWKSSJ"
);
//按创建时间(协查任务开始时间)做降序
IPage
result
=
this
.
xcrwService
.
page
(
page
,
qw
);
List
<
Xcrw
>
records
=
result
.
getRecords
();
for
(
int
i
=
0
;
i
<
records
.
size
();
i
++)
{
String
id
=
records
.
get
(
i
).
getXcrwbh
();
//1.协查任务申请单
QueryWrapper
<
XcrwFile
>
qw1
=
new
QueryWrapper
<>();
qw1
.
eq
(
"XCRWBH"
,
id
);
qw1
.
eq
(
"XXSC_PDBZ"
,
"0"
);
qw1
.
eq
(
"FILE_TYPE"
,
"1"
);
// queryWrapper.select(XcrwFile.class, info -> !info.getColumn().equals("FILE_CONTENT"));
List
<
XcrwFile
>
sqdList
=
xcrwFileService
.
list
(
qw1
);
//2.协查任务反馈单
QueryWrapper
<
XcrwFile
>
qw2
=
new
QueryWrapper
<>();
qw2
.
eq
(
"XCRWBH"
,
id
);
qw2
.
eq
(
"XXSC_PDBZ"
,
"0"
);
qw2
.
eq
(
"FILE_TYPE"
,
"2"
);
List
<
XcrwFile
>
fkdList
=
xcrwFileService
.
list
(
qw2
);
Xcrw
xcrw
=
records
.
get
(
i
);
xcrw
.
setXcrwSqd
(
sqdList
);
xcrw
.
setXcrwFkd
(
fkdList
);
records
.
set
(
i
,
xcrw
);
}
PageSimpleVO
pageSimpleVO
=
new
PageSimpleVO
<>(
result
.
getCurrent
(),
result
.
getTotal
(),
result
.
getRecords
());
return
new
MapRestResult
(
200
,
"查询成功!"
,
result
.
getTotal
(),
pageSimpleVO
);
}
@PostMapping
(
"listXcrwForPage"
)
@ApiOperation
(
value
=
"查询协查任务列表信息"
)
@OperLog
(
message
=
"查询协查任务列表信息"
,
operation
=
OperationType
.
QUERY
)
public
MapRestResult
listXcrwForPage
(
@RequestBody
XcrwDto
xcrwDto
)
{
IPage
page
=
new
Page
(
xcrwDto
.
getPageNum
(),
xcrwDto
.
getPageSize
());
IPage
<
Xcrw
>
result
=
this
.
xcrwService
.
listXcrwForPage
(
page
,
xcrwDto
);
List
<
Xcrw
>
records
=
result
.
getRecords
();
...
...
@@ -288,7 +226,6 @@ public class XcrwController extends ApiController {
return
new
MapRestResult
(
200
,
"查询成功!"
,
result
.
getTotal
(),
pageSimpleVO
);
}
/**
* 接收人才能反馈,但是接收人不一定反馈,可以进行流转,然后改变接收人信息
* 协查结果反馈:修改协查状态,上传反馈附件
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java
View file @
5ab0f881
...
...
@@ -87,6 +87,11 @@ public class ZczxController extends ApiController {
zczxRole
.
setZxbh
(
zxbh
);
//关联专项编号
zczxRole
.
setUnitcode
(
unitcode
);
//创建的单位代码
zczxRole
.
setUnitname
(
unitname
);
//创建的单位名称
zczxRole
.
setRksj
(
new
Date
());
//入库时间
zczxRole
.
setLrr
(
trueName
);
//姓名
zczxRole
.
setLrrjh
(
policemanid
);
//警号
zczxRole
.
setLrrdwdm
(
unitcode
);
//创建人单位代码
zczxRole
.
setLrrdwmc
(
unitname
);
//创建单位名称
zczxRoleService
.
save
(
zczxRole
);
return
new
MapRestResult
();
}
...
...
@@ -128,11 +133,14 @@ public class ZczxController extends ApiController {
//1.侦查专项角色表:新增分享指定单位的单位编号、单位名称、侦查专项分享状态
//2.审批主表:新增记录,flowNo连接侦查专项角色表主键ID
//3.审批明细表:新增记录
//4.取消分享也要审批
@PostMapping
(
"share"
)
@ApiOperation
(
value
=
"侦查专项分享"
)
@OperLog
(
message
=
"侦查专项分享"
,
operation
=
OperationType
.
UPDATE
)
@Transactional
public
MapRestResult
share
(
@RequestBody
ZczxDto
zczxDto
)
{
//分享给某单位时,提供一个接口告诉前端哪些单位分享过,分享过的灰色不能选中,不要重复插入
//当前登陆人的信息
ServletRequestAttributes
requestAttributes
=
(
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
();
...
...
@@ -150,6 +158,11 @@ public class ZczxController extends ApiController {
role
.
setUnitcode
(
zczxDto
.
getTargetUnitCode
());
//指定单位代码
role
.
setUnitname
(
zczxDto
.
getTargetUnitName
());
//指定单位名称
role
.
setZczxFxzt
(
"1"
);
//分享状态
role
.
setRksj
(
new
Date
());
//入库时间
role
.
setLrr
(
trueName
);
//姓名
role
.
setLrrjh
(
policemanid
);
//警号
role
.
setLrrdwdm
(
unitcode
);
//创建人单位代码
role
.
setLrrdwmc
(
unitname
);
//创建单位名称
//侦查专项角色表,存分享的单位代码、名称、分享状态
zczxRoleService
.
save
(
role
);
Approve
approve
=
new
Approve
();
...
...
@@ -175,6 +188,7 @@ public class ZczxController extends ApiController {
approveDetail
.
setId
(
approveDetailNo
);
//审批明细表主键
approveDetail
.
setAuditId
(
approveNo
);
//连接审批主表主键
approveDetail
.
setAuditUserId
(
zczxDto
.
getAuditUserId
());
//由谁审批
approveDetail
.
setAuditUserName
(
trueName
);
//审批人
approveDetail
.
setLrr
(
trueName
);
approveDetail
.
setLrrjh
(
policemanid
);
approveDetail
.
setLrrdwdm
(
unitcode
);
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxRoleController.java
View file @
5ab0f881
...
...
@@ -19,6 +19,9 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.List
;
/**
* @author Godffy
...
...
@@ -34,11 +37,12 @@ public class ZczxRoleController {
private
ZczxRoleService
zczxRoleService
;
/**
* 侦查专项角色表:TB_WH_ZCZX_ROLE
* 1、侦查专项列表选择了角色就插入数据,参与状态变 “1”
* 2、侦查专项列表点击收藏,插入数据,收藏状态变“1“
* 3、新建侦查专项的时候,要将新建人的单位代码、单位名称传入该表,分页读取侦查专项列表要关联该表。
* 3、新建侦查专项的时候,要将新建人的单位代码、单位名称传入该表,分页读取侦查专项列表要关联该表。
(新建侦查专项接口)
* 4、现有逻辑是若单位级别为分局,则分局以下的人都能看到,如果后面要改成精准查,就再加一个按钮和字段控制,只能精准匹配单位代码
* 5、点击分享按钮,将分享的指定单位代码插入到该表
* 5、点击分享按钮,将分享的指定单位代码插入到该表
(分享接口)
* 6、“全镇街的”、“我辖区的”、“分享单位”,都是查该表的unitcode单位代码
* ps:
* 分组1_我参与的:警号(policemanid)、角色ID(roleId)、角色名字(roleName)、侦查专项参与状态(zczxCyzt)为一组查询
...
...
@@ -59,12 +63,21 @@ public class ZczxRoleController {
(
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
();
HttpServletRequest
request
=
requestAttributes
.
getRequest
();
SysUser
user
=
(
SysUser
)
request
.
getAttribute
(
"user"
);
String
trueName
=
user
.
getTrueName
();
String
policemanid
=
user
.
getPolicemanid
();
String
unitcode
=
user
.
getUnitcode
();
String
unitname
=
user
.
getUnitname
();
ZczxRole
zczxRole
=
new
ZczxRole
();
BeanUtil
.
copyProperties
(
zczxRoleDto
,
zczxRole
);
String
id
=
KeyUtil
.
getUUIDKey
(
"ZXR"
);
//设置主键
zczxRole
.
setId
(
id
);
zczxRole
.
setRksj
(
new
Date
());
//创建时间
zczxRole
.
setLrr
(
trueName
);
//姓名
zczxRole
.
setLrrjh
(
policemanid
);
//警号
zczxRole
.
setLrrdwdm
(
unitcode
);
//创建人单位代码
zczxRole
.
setLrrdwmc
(
unitname
);
//专项创建单位名称
//专项编号不能为空
if
(
StringUtils
.
isBlank
(
zczxRole
.
getZxbh
()))
{
return
new
MapRestResult
().
error
(
"专项编号不能为空"
);
...
...
@@ -73,6 +86,69 @@ public class ZczxRoleController {
return
new
MapRestResult
();
}
/**
* 1、根据角色主键修改参与角色、角色名字、警号
* 详情:警号,登陆的这个人修改自己的角色,又或者是可能有某个领导在一个侦查专项档案里直接修改某个人的参与角色。
* 角色ID
* 1:侦查员
* 2:图侦员
* 3:技侦联络员
* 4:网警联络员
* 5:指挥联络员
* 6:情报员
*
* @param zczxRoleDto
* @return
*/
@PostMapping
(
"update"
)
@ApiOperation
(
value
=
"更新侦查专项角色信息"
)
@OperLog
(
message
=
"更新侦查专项角色信息"
,
operation
=
OperationType
.
ADD
)
@Transactional
public
MapRestResult
update
(
@RequestBody
ZczxRoleDto
zczxRoleDto
)
{
ZczxRole
zczxRole
=
this
.
zczxRoleService
.
getById
(
zczxRoleDto
.
getId
());
if
(
null
==
zczxRole
)
{
return
new
MapRestResult
().
error
(
"该角色主键不存在"
);
}
BeanUtil
.
copyProperties
(
zczxRoleDto
,
zczxRole
);
//当前登陆人的信息
ServletRequestAttributes
requestAttributes
=
(
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
();
HttpServletRequest
request
=
requestAttributes
.
getRequest
();
SysUser
user
=
(
SysUser
)
request
.
getAttribute
(
"user"
);
String
trueName
=
user
.
getTrueName
();
String
policemanid
=
user
.
getPolicemanid
();
String
unitcode
=
user
.
getUnitcode
();
String
unitname
=
user
.
getUnitname
();
//设置更新人基础信息
zczxRole
.
setGxsj
(
new
Date
());
//入库时间
zczxRole
.
setGxr
(
trueName
);
//姓名
zczxRole
.
setGxrjh
(
policemanid
);
//警号
zczxRole
.
setGxrdwdm
(
unitcode
);
//创建人单位代码
zczxRole
.
setGxrdwmc
(
unitname
);
//创建单位名称
this
.
zczxRoleService
.
updateById
(
zczxRole
);
return
new
MapRestResult
();
}
/**
* 1、退出协查任务(参与状态)
* 2、取消分享
*
* @param zczxRoleDto
* @return
*/
@PostMapping
(
"deleteByIds"
)
@ApiOperation
(
value
=
"删除侦查专项角色信息"
)
@OperLog
(
message
=
"删除侦查专项角色信息"
,
operation
=
OperationType
.
ADD
)
@Transactional
public
MapRestResult
deleteByIds
(
@RequestBody
ZczxRoleDto
zczxRoleDto
)
{
String
[]
role_ids
=
zczxRoleDto
.
getIds
();
List
<
String
>
ids
=
Arrays
.
asList
(
role_ids
);
this
.
zczxRoleService
.
removeByIds
(
ids
);
return
new
MapRestResult
();
}
// @PostMapping("selectOne")
// @ApiOperation(value = "查询专项角色信息")
// @OperLog(message = "查询专项角色信息", operation = OperationType.QUERY)
...
...
@@ -89,6 +165,4 @@ public class ZczxRoleController {
// }
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ApproveMapper.xml
View file @
5ab0f881
...
...
@@ -13,7 +13,9 @@
wa.lrr,
wa.lrrjh,
wa.rksj,
wa.zxbh,
wa.zxmc,
wa.xcrwbh,
wa.xcrwmc,
ad.audit_user_id,
ad.audit_time,
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/XcrwMapper.xml
View file @
5ab0f881
...
...
@@ -18,6 +18,7 @@
x.xcrwzt,
x.xcrwkssj,
x.xcrwjssj,
x.xcrwcjrxm,
x.xcrwcjrjh,
x.xcrwcjrsfzh,
x.xcrwcjrdwdm,
...
...
@@ -55,9 +56,15 @@
x.xcrw_bz,
x.xcrw_thzt,
x.xcrw_thxx,
a.audit_status
a.audit_status,
ad.audit_user_id,
ad.audit_user_name,
ad.audit_time,
ad.audit_opinion,
ad.audit_remark
from tb_wh_xcrw x
left join tb_wh_approve a on x.xcrwbh = a.flow_no
left join tb_wh_approve_detail ad on a.id = ad.audit_id
where x.xxsc_pdbz = '0'
<if
test=
"xcrwDto.zxbh!=null and xcrwDto.zxbh!=''"
>
AND x.zxbh = #{xcrwDto.zxbh , jdbcType=VARCHAR }
...
...
@@ -91,7 +98,7 @@
<if
test=
"xcrwDto.xcrwcjrdwdm!=null and xcrwDto.xcrwcjrdwdm!=''"
>
AND x.xcrwcjrdwdm = #{xcrwDto.xcrwcjrdwdm , jdbcType=VARCHAR }
</if>
<if
test=
"xcrwDto.xcrwjsrdwdm!=null and xcrwDto.xc
d
wjsrdwdm!=''"
>
<if
test=
"xcrwDto.xcrwjsrdwdm!=null and xcrwDto.xc
r
wjsrdwdm!=''"
>
AND x.xcrwjsrdwdm = #{xcrwDto.xcrwjsrdwdm , jdbcType=VARCHAR }
</if>
<if
test=
"xcrwDto.xcrwCszt!=null and xcrwDto.xcrwCszt!=''"
>
...
...
@@ -101,7 +108,7 @@
AND a.audit_status = #{xcrwDto.auditStatus , jdbcType=VARCHAR }
</if>
<if
test=
"xcrwDto.xcrwlx!=null and xcrwDto.xcrwlx!=''"
>
AND
a
.xcrwlx = #{xcrwDto.xcrwlx , jdbcType=VARCHAR }
AND
x
.xcrwlx = #{xcrwDto.xcrwlx , jdbcType=VARCHAR }
</if>
<choose>
<when
test=
"xcrwDto.xcrwkssjKssj != null and xcrwDto.xcrwkssjJssj !=null"
>
...
...
wswx_files/内部接口文档/wswx-根据主键id删除侦查专项角色(退出协查任务(参与状态)、取消分享).doc
0 → 100644
View file @
5ab0f881
File added
wswx_files/内部接口文档/wswx-根据主键id更新侦查专项角色(修改参与角色).doc
0 → 100644
View file @
5ab0f881
File added
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