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
07b45c66
Commit
07b45c66
authored
Aug 31, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工资兼容订单接口
parent
6097c0b7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
+14
-3
application-dev.yml
...der/yifu-order-biz/src/main/resources/application-dev.yml
+12
-2
THaveSalaryNosocialMapper.xml
...z/src/main/resources/mapper/THaveSalaryNosocialMapper.xml
+1
-1
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+1
-0
No files found.
yifu-order/yifu-order-biz/src/main/resources/application-dev.yml
View file @
07b45c66
...
...
@@ -8,14 +8,24 @@ spring:
redis
:
host
:
127.0.0.1
port
:
6379
password
:
password
:
'
@yf_2017'
datasource
:
type
:
com.zaxxer.hikari.HikariDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
username
:
root
password
:
yf_zsk
url
:
jdbc:mysql://192.168.1.65:22306/mvp_order?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari
:
driver-class-name
:
${spring.datasource.driver-class-name}
jdbc-url
:
${spring.datasource.url}
username
:
${spring.datasource.username}
password
:
${spring.datasource.password}
pool-name
:
AmytangHikariCP
minimum-idle
:
10
# 最小空闲连接数量
idle-timeout
:
60000
# 空闲连接存活最大时间,默认600000(10分钟)
maximum-pool-size
:
12
# 连接池最大连接数,默认是10
auto-commit
:
true
#此属性控制从池返回的连接的默认自动提交行为,默认值:true
max-lifetime
:
0
#此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认1800000即30分钟
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/THaveSalaryNosocialMapper.xml
View file @
07b45c66
...
...
@@ -73,7 +73,7 @@
AND a.SETTLEMENT_ORGAN_NO LIKE CONCAT('%', #{tHaveSalaryNosocial.settlementOrganNo},'%')
</if>
<if
test=
"tHaveSalaryNosocial.month != null"
>
AND a.month
= #{tHaveSalaryNosocial.month}
AND a.month
like concat('%', #{tHaveSalaryNosocial.month}, '%')
</if>
<if
test=
"tHaveSalaryNosocial.createMonth != null"
>
AND a.CREATE_MONTH = #{tHaveSalaryNosocial.createMonth}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
07b45c66
...
...
@@ -307,6 +307,7 @@
AND a.STATUS = #{tSalaryStandard.status}
</if>
</if>
ORDER BY CREATE_TIME DESC
</where>
</select>
<resultMap
id=
"salaryStandardExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo"
>
...
...
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