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
39beb846
Commit
39beb846
authored
Oct 31, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'MVP1.5.8' into MVP1.5.9
parents
8c23f466
a1a8e758
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
3 deletions
+20
-3
application-dev.yml
...ifu-insurances-biz/src/main/resources/application-dev.yml
+2
-2
SysMenu.java
...om/yifu/cloud/plus/v1/yifu/permission/entity/SysMenu.java
+12
-0
SysMenuMapper.xml
...ermission-biz/src/main/resources/mapper/SysMenuMapper.xml
+5
-1
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+1
-0
No files found.
yifu-insurances/yifu-insurances-biz/src/main/resources/application-dev.yml
View file @
39beb846
...
@@ -20,8 +20,8 @@ spring:
...
@@ -20,8 +20,8 @@ spring:
type
:
com.zaxxer.hikari.HikariDataSource
type
:
com.zaxxer.hikari.HikariDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
username
:
root
username
:
root
password
:
ekp!@#123
password
:
ll_mysql
jdbc-url
:
jdbc:mysql://
36.7.147.19:20023
/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
jdbc-url
:
jdbc:mysql://
192.168.1.122:33306
/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari
:
hikari
:
minimum-idle
:
10
# 最小空闲连接数量
minimum-idle
:
10
# 最小空闲连接数量
idle-timeout
:
60000
# 空闲连接存活最大时间,默认600000(10分钟)
idle-timeout
:
60000
# 空闲连接存活最大时间,默认600000(10分钟)
...
...
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysMenu.java
View file @
39beb846
...
@@ -151,4 +151,16 @@ public class SysMenu extends BaseEntity {
...
@@ -151,4 +151,16 @@ public class SysMenu extends BaseEntity {
*/
*/
@Schema
(
description
=
"是否开关(0开、1关)"
)
@Schema
(
description
=
"是否开关(0开、1关)"
)
private
String
isOpen
;
private
String
isOpen
;
/**
* 表名,用来先查结果集
*/
@Schema
(
description
=
"表名,用来先查结果集"
)
private
String
tableName
;
/**
* 查询字段维度,如果fdId超长,则使用本字段
*/
@Schema
(
description
=
"查询字段维度,如果fdId超长,则使用本字段"
)
private
String
queryFields
;
}
}
yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysMenuMapper.xml
View file @
39beb846
...
@@ -29,6 +29,8 @@
...
@@ -29,6 +29,8 @@
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"isOpen"
column=
"IS_OPEN"
/>
<result
property=
"isOpen"
column=
"IS_OPEN"
/>
<result
property=
"tableName"
column=
"TABLE_NAME"
/>
<result
property=
"queryFields"
column=
"QUERY_FIELDS"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.ID,
a.ID,
...
@@ -51,7 +53,9 @@
...
@@ -51,7 +53,9 @@
a.IS_OPEN,
a.IS_OPEN,
a.TWO_LEVEL_ID,
a.TWO_LEVEL_ID,
a.VIEW_ID,
a.VIEW_ID,
a.CREATE_TIME
a.CREATE_TIME,
a.TABLE_NAME,
a.QUERY_FIELDS
</sql>
</sql>
<sql
id=
"sysMenu_where"
>
<sql
id=
"sysMenu_where"
>
<if
test=
"sysMenu != null"
>
<if
test=
"sysMenu != null"
>
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
39beb846
...
@@ -541,6 +541,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -541,6 +541,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
sendMap
.
put
(
"fd_3b3d3ec85bfeb0"
,
s
.
getSalaryMonth
().
substring
(
0
,
4
)
sendMap
.
put
(
"fd_3b3d3ec85bfeb0"
,
s
.
getSalaryMonth
().
substring
(
0
,
4
)
+
CommonConstants
.
CENTER_SPLIT_LINE_STRING
+
s
.
getSalaryMonth
().
substring
(
4
,
6
));
+
CommonConstants
.
CENTER_SPLIT_LINE_STRING
+
s
.
getSalaryMonth
().
substring
(
4
,
6
));
sendMap
.
put
(
"fd_3b73e18ad34090"
,
"否"
);
sendMap
.
put
(
"fd_3b73e18ad34090"
,
"否"
);
sendMap
.
put
(
"fd_3c3fd0da14ed9a"
,
s
.
getCreateName
());
if
(
Common
.
isNotNull
(
s
.
getIssueStatus
())
&&
s
.
getIssueStatus
()
==
1
)
{
if
(
Common
.
isNotNull
(
s
.
getIssueStatus
())
&&
s
.
getIssueStatus
()
==
1
)
{
sendMap
.
put
(
"fd_3b73e18ad34090"
,
"是"
);
sendMap
.
put
(
"fd_3b73e18ad34090"
,
"是"
);
...
...
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