Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
178255c5
Commit
178255c5
authored
Sep 08, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.8' into MVP1.5.8
parents
80541317
6d3894c0
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
33 additions
and
15 deletions
+33
-15
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+1
-3
TOrderServiceImpl.java
...ud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
+3
-0
SysMenuController.java
...loud/plus/v1/permission/controller/SysMenuController.java
+14
-0
SysUserPermissionController.java
...v1/permission/controller/SysUserPermissionController.java
+8
-5
SysUserPermissionServiceImpl.java
...permission/service/impl/SysUserPermissionServiceImpl.java
+1
-1
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+6
-6
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
178255c5
...
@@ -279,11 +279,10 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
...
@@ -279,11 +279,10 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
List
<
TEmployeeContractInfo
>
alertList
=
contractInfoMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
List
<
TEmployeeContractInfo
>
alertList
=
contractInfoMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
TWO_STRING
)
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
TWO_STRING
)
.
isNotNull
(
TEmployeeContractInfo:
:
getAuditTimeLast
)
.
isNotNull
(
TEmployeeContractInfo:
:
getAuditTimeLast
)
.
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getContractType
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getContractType
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getWorkFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getWorkFlag
,
CommonConstants
.
ZERO_STRING
)
.
ne
(
TEmployeeContractInfo:
:
getSituation
,
"续签
"
)
.
ne
(
TEmployeeContractInfo:
:
getSituation
,
"续签"
)
.
ne
(
TEmployeeContractInfo:
:
getSituation
,
"终止"
)
.
ne
(
TEmployeeContractInfo:
:
getSituation
,
"终止"
)
.
le
(
TEmployeeContractInfo:
:
getContractEnd
,
DateUtil
.
dateIncreaseByDay
(
.
le
(
TEmployeeContractInfo:
:
getContractEnd
,
DateUtil
.
dateIncreaseByDay
(
DateUtil
.
dateIncreaseByMonth
(
DateUtil
.
getCurrentDateTime
(),
DateUtil
.
dateIncreaseByMonth
(
DateUtil
.
getCurrentDateTime
(),
...
@@ -293,7 +292,6 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
...
@@ -293,7 +292,6 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
List
<
TEmployeeContractInfo
>
notAccessList
=
contractInfoMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
List
<
TEmployeeContractInfo
>
notAccessList
=
contractInfoMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
.
and
(
obj
->
obj
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ZERO_STRING
)
.
and
(
obj
->
obj
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ZERO_STRING
)
.
or
().
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_STRING
))
.
or
().
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_STRING
))
.
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getWorkFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getWorkFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
));
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
));
Map
<
String
,
TEmpContractAlert
>
alertMap
=
new
HashMap
<>();
Map
<
String
,
TEmpContractAlert
>
alertMap
=
new
HashMap
<>();
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @
178255c5
...
@@ -524,6 +524,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
...
@@ -524,6 +524,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
if
(
vo
.
getUrgencyExtent
().
equals
(
CommonConstants
.
SEVEN_STRING
)){
if
(
vo
.
getUrgencyExtent
().
equals
(
CommonConstants
.
SEVEN_STRING
)){
vo
.
setUrgencyExtent
(
"常规(5-8小时)"
);
vo
.
setUrgencyExtent
(
"常规(5-8小时)"
);
}
}
if
(
vo
.
getUrgencyExtent
().
equals
(
CommonConstants
.
EIGHT_STRING
)){
vo
.
setUrgencyExtent
(
"较慢(1-2个月)"
);
}
List
<
TSettleDomainSelectVo
>
settleDomainR
;
List
<
TSettleDomainSelectVo
>
settleDomainR
;
R
<
TSettleDomainListVo
>
listVo
;
R
<
TSettleDomainListVo
>
listVo
;
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoByNo
(
vo
.
getDeptNo
());
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoByNo
(
vo
.
getDeptNo
());
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/controller/SysMenuController.java
View file @
178255c5
...
@@ -69,6 +69,20 @@ public class SysMenuController {
...
@@ -69,6 +69,20 @@ public class SysMenuController {
return
sysMenuService
.
updateMenu
(
sysMenu
);
return
sysMenuService
.
updateMenu
(
sysMenu
);
}
}
/**
* 修改新权限-菜单表
*
* @param sysMenu 新权限-菜单表
* @return R
*/
@Operation
(
description
=
"修改新权限-菜单表:hasPermission('permission_sysmenu_edit')"
)
@SysLog
(
"修改新权限-菜单表"
)
@PostMapping
(
"/updateMenuById"
)
@PreAuthorize
(
"@pms.hasPermission('permission_sysmenu_edit')"
)
public
R
<
Boolean
>
updateMenu
(
@RequestBody
SysMenu
sysMenu
)
{
return
new
R
<>(
sysMenuService
.
updateById
(
sysMenu
));
}
/**
/**
* 通过id查询新权限-菜单表
* 通过id查询新权限-菜单表
*
*
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/controller/SysUserPermissionController.java
View file @
178255c5
...
@@ -68,7 +68,7 @@ public class SysUserPermissionController {
...
@@ -68,7 +68,7 @@ public class SysUserPermissionController {
*/
*/
@Operation
(
description
=
"新增用户权限表:hasPermission('permission_sysuserpermission_add')"
)
@Operation
(
description
=
"新增用户权限表:hasPermission('permission_sysuserpermission_add')"
)
@SysLog
(
"新增用户权限表"
)
@SysLog
(
"新增用户权限表"
)
@PostMapping
@PostMapping
(
"/savePermission"
)
@PreAuthorize
(
"@pms.hasPermission('permission_sysuserpermission_add')"
)
@PreAuthorize
(
"@pms.hasPermission('permission_sysuserpermission_add')"
)
public
R
save
(
@RequestBody
SysUserPermission
sysUserPermission
)
{
public
R
save
(
@RequestBody
SysUserPermission
sysUserPermission
)
{
return
sysUserPermissionService
.
savePermission
(
sysUserPermission
);
return
sysUserPermissionService
.
savePermission
(
sysUserPermission
);
...
@@ -77,15 +77,18 @@ public class SysUserPermissionController {
...
@@ -77,15 +77,18 @@ public class SysUserPermissionController {
/**
/**
* 修改新权限-用户权限表
* 修改新权限-用户权限表
*
*
* @param sysUserPermission
新权限-用户权限表
* @param sysUserPermission
List 用户权限表list
* @return R
* @return R
*/
*/
@Operation
(
description
=
"修改用户权限表:hasPermission('permission_sysuserpermission_edit')"
)
@Operation
(
description
=
"修改用户权限表:hasPermission('permission_sysuserpermission_edit')"
)
@SysLog
(
"修改用户权限表"
)
@SysLog
(
"修改用户权限表"
)
@P
utMapping
@P
ostMapping
(
"/updatePermission"
)
@PreAuthorize
(
"@pms.hasPermission('permission_sysuserpermission_edit')"
)
@PreAuthorize
(
"@pms.hasPermission('permission_sysuserpermission_edit')"
)
public
R
<
Boolean
>
updateById
(
@RequestBody
SysUserPermission
sysUserPermission
)
{
public
R
<
Boolean
>
updateById
(
@RequestBody
List
<
SysUserPermission
>
sysUserPermissionList
)
{
return
R
.
ok
(
sysUserPermissionService
.
updateById
(
sysUserPermission
));
for
(
SysUserPermission
permission
:
sysUserPermissionList
)
{
sysUserPermissionService
.
updateById
(
permission
);
}
return
R
.
ok
();
}
}
/**
/**
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserPermissionServiceImpl.java
View file @
178255c5
...
@@ -191,7 +191,7 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
...
@@ -191,7 +191,7 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
//查询权限类型字典
//查询权限类型字典
List
<
SysDictVo
>
typeList
=
baseMapper
.
selectDictByType
(
"permission"
);
List
<
SysDictVo
>
typeList
=
baseMapper
.
selectDictByType
(
"permission"
);
Map
<
String
,
String
>
typeMap
=
typeList
.
stream
().
collect
(
Collectors
.
toMap
(
SysDictVo:
:
getName
,
SysDictVo:
:
getId
));
Map
<
String
,
String
>
typeMap
=
typeList
.
stream
().
collect
(
Collectors
.
toMap
(
SysDictVo:
:
getName
,
SysDictVo:
:
getId
));
//查询所有用户的信息
//查询所有用户的信息
List
<
SysUserInfo
>
userInfoList
=
userInfoService
.
list
(
Wrappers
.<
SysUserInfo
>
query
().
lambda
()
List
<
SysUserInfo
>
userInfoList
=
userInfoService
.
list
(
Wrappers
.<
SysUserInfo
>
query
().
lambda
()
.
eq
(
SysUserInfo:
:
getStatus
,
CommonConstants
.
ZERO_INT
));
.
eq
(
SysUserInfo:
:
getStatus
,
CommonConstants
.
ZERO_INT
));
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
178255c5
...
@@ -1916,11 +1916,11 @@
...
@@ -1916,11 +1916,11 @@
a.DELETE_FLAG = 0
a.DELETE_FLAG = 0
AND a.social_id is not null
AND a.social_id is not null
<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
<if
test=
"tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == '0'"
>
<if
test=
'tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "0" '
>
AND a.STATUS in ('2','4')
AND a.STATUS in ('2','4')
</if>
</if>
<if
test=
"tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == '1'"
>
<if
test=
'tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "1" '
>
AND a.STATUS
='1'
AND a.STATUS
in ('1','5')
</if>
</if>
AND a.DISPATCH_ITEM like concat('%','医疗','%')
AND a.DISPATCH_ITEM like concat('%','医疗','%')
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo != null"
>
...
@@ -2000,11 +2000,11 @@
...
@@ -2000,11 +2000,11 @@
a.DELETE_FLAG = 0
a.DELETE_FLAG = 0
AND a.social_id is not null
AND a.social_id is not null
<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
<if
test=
"tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == '0'"
>
<if
test=
'tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "0"'
>
AND a.STATUS in ('2','4')
AND a.STATUS in ('2','4')
</if>
</if>
<if
test=
"tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == '1'"
>
<if
test=
'tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "1"'
>
AND a.STATUS
='1'
AND a.STATUS
in ('1','5')
</if>
</if>
AND (a.DISPATCH_ITEM like concat('%','工伤','%') or a.DISPATCH_ITEM like concat('%','养老','%') or a.DISPATCH_ITEM like concat('%','失业','%'))
AND (a.DISPATCH_ITEM like concat('%','工伤','%') or a.DISPATCH_ITEM like concat('%','养老','%') or a.DISPATCH_ITEM like concat('%','失业','%'))
...
...
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