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
de9af2cb
Commit
de9af2cb
authored
Jul 05, 2023
by
Guojunfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
网合平台bug修复及字段补充
parent
b1e72a7c
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
62 additions
and
29 deletions
+62
-29
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Approve.java
+8
-0
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwDto.java
+1
-1
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ApproveController.java
+3
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java
+2
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxRoleController.java
+22
-0
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ApproveMapper.xml
+17
-0
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxMapper.xml
+2
-2
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ZczxServiceImpl.java
+7
-26
wswx_files/内部接口文档/wswx-根据主键id更新侦查专项角色(修改参与角色).doc
+0
-0
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Approve.java
View file @
de9af2cb
...
...
@@ -42,6 +42,10 @@ public class Approve extends Model<Approve> {
@ApiModelProperty
(
value
=
"审批类型"
)
private
String
auditType
;
@ApiModelProperty
(
value
=
"审批类型"
)
@TableField
(
exist
=
false
)
private
String
auditTypeStr
;
/**
* 审核进度(表名此审批业务总的审核状态)
* 1:待审批
...
...
@@ -52,6 +56,10 @@ public class Approve extends Model<Approve> {
@ApiModelProperty
(
value
=
"审批进度"
)
private
String
auditStatus
;
@ApiModelProperty
(
value
=
"审批进度"
)
@TableField
(
exist
=
false
)
private
String
auditStatusStr
;
@ApiModelProperty
(
value
=
"录入人"
)
private
String
lrr
;
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwDto.java
View file @
de9af2cb
...
...
@@ -122,7 +122,7 @@ public class XcrwDto extends BaseDto {
private
String
asjbh
;
@ApiModelProperty
(
value
=
"案件名称"
)
private
String
a
s
jmc
;
private
String
ajmc
;
@ApiModelProperty
(
value
=
"案件类别代码"
)
private
String
ajlbdm
;
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ApproveController.java
View file @
de9af2cb
...
...
@@ -108,6 +108,9 @@ public class ApproveController extends ApiController {
*
* 只能看到发给自己的
*
* 1、审批列表
* 2、待我审批
*
* @param approveDto
* @return
*/
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java
View file @
de9af2cb
...
...
@@ -75,10 +75,12 @@ public class XcrwController extends ApiController {
String
policemanid
=
user
.
getPolicemanid
();
String
unitcode
=
user
.
getUnitcode
();
String
unitname
=
user
.
getUnitname
();
String
telephone
=
user
.
getTelephone
();
xcrw
.
setXcrwcjrxm
(
trueName
);
//姓名
xcrw
.
setXcrwcjrjh
(
policemanid
);
//警号
xcrw
.
setXcrwcjrdwdm
(
unitcode
);
//创建人单位代码
xcrw
.
setXcrwcjrdwmc
(
unitname
);
//专项创建单位名称
xcrw
.
setXcrwcjrlxdh
(
telephone
);
//联系电话
/**
* 协查任务类型
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxRoleController.java
View file @
de9af2cb
package
com
.
founder
.
publicapi
.
controller
.
ZczxService
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.founder.commonutils.model.newPublicEntity.MapRestResult
;
import
com.founder.commonutils.model.newPublicEntity.SysUser
;
import
com.founder.commonutils.model.zczxEntity.ZczxRole
;
...
...
@@ -148,6 +149,27 @@ public class ZczxRoleController {
return
new
MapRestResult
();
}
//还没写!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//用途:
//1.该接口用于控制前端已分享的单位显示灰色不要重新分享。
//2.领导可以在侦查专项里直接控制其他人的参与状态。
//分组:
//1.按照专项编号查询该专项绑定的参与角色人员(专项编号zxbh,警号policemanid,角色代码role_id,角色名role_name,侦查专项_参与状态zczx_cyzt)
//2.按照专项编号查询该专项已分享的所有分局(专项编号zxbh,机构代码unitcode,机构名称unitname,侦查专项_分享状态zczx_fxzt)
@PostMapping
(
"getZczxRoleByType"
)
@ApiOperation
(
value
=
"根据类型查询侦查专项角色"
)
@OperLog
(
message
=
"根据类型查询侦查专项角色"
,
operation
=
OperationType
.
QUERY
)
public
MapRestResult
getZczxRoleByType
(
@RequestBody
ZczxRoleDto
zczxRoleDto
)
{
QueryWrapper
<
ZczxRole
>
qw
=
new
QueryWrapper
<>();
// 按专项编号查询
qw
.
eq
(
StringUtils
.
isNotBlank
(
zczxRoleDto
.
getZxbh
()),
"ZXBH"
,
zczxRoleDto
.
getZxbh
());
// 按参与类型查询
qw
.
eq
(
StringUtils
.
isNotBlank
(
zczxRoleDto
.
getZczxCyzt
()),
"ZCZX_CYZT"
,
zczxRoleDto
.
getZczxCyzt
());
// 按查询
qw
.
eq
(
StringUtils
.
isNotBlank
(
zczxRoleDto
.
getZczxCyzt
()),
"ZCZX_CYZT"
,
zczxRoleDto
.
getZczxCyzt
());
return
null
;
}
// @PostMapping("selectOne")
// @ApiOperation(value = "查询专项角色信息")
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ApproveMapper.xml
View file @
de9af2cb
...
...
@@ -9,9 +9,26 @@
wa.audit_name,
wa.flow_no,
wa.audit_type,
case
when wa.audit_type = '1' then '侦查专项分享审批'
when wa.audit_type = '2' then '技侦研判协查任务发送审批'
when wa.audit_type = '3' then '市局网合网警协查任务发送审批'
when wa.audit_type = '4' then '市局网合情报协查任务发送审批'
when wa.audit_type = '5' then '分局网合协查任务发送审批'
when wa.audit_type = '6' then '其他协查任务发送审批'
when wa.audit_type = '7' then '移交审批'
when wa.audit_type = '8' then '退回审批'
end as auditTypeStr,
wa.audit_status,
case
when wa.audit_status = '1' then '待审批'
when wa.audit_status = '2' then '审批通过'
when wa.audit_status = '3' then '审批不通过'
end as auditStatusStr,
wa.lrr,
wa.lrrjh,
wa.lrrdwdm,
wa.lrrdwmc,
wa.rksj,
wa.zxbh,
wa.zxmc,
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxMapper.xml
View file @
de9af2cb
...
...
@@ -44,7 +44,7 @@
left join tb_st_asj j on z.asjbh = j.asjbh
left join tb_st_yq y on z.yqmc = y.title
where
1=1
z.zxcjrjh = #{zczxDto.zxcjrjh , jdbcType=VARCHAR }
<if
test=
"zczxDto.zxbh!=null and zczxDto.zxbh!=''"
>
AND z.zxbh = #{zczxDto.zxbh , jdbcType=VARCHAR }
</if>
...
...
@@ -202,7 +202,7 @@
<if
test=
"zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''"
>
AND z.zxcjdwdm = #{zczxDto.zxcjdwdm , jdbcType=VARCHAR }
</if>
<if
test=
"zczxDto.zxcj
dwdm!=null and zczxDto.zxcjdwdm
!=''"
>
<if
test=
"zczxDto.zxcj
rjh!=null and zczxDto.zxcjrjh
!=''"
>
AND z.zxcjrjh = #{zczxDto.zxcjrjh , jdbcType=VARCHAR }
</if>
<if
test=
"zczxDto.sftzPdbz!=null and zczxDto.sftzPdbz!=''"
>
...
...
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ZczxServiceImpl.java
View file @
de9af2cb
...
...
@@ -61,7 +61,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
zczxDto
.
setZxdlrjh
(
policemanid
);
//设置查询的登录人警号
zczxDto
.
setZczxCyzt
(
"1"
);
IPage
<
Zczx
>
result
=
this
.
zczxMapper
.
listZczxForPageByCyzt
(
page
,
zczxDto
);
//参与的数据查出来后要遍历查询收藏状态
//
//参与的数据查出来后要遍历查询收藏状态
List
<
Zczx
>
records
=
result
.
getRecords
();
for
(
int
i
=
0
;
i
<
records
.
size
();
i
++)
{
Zczx
zczx
=
records
.
get
(
i
);
...
...
@@ -85,7 +85,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
zczxDto
.
setZxdlrjh
(
policemanid
);
//设置查询的登录人警号
zczxDto
.
setZczxSczt
(
"1"
);
IPage
<
Zczx
>
zczxIPage
=
this
.
zczxMapper
.
listZczxForPageBySczt
(
page
,
zczxDto
);
//收藏的数据查出来后要遍历拿到当前登陆用户看到的侦查专项绑定的角色
//
//收藏的数据查出来后要遍历拿到当前登陆用户看到的侦查专项绑定的角色
List
<
Zczx
>
records
=
zczxIPage
.
getRecords
();
for
(
int
i
=
0
;
i
<
records
.
size
();
i
++)
{
Zczx
zczx
=
records
.
get
(
i
);
...
...
@@ -111,7 +111,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
if
(
StringUtils
.
isNotBlank
(
zczxDto
.
getCxlx
())
&&
"4"
.
equals
(
zczxDto
.
getCxlx
())
&&
StringUtils
.
isNotBlank
(
policemanid
))
{
zczxDto
.
setZxcjrjh
(
policemanid
);
IPage
<
Zczx
>
result
=
this
.
zczxMapper
.
listZczxForPage
(
page
,
zczxDto
);
//遍历参与状态、收藏状态
//
//遍历参与状态、收藏状态
List
<
Zczx
>
records
=
result
.
getRecords
();
for
(
int
i
=
0
;
i
<
records
.
size
();
i
++)
{
Zczx
zczx
=
records
.
get
(
i
);
...
...
@@ -156,6 +156,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
if
(
"3"
.
equals
(
zczxDto
.
getCxlx
()))
{
zczxDto
.
setUnitcode
(
s
);
}
// zczxDto.setZxcjrjh(policemanid);
IPage
<
Zczx
>
result
=
this
.
zczxMapper
.
listZczxForPageByCode
(
page
,
zczxDto
);
List
<
Zczx
>
records
=
result
.
getRecords
();
for
(
int
i
=
0
;
i
<
records
.
size
();
i
++)
{
...
...
@@ -168,6 +169,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
qw
.
eq
(
"zczx_cyzt"
,
"1"
);
ZczxRole
cyzt
=
zczxRoleMapper
.
selectOne
(
qw
);
if
(
cyzt
!=
null
)
{
zczx
.
setRoleNo
(
cyzt
.
getId
());
zczx
.
setZczxCyzt
(
cyzt
.
getZczxCyzt
());
zczx
.
setRoleId
(
cyzt
.
getRoleId
());
zczx
.
setRoleName
(
cyzt
.
getRoleName
());
...
...
@@ -209,6 +211,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
qw
.
eq
(
"zczx_cyzt"
,
"1"
);
ZczxRole
cyzt
=
zczxRoleMapper
.
selectOne
(
qw
);
if
(
cyzt
!=
null
)
{
zczx
.
setRoleNo
(
cyzt
.
getId
());
zczx
.
setZczxCyzt
(
cyzt
.
getZczxCyzt
());
zczx
.
setRoleId
(
cyzt
.
getRoleId
());
zczx
.
setRoleName
(
cyzt
.
getRoleName
());
...
...
@@ -242,6 +245,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
qw
.
eq
(
"zczx_cyzt"
,
"1"
);
ZczxRole
cyzt
=
zczxRoleMapper
.
selectOne
(
qw
);
if
(
cyzt
!=
null
)
{
zczx
.
setRoleNo
(
cyzt
.
getId
());
zczx
.
setZczxCyzt
(
cyzt
.
getZczxCyzt
());
zczx
.
setRoleId
(
cyzt
.
getRoleId
());
zczx
.
setRoleName
(
cyzt
.
getRoleName
());
...
...
@@ -261,29 +265,6 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
return
result
;
}
return
null
;
// //默认查询获取分页数据
// IPage<Zczx> result = this.zczxMapper.listZczxForPage(page, zczxDto);
// //数据查出来后要遍历拿到当前登陆用户看到的侦查专项绑定的角色
// List<Zczx> records = result.getRecords();
// for (int i = 0; i < records.size(); i++) {
// Zczx zczx = records.get(i);
// String zxbh = zczx.getZxbh();
// QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
// //专项编号
// qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
// //警号
// qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
// //参与状态
// qw.eq("zczx_cyzt", "1");
// ZczxRole zczxRole = zczxRoleMapper.selectOne(qw);
// if (zczxRole != null) {
// zczx.setRoleId(zczxRole.getRoleId());
// zczx.setRoleName(zczxRole.getRoleName());
// records.set(i, zczx);
// }
// }
// result.setRecords(records);
// return result;
}
}
wswx_files/内部接口文档/wswx-根据主键id更新侦查专项角色(修改参与角色).doc
View file @
de9af2cb
No preview for this file type
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