Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
95791e57
Commit
95791e57
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
4285f65d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
0 deletions
+25
-0
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+0
-0
src/main/java/cn/timer/api/dao/xcgl/XcglAssoJsgzzxMapper.java
+2
-0
src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzbMapper.java
+2
-0
src/main/resources/application-dev.yml
+1
-0
src/main/resources/application-pro.yml
+1
-0
src/main/resources/application-test.yml
+1
-0
src/main/resources/mapping/xcgl/XcglAssoJsgzzxMapper.xml
+7
-0
src/main/resources/mapping/xcgl/XcglAssoXzbMapper.xml
+11
-0
No files found.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
95791e57
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/xcgl/XcglAssoJsgzzxMapper.java
View file @
95791e57
...
...
@@ -29,4 +29,6 @@ public interface XcglAssoJsgzzxMapper extends BaseMapper<XcglAssoJsgzzx> {
List
<
CalculationOptionsDto
>
selectCalculationOptionsList
(
int
xzzid
,
int
userid
);
List
<
XcglAssoJsgzzx
>
selectSalarySectionList
(
int
xzzid
);
List
<
XcglAssoJsgzzx
>
SalaryRuleGroupItem
(
int
xzzid
);
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzbMapper.java
View file @
95791e57
...
...
@@ -38,6 +38,8 @@ public interface XcglAssoXzbMapper extends BaseMapper<XcglAssoXzb> {
void
updateBatchXzxjg
(
List
<
XcglAssoXzb
>
list
);
HolidayInquiryDto
HolidayamountNum
(
int
orgcode
,
String
apptime
,
int
rules_type
,
int
userid
);
HolidayInquiryDto
Holidayamount
(
int
orgcode
,
String
apptime
,
int
rules_type
,
int
userid
);
HolidayInquiryDto
NumberOvertime
(
int
orgcode
,
String
apptime
,
int
userid
);
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-dev.yml
View file @
95791e57
...
...
@@ -194,6 +194,7 @@ config-8timer:
machine8timerUrl
:
'
http://test-8timer-fk.youlingrc.com'
#machine8timerUrl: 'http://192.168.3.38:8088'
authentication-code
:
'
888888'
prescription
:
8
#一天工作8小时
register-free-time
:
90
#系统赠送时间
register-company-max-num
:
100
#默认最大公司数量
register-childAccount-max-num
:
10
#默认最大子账号数量
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-pro.yml
View file @
95791e57
...
...
@@ -169,6 +169,7 @@ config-8timer:
machine8timerUrl
:
'
http://record.8timer.cn'
#machine8timerUrl: 'http://192.168.3.38:8088'
authentication-code
:
'
'
prescription
:
8
#一天工作8小时
register-free-time
:
90
#系统赠送时间
register-company-max-num
:
100
register-childAccount-max-num
:
10
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-test.yml
View file @
95791e57
...
...
@@ -168,6 +168,7 @@ config-8timer:
machine8timerUrl
:
'
http://test-8timer-fk.youlingrc.com'
#machine8timerUrl: 'http://192.168.3.38:8088'
authentication-code
:
'
888888'
prescription
:
8
#一天工作8小时
register-free-time
:
90
#系统赠送时间
register-company-max-num
:
100
register-childAccount-max-num
:
10
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoJsgzzxMapper.xml
View file @
95791e57
...
...
@@ -45,6 +45,13 @@
<result
column=
"rsz"
property=
"rsz"
/>
</resultMap>
<select
id=
"SalaryRuleGroupItem"
resultMap=
"BaseResultMap"
>
select * from xcgl_asso_jsgzzx js
where js.xzzid = #{xzzid}
ORDER BY js.rulestate = 2 or js.rulestate = 3 ASC,
js.id ASC
</select>
<select
id=
"selectSalarySectionList"
resultMap=
"BaseResultMap"
>
select jsgzzx.* from xcgl_asso_jsgzzx jsgzzx
LEFT JOIN xcgl_asso_option as opt on opt.id = jsgzzx.optionid
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoXzbMapper.xml
View file @
95791e57
...
...
@@ -94,6 +94,17 @@
where aa.orgcode = #{orgcode}
</select>
<select
id=
"HolidayamountNum"
resultMap=
"HolidayInquiryDtoMap"
>
select COUNT(*) as num
from kqgl_asso_relation_summary su
where su.approval_type = 2
and su.org_code = #{orgcode}
and su.ordernum = 1
and SUBSTR(su.app_time,1,7) = #{apptime}
and su.leave_type_id = (select ru.id from kqgl_asso_leave_rules ru where ru.org_code = #{orgcode} and ru.rules_type = #{rules_type})
and su.user_id = #{userid}
</select>
<select
id=
"Holidayamount"
resultMap=
"HolidayInquiryDtoMap"
>
select IFNULL(SUM(su.duration),0) as balance
from kqgl_asso_relation_summary su
...
...
This diff is collapsed.
Click to expand it.
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