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
1a6cacd4
Commit
1a6cacd4
authored
May 15, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.4-优化社保士兵
parent
28d41c21
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
TSocialSoldierMapper.xml
...al-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
+4
-1
No files found.
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
View file @
1a6cacd4
...
...
@@ -97,7 +97,6 @@
and sd.PROVINCE=s.SOCIAL_PROVINCE and sd.CITY=a.SOCIAL_CITY and ( (s.SOCIAL_TOWN is null and sd.TOWN is null) or (sd.TOWN=s.SOCIAL_TOWN))
<include
refid=
"where_getSocialSoldier_base_handler"
/>
and DATE_FORMAT(a.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
and (sd.id is null or NOW()
<![CDATA[ <= ]]>
sd.SOCIAL_END_DATE)
</sql>
<!-- 社保士兵养工失增加模板-->
...
...
@@ -109,6 +108,7 @@
if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = '0' or
if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = '0'
)
and (sd.id is null or NOW()
<![CDATA[ <= ]]>
sd.SOCIAL_END_DATE)
group by a.id
</select>
...
...
@@ -140,6 +140,7 @@
if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = '5' or
if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = '5'
)
and (sd.id is null or NOW()
<![CDATA[ <= ]]>
sd.SOCIAL_END_DATE)
group by a.id
</select>
...
...
@@ -152,6 +153,7 @@
if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = '0' or
if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = '0'
)
and (sd.id is null or NOW()
<![CDATA[ <= ]]>
sd.MEDICAL_END_DATE)
group by a.id
</select>
...
...
@@ -164,6 +166,7 @@
if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = '5' or
if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = '5'
)
and (sd.id is null or NOW()
<![CDATA[ <= ]]>
sd.MEDICAL_END_DATE)
group by a.id
</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