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
616d01d4
Commit
616d01d4
authored
Jul 07, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5
parents
83f34798
e4bbf5c0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
11 deletions
+18
-11
application.yml
...ives/yifu-archives-biz/src/main/resources/application.yml
+1
-1
logback-spring.xml
...s/yifu-archives-biz/src/main/resources/logback-spring.xml
+1
-1
TPersonnelRosterMapper.xml
...-biz/src/main/resources/mapper/TPersonnelRosterMapper.xml
+16
-9
No files found.
yifu-archives/yifu-archives-biz/src/main/resources/application.yml
View file @
616d01d4
...
...
@@ -26,7 +26,7 @@ mybatis-plus:
logic-not-delete-value
:
0
configuration
:
map-underscore-to-camel-case
:
true
log-impl
:
org.apache.ibatis.logging.stdout.StdOutImpl
#
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# spring security 配置
security
:
...
...
yifu-archives/yifu-archives-biz/src/main/resources/logback-spring.xml
View file @
616d01d4
...
...
@@ -50,7 +50,7 @@
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root
level=
"
DEBUG
"
>
<root
level=
"
error
"
>
<appender-ref
ref=
"console"
/>
<appender-ref
ref=
"debug"
/>
<appender-ref
ref=
"error"
/>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPersonnelRosterMapper.xml
View file @
616d01d4
...
...
@@ -337,12 +337,13 @@
c1.CONTRACT_NO as 'CONTRACT_CODE',c1.CREATE_NAME as 'CONTRACT_CREATER',c1.CREATE_TIME as 'CONTRACT_CREATE_TIME',
d.id as "SETTLE_DOMAIN"
from
(select MAX(c.CREATE_TIME),c.id,c.EMP_IDCARD,c.DEPT_NO from t_employee_contract_info c WHERE c.IN_USE = 0 and c.DELETE_FLAG='0'
(select MAX(c.CREATE_TIME)
as "CREATE_TIME"
,c.id,c.EMP_IDCARD,c.DEPT_NO from t_employee_contract_info c WHERE c.IN_USE = 0 and c.DELETE_FLAG='0'
GROUP BY c.DEPT_NO,c.EMP_IDCARD) t
LEFT JOIN t_employee_info e on e.EMP_IDCARD=t.EMP_IDCARD
LEFT JOIN t_employee_project p on p.EMP_IDCARD=t.EMP_IDCARD and p.DEPT_NO=t.DEPT_NO
LEFT JOIN t_settle_domain d on d.DEPART_NO=t.DEPT_NO
INNER JOIN t_employee_contract_info c1 on c1.id=t.id GROUP BY t.DEPT_NO,t.EMP_IDCARD
INNER JOIN t_employee_contract_info c1 on c1.EMP_IDCARD=t.EMP_IDCARD and c1.DEPT_NO=t.DEPT_NO and c1.CREATE_TIME=t.CREATE_TIME
GROUP BY t.DEPT_NO,t.EMP_IDCARD
<if
test=
"tPersonnelRoster != null"
>
<if
test=
"tPersonnelRoster.limitStart != null"
>
limit #{tPersonnelRoster.limitStart},#{tPersonnelRoster.limitEnd}
...
...
@@ -351,13 +352,19 @@
</select>
<select
id=
"getTPersonnelRosterCount"
resultType=
"java.lang.Integer"
>
select count(1)
from
(select MAX(c.CREATE_TIME),c.id,c.EMP_IDCARD,c.DEPT_NO from t_employee_contract_info c WHERE c.IN_USE = 0 and c.DELETE_FLAG='0'
GROUP BY c.DEPT_NO,c.EMP_IDCARD) t
INNER JOIN t_employee_info e on e.EMP_IDCARD=t.EMP_IDCARD
INNER JOIN t_employee_project p on p.EMP_IDCARD=t.EMP_IDCARD and p.DEPT_NO=t.DEPT_NO
INNER JOIN t_settle_domain d on d.DEPART_NO=t.DEPT_NO
INNER JOIN t_employee_contract_info c1 on c1.id=t.id
from (
select count(1)
from (select MAX(c.CREATE_TIME) as "CREATE_TIME", c.id, c.EMP_IDCARD, c.DEPT_NO
from t_employee_contract_info c
WHERE c.IN_USE = 0
and c.DELETE_FLAG = '0'
GROUP BY c.DEPT_NO, c.EMP_IDCARD) t
LEFT JOIN t_employee_info e on e.EMP_IDCARD = t.EMP_IDCARD
LEFT JOIN t_employee_project p on p.EMP_IDCARD = t.EMP_IDCARD and p.DEPT_NO = t.DEPT_NO
LEFT JOIN t_settle_domain d on d.DEPART_NO = t.DEPT_NO
INNER JOIN t_employee_contract_info c1 on c1.EMP_IDCARD=t.EMP_IDCARD and c1.DEPT_NO=t.DEPT_NO and c1.CREATE_TIME=t.CREATE_TIME
GROUP BY t.DEPT_NO, t.EMP_IDCARD
) a
</select>
<select
id=
"noPageCountDiy"
resultType=
"java.lang.Integer"
>
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