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
cc308be3
Commit
cc308be3
authored
Jan 15, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'MVP1.6.0' into develop
parents
dd41eef1
2ffcfaea
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
180 additions
and
22 deletions
+180
-22
EkpSettleMapper.java
...d/plus/v1/yifu/insurances/mapper/ekp/EkpSettleMapper.java
+9
-0
EkpSettleService.java
...plus/v1/yifu/insurances/service/ekp/EkpSettleService.java
+9
-0
EkpSettleServiceImpl.java
...ifu/insurances/service/ekp/impl/EkpSettleServiceImpl.java
+5
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+18
-13
EkpSettleMapper.xml
...ces-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
+10
-0
SysMenu.java
...om/yifu/cloud/plus/v1/yifu/permission/entity/SysMenu.java
+6
-0
SysUserPermission.java
...oud/plus/v1/yifu/permission/entity/SysUserPermission.java
+1
-1
SysTaxVo.java
...a/com/yifu/cloud/plus/v1/yifu/permission/vo/SysTaxVo.java
+28
-0
SysMenuController.java
...loud/plus/v1/permission/controller/SysMenuController.java
+14
-0
SysMenuMapper.java
...m/yifu/cloud/plus/v1/permission/mapper/SysMenuMapper.java
+3
-0
SysUserPermissionMapper.java
...ud/plus/v1/permission/mapper/SysUserPermissionMapper.java
+17
-4
SysMenuService.java
...yifu/cloud/plus/v1/permission/service/SysMenuService.java
+9
-0
SysMenuServiceImpl.java
...d/plus/v1/permission/service/impl/SysMenuServiceImpl.java
+6
-0
SysUserPermissionServiceImpl.java
...permission/service/impl/SysUserPermissionServiceImpl.java
+11
-3
SysMenuMapper.xml
...ermission-biz/src/main/resources/mapper/SysMenuMapper.xml
+16
-1
SysUserPermissionMapper.xml
...biz/src/main/resources/mapper/SysUserPermissionMapper.xml
+18
-0
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/ekp/EkpSettleMapper.java
View file @
cc308be3
...
@@ -24,6 +24,15 @@ public interface EkpSettleMapper {
...
@@ -24,6 +24,15 @@ public interface EkpSettleMapper {
*/
*/
SettleVo
getSettle
(
String
id
);
SettleVo
getSettle
(
String
id
);
/**
* 从商险订单明细中获取当前保单的结算状态
*
* @author huyc
* @param id
* @return {@link SettleVo}
*/
String
getSettleStatusFromEkpInsuranceDetail
(
String
id
);
List
<
EkpInsuranceViewVo
>
selectSettleStatusBySettleNo
(
@Param
(
"settleNo"
)
String
settleNo
,
@Param
(
"payFlag"
)
String
payFlag
);
List
<
EkpInsuranceViewVo
>
selectSettleStatusBySettleNo
(
@Param
(
"settleNo"
)
String
settleNo
,
@Param
(
"payFlag"
)
String
payFlag
);
List
<
EkpSocialViewVo
>
selectSocialViewStatusBySettleNo
(
@Param
(
"settleNo"
)
String
settleNo
,
@Param
(
"payFlag"
)
String
payFlag
);
List
<
EkpSocialViewVo
>
selectSocialViewStatusBySettleNo
(
@Param
(
"settleNo"
)
String
settleNo
,
@Param
(
"payFlag"
)
String
payFlag
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/ekp/EkpSettleService.java
View file @
cc308be3
...
@@ -25,6 +25,15 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> {
...
@@ -25,6 +25,15 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> {
*/
*/
SettleVo
getSettle
(
String
id
);
SettleVo
getSettle
(
String
id
);
/**
* 从商险订单明细中获取当前保单的结算状态
*
* @author huyc
* @param id 新增类
* @return {@link R}
*/
String
getSettleStatusFromEkpInsuranceDetail
(
String
id
);
/**
/**
* 根据结算单编号查询商险视图信息
* 根据结算单编号查询商险视图信息
*
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/ekp/impl/EkpSettleServiceImpl.java
View file @
cc308be3
...
@@ -31,6 +31,11 @@ public class EkpSettleServiceImpl implements EkpSettleService {
...
@@ -31,6 +31,11 @@ public class EkpSettleServiceImpl implements EkpSettleService {
return
ekpSettleMapper
.
getSettle
(
id
);
return
ekpSettleMapper
.
getSettle
(
id
);
}
}
@Override
public
String
getSettleStatusFromEkpInsuranceDetail
(
String
id
)
{
return
ekpSettleMapper
.
getSettleStatusFromEkpInsuranceDetail
(
id
);
}
@Override
@Override
public
List
<
EkpInsuranceViewVo
>
selectViewBySettleNo
(
String
settleNo
,
String
payFlag
)
{
public
List
<
EkpInsuranceViewVo
>
selectViewBySettleNo
(
String
settleNo
,
String
payFlag
)
{
return
ekpSettleMapper
.
selectSettleStatusBySettleNo
(
settleNo
,
payFlag
);
return
ekpSettleMapper
.
selectSettleStatusBySettleNo
(
settleNo
,
payFlag
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
cc308be3
...
@@ -3671,6 +3671,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3671,6 +3671,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
InsuranceRegisterParam
param
;
InsuranceRegisterParam
param
;
SettleVo
settleVo
;
SettleVo
settleVo
;
List
<
TInsuranceEkp
>
ekpList
;
List
<
TInsuranceEkp
>
ekpList
;
String
status
;
for
(
int
i
=
0
;
i
<
distinctList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
distinctList
.
size
();
i
++)
{
param
=
distinctList
.
get
(
i
);
param
=
distinctList
.
get
(
i
);
param
.
setFlag
(
CommonConstants
.
ONE_STRING
);
param
.
setFlag
(
CommonConstants
.
ONE_STRING
);
...
@@ -3856,26 +3857,17 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3856,26 +3857,17 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param
.
setErrorMessage
(
InsurancesConstants
.
BUY_HANDLE_FOUR_NOT_REGISTERED
);
param
.
setErrorMessage
(
InsurancesConstants
.
BUY_HANDLE_FOUR_NOT_REGISTERED
);
continue
;
continue
;
}
}
//保单号是否更新
boolean
booleanPolicyNo
=
StringUtils
.
isNotBlank
(
param
.
getPolicyNo
())
&&
!
param
.
getPolicyNo
().
equals
(
detail
.
getPolicyNo
());
//发票号是否更新
boolean
booleanInvoiceNo
=
StringUtils
.
isNotBlank
(
param
.
getInvoiceNo
())
&&
!
param
.
getInvoiceNo
().
equals
(
detail
.
getInvoiceNo
());
//保费是否更新
boolean
booleanActualPremium
=
true
;
if
(
Common
.
isNotNull
(
detail
.
getActualPremium
()))
{
booleanActualPremium
=
StringUtils
.
isNotBlank
(
param
.
getActualPremium
())
&&
detail
.
getActualPremium
().
compareTo
(
new
BigDecimal
(
param
.
getActualPremium
()))
!=
0
;
}
if
(
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
())){
if
(
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
())){
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
s
ettleVo
=
getInsuranceDetailSettleStatus
(
detail
.
getId
(),
detail
.
getDefaultSettleId
());
s
tatus
=
getSettleStatusFromEkpInsuranceDetail
(
detail
.
getId
(),
detail
.
getDefaultSettleId
());
if
(
!
Common
.
isEmpty
(
settleVo
)
&&
(
booleanActualPremium
||
booleanPolicyNo
||
booleanInvoiceNo
)
){
if
(
null
!=
status
){
//保费更新或者保单号发票号更新
//保费更新或者保单号发票号更新
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
s
ettleVo
.
getActualStatus
()
))
{
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
s
tatus
))
{
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
continue
;
continue
;
}
}
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
s
ettleVo
.
getActualStatus
()
))
{
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
s
tatus
))
{
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_TWO_NOT_REGISTERED
);
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_TWO_NOT_REGISTERED
);
continue
;
continue
;
}
}
...
@@ -7310,6 +7302,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -7310,6 +7302,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return
ekpSettleService
.
getSettle
(
id
);
return
ekpSettleService
.
getSettle
(
id
);
}
}
/**
* 从商险订单明细中获取当前保单的结算状态
*
* @author huyc
* @param
* @return {@link String}
*/
public
String
getSettleStatusFromEkpInsuranceDetail
(
String
detailId
,
String
settleId
){
String
id
=
detailId
+
CommonConstants
.
DOWN_LINE_STRING
+
settleId
;
//获取ekp结算信息
return
ekpSettleService
.
getSettleStatusFromEkpInsuranceDetail
(
id
);
}
/**
/**
* 保存失败信息
* 保存失败信息
*
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
View file @
cc308be3
...
@@ -45,6 +45,16 @@
...
@@ -45,6 +45,16 @@
where
where
fd_3b05ba46bb042e = #{id}
fd_3b05ba46bb042e = #{id}
</select>
</select>
<select
id=
"getSettleStatusFromEkpInsuranceDetail"
resultType=
"java.lang.String"
>
select
fd_3adfe6ec6a8cbe
from
ekp_e96a0a28442447c81ec0
where
fd_3b0a5743acab7e = #{id} limit 1
</select>
<!-- 根据结算单编码获取视图信息 -->
<!-- 根据结算单编码获取视图信息 -->
<select
id=
"selectSettleStatusBySettleNo"
resultMap=
"BaseResultStatusMap"
>
<select
id=
"selectSettleStatusBySettleNo"
resultMap=
"BaseResultStatusMap"
>
select
select
...
...
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysMenu.java
View file @
cc308be3
...
@@ -163,4 +163,10 @@ public class SysMenu extends BaseEntity {
...
@@ -163,4 +163,10 @@ public class SysMenu extends BaseEntity {
@Schema
(
description
=
"查询字段维度,如果fdId超长,则使用本字段"
)
@Schema
(
description
=
"查询字段维度,如果fdId超长,则使用本字段"
)
private
String
queryFields
;
private
String
queryFields
;
/**
* 税务主体字段ID
*/
@Schema
(
description
=
"税务主体字段ID"
)
private
String
taxId
;
}
}
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysUserPermission.java
View file @
cc308be3
...
@@ -53,7 +53,7 @@ public class SysUserPermission extends BaseEntity {
...
@@ -53,7 +53,7 @@ public class SysUserPermission extends BaseEntity {
/**
/**
* 权限类型 客户、商机、报价单、
* 权限类型 客户、商机、报价单、
* 1客户权限;2商机;3报价单;4合同;5项目;6BU;7条线;8部门;9收入归属
* 1客户权限;2商机;3报价单;4合同;5项目;6BU;7条线;8部门;9收入归属
;10二级指标归属;11税务主体
*/
*/
@Schema
(
description
=
"权限类型"
)
@Schema
(
description
=
"权限类型"
)
private
String
permissionType
;
private
String
permissionType
;
...
...
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/vo/SysTaxVo.java
0 → 100644
View file @
cc308be3
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
permission
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 税务主体
* @author hgw
* @date 2024-1-10 18:05:30
*/
@Data
public
class
SysTaxVo
implements
Serializable
{
/**
* id
*/
@Schema
(
description
=
"id"
)
private
String
id
;
/**
* 名称
*/
@Schema
(
description
=
"名称"
)
private
String
name
;
}
\ No newline at end of file
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/controller/SysMenuController.java
View file @
cc308be3
...
@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...
@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -94,4 +95,17 @@ public class SysMenuController {
...
@@ -94,4 +95,17 @@ public class SysMenuController {
public
R
<
SysMenu
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
public
R
<
SysMenu
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
sysMenuService
.
getById
(
id
));
return
R
.
ok
(
sysMenuService
.
getById
(
id
));
}
}
/**
* @Description: 获取税务主体分页列表
* @Author: hgw
* @Date: 2024/1/10 10:18
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.baomidou.mybatisplus.core.metadata.IPage < com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo>>
**/
@Operation
(
description
=
"获取税务主体分页列表"
)
@GetMapping
(
"/getSysTaxVoPage"
)
public
R
<
IPage
<
SysTaxVo
>>
getSysTaxVoPage
(
Page
<
SysTaxVo
>
page
,
SysTaxVo
vo
)
{
return
new
R
<>(
sysMenuService
.
getSysTaxVoPage
(
page
,
vo
));
}
}
}
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/mapper/SysMenuMapper.java
View file @
cc308be3
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
@@ -22,6 +23,8 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
...
@@ -22,6 +23,8 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*/
*/
IPage
<
SysMenu
>
getSysMenuPage
(
Page
<
SysMenu
>
page
,
@Param
(
"sysMenu"
)
SysMenuSearchVo
sysMenu
);
IPage
<
SysMenu
>
getSysMenuPage
(
Page
<
SysMenu
>
page
,
@Param
(
"sysMenu"
)
SysMenuSearchVo
sysMenu
);
IPage
<
SysTaxVo
>
getSysTaxVoPage
(
Page
<
SysTaxVo
>
page
,
@Param
(
"vo"
)
SysTaxVo
vo
);
/**
/**
* 判断是否存在此菜单
* 判断是否存在此菜单
*
*
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/mapper/SysUserPermissionMapper.java
View file @
cc308be3
...
@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysUserPermission
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysUserPermission
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysDictVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysUserDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysUserPermissionExportVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysUserPermissionSearchVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
@@ -117,6 +114,14 @@ public interface SysUserPermissionMapper extends BaseMapper<SysUserPermission> {
...
@@ -117,6 +114,14 @@ public interface SysUserPermissionMapper extends BaseMapper<SysUserPermission> {
*/
*/
IPage
<
SysUserDeptVo
>
selectTwoGsVO
(
Page
<
SysUserDeptVo
>
page
,
@Param
(
"name"
)
String
name
);
IPage
<
SysUserDeptVo
>
selectTwoGsVO
(
Page
<
SysUserDeptVo
>
page
,
@Param
(
"name"
)
String
name
);
/**
* @Description: 查找税务主体分页
* @Author: hgw
* @Date: 2024/1/10 16:27
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.permission.vo.SysUserDeptVo>
**/
IPage
<
SysUserDeptVo
>
selectTaxVO
(
Page
<
SysUserDeptVo
>
page
,
@Param
(
"name"
)
String
name
);
/**
/**
* 根据类型查询字典值
* 根据类型查询字典值
*
*
...
@@ -197,6 +202,14 @@ public interface SysUserPermissionMapper extends BaseMapper<SysUserPermission> {
...
@@ -197,6 +202,14 @@ public interface SysUserPermissionMapper extends BaseMapper<SysUserPermission> {
*/
*/
Integer
selectTwoGsCount
(
@Param
(
"name"
)
String
name
);
Integer
selectTwoGsCount
(
@Param
(
"name"
)
String
name
);
/**
* @Description: 查询税务主体是否存在
* @Author: hgw
* @Date: 2024/1/10 16:22
* @return: java.lang.Integer
**/
Integer
selectTaxCount
(
@Param
(
"name"
)
String
name
);
/**
/**
* @param userId
* @param userId
* @Description: 查找当前用户的所有权限
* @Description: 查找当前用户的所有权限
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/SysMenuService.java
View file @
cc308be3
...
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
...
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo
;
/**
/**
* 新权限-菜单表
* 新权限-菜单表
...
@@ -35,4 +36,12 @@ public interface SysMenuService extends IService<SysMenu> {
...
@@ -35,4 +36,12 @@ public interface SysMenuService extends IService<SysMenu> {
* @return
* @return
*/
*/
R
<
Boolean
>
updateMenu
(
SysMenu
menu
);
R
<
Boolean
>
updateMenu
(
SysMenu
menu
);
/**
* @Description: 获取税务主体分页列表
* @Author: hgw
* @Date: 2024/1/10 10:19
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo>
**/
IPage
<
SysTaxVo
>
getSysTaxVoPage
(
Page
<
SysTaxVo
>
page
,
SysTaxVo
vo
);
}
}
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysMenuServiceImpl.java
View file @
cc308be3
...
@@ -11,6 +11,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
...
@@ -11,6 +11,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -39,6 +40,11 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
...
@@ -39,6 +40,11 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
return
baseMapper
.
getSysMenuPage
(
page
,
sysMenu
);
return
baseMapper
.
getSysMenuPage
(
page
,
sysMenu
);
}
}
@Override
public
IPage
<
SysTaxVo
>
getSysTaxVoPage
(
Page
<
SysTaxVo
>
page
,
SysTaxVo
vo
)
{
return
baseMapper
.
getSysTaxVoPage
(
page
,
vo
);
}
/**
/**
* 新增菜单表
* 新增菜单表
*
*
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserPermissionServiceImpl.java
View file @
cc308be3
...
@@ -72,7 +72,8 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
...
@@ -72,7 +72,8 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
}
}
if
(
CommonConstants
.
SIX_STRING
.
equals
(
sysUserPermission
.
getPermissionType
())
if
(
CommonConstants
.
SIX_STRING
.
equals
(
sysUserPermission
.
getPermissionType
())
||
CommonConstants
.
SEVEN_STRING
.
equals
(
sysUserPermission
.
getPermissionType
())
||
CommonConstants
.
SEVEN_STRING
.
equals
(
sysUserPermission
.
getPermissionType
())
||
CommonConstants
.
TEN_STRING
.
equals
(
sysUserPermission
.
getPermissionType
()))
{
||
CommonConstants
.
TEN_STRING
.
equals
(
sysUserPermission
.
getPermissionType
())
||
CommonConstants
.
TWELVE_STRING
.
equals
(
sysUserPermission
.
getPermissionType
()))
{
permission
=
this
.
getOne
(
Wrappers
.<
SysUserPermission
>
query
().
lambda
()
permission
=
this
.
getOne
(
Wrappers
.<
SysUserPermission
>
query
().
lambda
()
.
eq
(
SysUserPermission:
:
getEmpLoginName
,
sysUserPermission
.
getEmpLoginName
())
.
eq
(
SysUserPermission:
:
getEmpLoginName
,
sysUserPermission
.
getEmpLoginName
())
.
eq
(
SysUserPermission:
:
getPermissionType
,
sysUserPermission
.
getPermissionType
())
.
eq
(
SysUserPermission:
:
getPermissionType
,
sysUserPermission
.
getPermissionType
())
...
@@ -167,6 +168,9 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
...
@@ -167,6 +168,9 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
}
else
if
(
CommonConstants
.
TEN_STRING
.
equals
(
searchVo
.
getType
())
)
{
}
else
if
(
CommonConstants
.
TEN_STRING
.
equals
(
searchVo
.
getType
())
)
{
//二级指标归属权限
//二级指标归属权限
iPage
=
baseMapper
.
selectTwoGsVO
(
page
,
searchVo
.
getName
());
iPage
=
baseMapper
.
selectTwoGsVO
(
page
,
searchVo
.
getName
());
}
else
if
(
CommonConstants
.
TWELVE_STRING
.
equals
(
searchVo
.
getType
())
)
{
//税务主体
iPage
=
baseMapper
.
selectTaxVO
(
page
,
searchVo
.
getName
());
}
else
{
}
else
{
//项目权限
//项目权限
if
(
Common
.
isNotNull
(
user
.
getId
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
user
.
getSystemFlag
()))
{
if
(
Common
.
isNotNull
(
user
.
getId
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
user
.
getSystemFlag
()))
{
...
@@ -310,7 +314,8 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
...
@@ -310,7 +314,8 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
flag
.
append
(
"_"
);
flag
.
append
(
"_"
);
if
(
CommonConstants
.
SIX_STRING
.
equals
(
insert
.
getPermissionType
())
||
if
(
CommonConstants
.
SIX_STRING
.
equals
(
insert
.
getPermissionType
())
||
CommonConstants
.
SEVEN_STRING
.
equals
(
insert
.
getPermissionType
())
||
CommonConstants
.
SEVEN_STRING
.
equals
(
insert
.
getPermissionType
())
||
CommonConstants
.
TEN_STRING
.
equals
(
insert
.
getPermissionType
()))
{
CommonConstants
.
TEN_STRING
.
equals
(
insert
.
getPermissionType
())
||
CommonConstants
.
TWELVE_STRING
.
equals
(
insert
.
getPermissionType
()))
{
flag
.
append
(
excel
.
getName
());
flag
.
append
(
excel
.
getName
());
}
else
{
}
else
{
flag
.
append
(
excel
.
getCode
());
flag
.
append
(
excel
.
getCode
());
...
@@ -326,13 +331,16 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
...
@@ -326,13 +331,16 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
//判断此登录名是否已经存在此权限维度
//判断此登录名是否已经存在此权限维度
if
(
CommonConstants
.
SIX_STRING
.
equals
(
insert
.
getPermissionType
())
if
(
CommonConstants
.
SIX_STRING
.
equals
(
insert
.
getPermissionType
())
||
CommonConstants
.
SEVEN_STRING
.
equals
(
insert
.
getPermissionType
())
||
CommonConstants
.
SEVEN_STRING
.
equals
(
insert
.
getPermissionType
())
||
CommonConstants
.
TEN_STRING
.
equals
(
insert
.
getPermissionType
()))
{
||
CommonConstants
.
TEN_STRING
.
equals
(
insert
.
getPermissionType
())
||
CommonConstants
.
TWELVE_STRING
.
equals
(
insert
.
getPermissionType
()))
{
//判断对应维度的名称是否存在
//判断对应维度的名称是否存在
Integer
count
;
Integer
count
;
if
(
CommonConstants
.
SIX_STRING
.
equals
(
insert
.
getPermissionType
()))
{
if
(
CommonConstants
.
SIX_STRING
.
equals
(
insert
.
getPermissionType
()))
{
count
=
baseMapper
.
selectDictByName
(
excel
.
getName
(),
"bu"
);
count
=
baseMapper
.
selectDictByName
(
excel
.
getName
(),
"bu"
);
}
else
if
(
CommonConstants
.
TEN_STRING
.
equals
(
insert
.
getPermissionType
()))
{
}
else
if
(
CommonConstants
.
TEN_STRING
.
equals
(
insert
.
getPermissionType
()))
{
count
=
baseMapper
.
selectTwoGsCount
(
excel
.
getName
());
count
=
baseMapper
.
selectTwoGsCount
(
excel
.
getName
());
}
else
if
(
CommonConstants
.
TWELVE_STRING
.
equals
(
insert
.
getPermissionType
()))
{
count
=
baseMapper
.
selectTaxCount
(
excel
.
getName
());
}
else
{
}
else
{
count
=
baseMapper
.
selectDictByName
(
excel
.
getName
(),
"line"
);
count
=
baseMapper
.
selectDictByName
(
excel
.
getName
(),
"line"
);
}
}
...
...
yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysMenuMapper.xml
View file @
cc308be3
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
<result
property=
"isOpen"
column=
"IS_OPEN"
/>
<result
property=
"isOpen"
column=
"IS_OPEN"
/>
<result
property=
"tableName"
column=
"TABLE_NAME"
/>
<result
property=
"tableName"
column=
"TABLE_NAME"
/>
<result
property=
"queryFields"
column=
"QUERY_FIELDS"
/>
<result
property=
"queryFields"
column=
"QUERY_FIELDS"
/>
<result
property=
"taxId"
column=
"TAX_ID"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.ID,
a.ID,
...
@@ -55,7 +56,8 @@
...
@@ -55,7 +56,8 @@
a.VIEW_ID,
a.VIEW_ID,
a.CREATE_TIME,
a.CREATE_TIME,
a.TABLE_NAME,
a.TABLE_NAME,
a.QUERY_FIELDS
a.QUERY_FIELDS,
a.TAX_ID
</sql>
</sql>
<sql
id=
"sysMenu_where"
>
<sql
id=
"sysMenu_where"
>
<if
test=
"sysMenu != null"
>
<if
test=
"sysMenu != null"
>
...
@@ -116,4 +118,17 @@
...
@@ -116,4 +118,17 @@
limit 1
limit 1
</select>
</select>
<!-- 获取税务主体列表-->
<select
id=
"getSysTaxVoPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo"
>
select fd_id AS id,a.fd_3afab4c6755286 AS name
from ekp_7e091e5e36848fb97451 a
where a.fd_3afab4c6755286 is not null
<if
test=
"vo != null"
>
<if
test=
"vo.name != null and vo.name.trim() != ''"
>
AND a.fd_3afab4c6755286 like concat('%',#{vo.name},'%')
</if>
</if>
GROUP BY a.fd_3afab4c6755286 ORDER BY a.fd_3afab4c6755286 desc
</select>
</mapper>
</mapper>
yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysUserPermissionMapper.xml
View file @
cc308be3
...
@@ -217,6 +217,17 @@
...
@@ -217,6 +217,17 @@
</if>
</if>
</select>
</select>
<!-- 查找税务主体分页 -->
<select
id=
"selectTaxVO"
resultMap=
"nameAndCodeMap"
>
select a.fd_3afab4c6755286 AS name
from ekp_7e091e5e36848fb97451 a
where a.fd_3afab4c6755286 is not null
<if
test=
"name != null and name.trim() != ''"
>
AND a.fd_3afab4c6755286 like concat('%',#{name},'%')
</if>
GROUP BY a.fd_3afab4c6755286 ORDER BY a.fd_3afab4c6755286 desc
</select>
<!--根据部门编码查询id-->
<!--根据部门编码查询id-->
<select
id=
"selectSettleByCode"
resultType=
"java.lang.String"
>
<select
id=
"selectSettleByCode"
resultType=
"java.lang.String"
>
SELECT
SELECT
...
@@ -298,6 +309,13 @@
...
@@ -298,6 +309,13 @@
where a.fd_3b1235d8f35c6c = #{name}
where a.fd_3b1235d8f35c6c = #{name}
</select>
</select>
<select
id=
"selectTaxCount"
resultType=
"java.lang.Integer"
>
SELECT
count(1)
from ekp_7e091e5e36848fb97451 a
where a.fd_3afab4c6755286 = #{name}
</select>
<!-- 查找当前用户的所有权限 -->
<!-- 查找当前用户的所有权限 -->
<select
id=
"getUserPermissionByUserId"
resultMap=
"sysUserPermissionMap"
>
<select
id=
"getUserPermissionByUserId"
resultMap=
"sysUserPermissionMap"
>
select
select
...
...
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