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
bbd78127
Commit
bbd78127
authored
Jan 19, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
8c66b353
c0237add
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+2
-2
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
bbd78127
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
inner join t_employee_info b on a.EMP_ID = b.id
inner join t_employee_info b on a.EMP_ID = b.id
inner join t_settle_domain c on a.DEPT_NO = c.DEPART_NO
inner join t_settle_domain c on a.DEPT_NO = c.DEPART_NO
<where>
<where>
a.delete_flag = '0' and a.IS_COMPLETE = '1'
and a.project_status = 0
a.delete_flag = '0' and a.IS_COMPLETE = '1' and a.project_status = 0
<include
refid=
"employeeRegistrationPre_where"
/>
<include
refid=
"employeeRegistrationPre_where"
/>
</where>
</where>
</select>
</select>
...
@@ -235,7 +235,7 @@
...
@@ -235,7 +235,7 @@
inner join t_employee_info b on a.EMP_ID = b.id
inner join t_employee_info b on a.EMP_ID = b.id
inner join t_settle_domain c on a.DEPT_NO = c.DEPART_NO
inner join t_settle_domain c on a.DEPT_NO = c.DEPART_NO
<where>
<where>
a.delete_flag = '0' and a.IS_COMPLETE = '1'
a.delete_flag = '0' and a.IS_COMPLETE = '1'
and a.project_status = 0
<include
refid=
"employeeRegistrationPre_where"
/>
<include
refid=
"employeeRegistrationPre_where"
/>
</where>
</where>
order by a.CREATE_TIME desc
order by a.CREATE_TIME desc
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
bbd78127
...
@@ -1268,7 +1268,7 @@
...
@@ -1268,7 +1268,7 @@
where a.EMP_IDCARD = #{empIdcard} and d.DELETE_FLAG = '0' and d.type = '0' and d.SOCIAL_ID is not null
where a.EMP_IDCARD = #{empIdcard} and d.DELETE_FLAG = '0' and d.type = '0' and d.SOCIAL_ID is not null
<!-- 社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过)、派减(6待审核 7待办理 8办理成功 9 办理失败 11派减办理中 12 派减部分办理失败) -->
<!-- 社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过)、派减(6待审核 7待办理 8办理成功 9 办理失败 11派减办理中 12 派减部分办理失败) -->
and a.social_status in ('0', '1', '2', '3', '4', '6', '7', '9', '11', '12')
and a.social_status in ('0', '1', '2', '3', '4', '6', '7', '9', '11', '12')
<if
test=
"type != null and type
= '1'
"
>
<if
test=
"type != null and type
!= '' and type == 1
"
>
and d.create_name not like '自动化%'
and d.create_name not like '自动化%'
</if>
</if>
group by a.ID
group by a.ID
...
@@ -1295,7 +1295,7 @@
...
@@ -1295,7 +1295,7 @@
where a.EMP_IDCARD = #{empIdcard} and d.DELETE_FLAG = '0' and d.type = '0' and d.FUND_ID is not null
where a.EMP_IDCARD = #{empIdcard} and d.DELETE_FLAG = '0' and d.type = '0' and d.FUND_ID is not null
<!-- 派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 ) -->
<!-- 派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 ) -->
and a.fund_status in ('0', '1', '3', '5', '6', '8')
and a.fund_status in ('0', '1', '3', '5', '6', '8')
<if
test=
"type != null and type
= '1'
"
>
<if
test=
"type != null and type
!= '' and type == 1
"
>
and d.create_name not like '自动化%'
and d.create_name not like '自动化%'
</if>
</if>
group by a.ID
group by a.ID
...
...
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