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
0fdc0711
Commit
0fdc0711
authored
Jan 09, 2026
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.18' into MVP1.7.18
parents
b6fb98c1
616a7e2d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
32 deletions
+37
-32
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+37
-32
No files found.
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
0fdc0711
...
...
@@ -303,26 +303,29 @@
AND DATE_FORMAT(a.FUND_START_DATE,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.fundTimeEnd}
</if>
<!-- 社保五险起缴日期查询,有一个符合就出现 -->
<if
test=
"tDispatchInfoPre.socialTimeStart != null"
>
<if
test=
"tDispatchInfoPre.socialTimeStart != null
and tDispatchInfoPre.socialTimeEnd != null
"
>
AND (
(a.PENSION_START is not null and DATE_FORMAT(a.PENSION_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} ) or
(a.MEDICAL_START is not null and DATE_FORMAT(a.MEDICAL_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} ) or
(a.WORK_INJURY_START is not null and DATE_FORMAT(a.WORK_INJURY_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} ) or
(a.UNEMPLOY_START is not null and DATE_FORMAT(a.UNEMPLOY_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} ) or
(a.BIRTH_START is not null and DATE_FORMAT(a.BIRTH_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} ) or
(a.BIGAILMENT_START is not null and DATE_FORMAT(a.BIGAILMENT_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} )
(a.PENSION_START is not null and DATE_FORMAT(a.PENSION_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.PENSION_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
) or
(a.MEDICAL_START is not null and DATE_FORMAT(a.MEDICAL_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.MEDICAL_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
) or
(a.WORK_INJURY_START is not null and DATE_FORMAT(a.WORK_INJURY_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.WORK_INJURY_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
) or
(a.UNEMPLOY_START is not null and DATE_FORMAT(a.UNEMPLOY_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.UNEMPLOY_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
) or
(a.BIRTH_START is not null and DATE_FORMAT(a.BIRTH_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.BIRTH_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
) or
(a.BIGAILMENT_START is not null and DATE_FORMAT(a.BIGAILMENT_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.BIGAILMENT_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
)
</if>
<if
test=
"tDispatchInfoPre.socialTimeEnd != null"
>
AND (
(a.PENSION_START is not null and DATE_FORMAT(a.PENSION_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} ) or
(a.MEDICAL_START is not null and DATE_FORMAT(a.MEDICAL_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} ) or
(a.WORK_INJURY_START is not null and DATE_FORMAT(a.WORK_INJURY_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} ) or
(a.UNEMPLOY_START is not null and DATE_FORMAT(a.UNEMPLOY_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} ) or
(a.BIRTH_START is not null and DATE_FORMAT(a.BIRTH_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} ) or
(a.BIGAILMENT_START is not null and DATE_FORMAT(a.BIGAILMENT_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} )
)
</if>
</if>
</sql>
...
...
@@ -417,24 +420,26 @@
AND DATE_FORMAT(a.FUND_START_DATE,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.fundTimeEnd}
</if>
<!-- 社保五险起缴日期查询,有一个符合就出现 -->
<if
test=
"tDispatchInfoPre.socialTimeStart != null"
>
<if
test=
"tDispatchInfoPre.socialTimeStart != null
and tDispatchInfoPre.socialTimeEnd != null
"
>
AND (
(a.PENSION_START is not null and DATE_FORMAT(a.PENSION_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} ) or
(a.MEDICAL_START is not null and DATE_FORMAT(a.MEDICAL_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} ) or
(a.WORK_INJURY_START is not null and DATE_FORMAT(a.WORK_INJURY_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} ) or
(a.UNEMPLOY_START is not null and DATE_FORMAT(a.UNEMPLOY_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} ) or
(a.BIRTH_START is not null and DATE_FORMAT(a.BIRTH_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} ) or
(a.BIGAILMENT_START is not null and DATE_FORMAT(a.BIGAILMENT_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart} )
(a.PENSION_START is not null and DATE_FORMAT(a.PENSION_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.PENSION_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
) or
(a.MEDICAL_START is not null and DATE_FORMAT(a.MEDICAL_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.MEDICAL_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
) or
(a.WORK_INJURY_START is not null and DATE_FORMAT(a.WORK_INJURY_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.WORK_INJURY_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
) or
(a.UNEMPLOY_START is not null and DATE_FORMAT(a.UNEMPLOY_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.UNEMPLOY_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
) or
(a.BIRTH_START is not null and DATE_FORMAT(a.BIRTH_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.BIRTH_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
) or
(a.BIGAILMENT_START is not null and DATE_FORMAT(a.BIGAILMENT_START,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{tDispatchInfoPre.socialTimeStart}
and DATE_FORMAT(a.BIGAILMENT_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd}
)
</if>
<if
test=
"tDispatchInfoPre.socialTimeEnd != null"
>
AND (
(a.PENSION_START is not null and DATE_FORMAT(a.PENSION_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} ) or
(a.MEDICAL_START is not null and DATE_FORMAT(a.MEDICAL_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} ) or
(a.WORK_INJURY_START is not null and DATE_FORMAT(a.WORK_INJURY_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} ) or
(a.UNEMPLOY_START is not null and DATE_FORMAT(a.UNEMPLOY_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} ) or
(a.BIRTH_START is not null and DATE_FORMAT(a.BIRTH_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} ) or
(a.BIGAILMENT_START is not null and DATE_FORMAT(a.BIGAILMENT_START,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{tDispatchInfoPre.socialTimeEnd} )
)
</if>
</if>
...
...
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