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
bb644f7e
Commit
bb644f7e
authored
May 15, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.4-优化社保士兵
parent
70144f64
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+1
-1
TSocialSoldierMapper.xml
...al-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
+2
-2
No files found.
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
bb644f7e
...
@@ -1733,7 +1733,7 @@
...
@@ -1733,7 +1733,7 @@
<!-- 社保士兵列表查询 -->
<!-- 社保士兵列表查询 -->
<sql
id=
"where_getSocialSoldier"
>
<sql
id=
"where_getSocialSoldier"
>
<where>
<where>
s.DELETE_FLAG = 0
a.DELETE_FLAG = '0'
AND a.social_id is not null
AND a.social_id is not null
and a.AUTO_FLAG = '0'
and a.AUTO_FLAG = '0'
<include
refid=
"where_getSocialRecordRoster_base"
/>
<include
refid=
"where_getSocialRecordRoster_base"
/>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
View file @
bb644f7e
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
left join t_social_deadline_info sd on sd.MONTH = DATE_FORMAT(a.AUDIT_TIME,'%Y%m') and sd.STATUS = '0'
left join t_social_deadline_info sd on sd.MONTH = DATE_FORMAT(a.AUDIT_TIME,'%Y%m') and sd.STATUS = '0'
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))
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"
/>
<include
refid=
"where_getSocialSoldier_base_handler"
/>
and DATE_FORMAT(
d
.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
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)
and (sd.id is null or NOW()
<![CDATA[ <= ]]>
sd.SOCIAL_END_DATE)
</sql>
</sql>
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
<sql
id=
"where_getSocialSoldier_base_handler"
>
<sql
id=
"where_getSocialSoldier_base_handler"
>
<where>
<where>
s.DELETE_FLAG = 0
a.DELETE_FLAG = '0'
<if
test=
"idsStr != null and idsStr.size > 0"
>
<if
test=
"idsStr != null and idsStr.size > 0"
>
AND a.ID in
AND a.ID in
<foreach
item=
"items"
index=
"index"
collection=
"idsStr"
open=
"("
separator=
","
close=
")"
>
<foreach
item=
"items"
index=
"index"
collection=
"idsStr"
open=
"("
separator=
","
close=
")"
>
...
...
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