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
541caeab
Commit
541caeab
authored
Sep 22, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.15' into MVP1.7.15
parents
c27692e7
1c90543e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
15 deletions
+9
-15
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+4
-10
TSocialSoldierMapper.xml
...al-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
+5
-5
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
541caeab
...
...
@@ -3972,18 +3972,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
dis
.
getSocialProvince
())
&&
provinceId
.
equals
(
dis
.
getSocialProvince
())
&&
set
!=
null
&&
Common
.
isNotNull
(
set
.
getType
())
&&
set
.
getType
()
==
1
)
{
isFriend
=
true
;
}
if
(!
isFriend
||
CommonConstants
.
ONE_STRING
.
equals
(
isSingleAudit
))
{
// 当前默认 安徽省 ,且开关是税友的,才可以税友推送办理
if
(
isFriend
)
{
// 断开派单单条推送税友
// 单个审核接口并且户类型为单个,即时推送税友
// 单个与批量审核,都推送,但是会过滤户里配置单个的
friendIdList
.
add
(
dis
.
getId
());
}
else
{
soldierIdList
.
add
(
dis
.
getId
());
}
}
}
//派减的申请审核完更新社保公积金查询快照表
if
(
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getType
()))
{
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
View file @
541caeab
...
...
@@ -294,7 +294,7 @@
LEFT JOIN sys_house_hold_info h on h.id=s.SOCIAL_HOUSEHOLD
where DATE_FORMAT(d.CREATE_TIME,'%Y%m') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 MONTH),'%Y%m')
and s.HANDLE_STATUS in ('1','5','6','7') and d.type = '0' and DATE_FORMAT(s.SOCIAL_START_DATE,'%Y%m')
<![CDATA[ < ]]>
DATE_FORMAT(now(),'%Y%m')
and h.DEL_FLAG='0' and h.TYPE = '0' and
h.AUTO_STATUS = '0'
and h.DEL_FLAG='0' and h.TYPE = '0' and
(h.AUTO_STATUS = '0' or h.AUTO_STATUS_YSD = '0')
GROUP BY s.EMP_IDCARD
</select>
<!-- 工资调整 -->
...
...
@@ -310,7 +310,7 @@
where DATE_FORMAT(d.CREATE_TIME,'%Y%m') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 MONTH),'%Y%m')
and s.HANDLE_STATUS in ('1','5','6','7') and d.type = '0'
and DATE_FORMAT(s.SOCIAL_START_DATE,'%Y%m')
<![CDATA[ < ]]>
DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 YEAR),'%Y12')
and h.DEL_FLAG='0' and h.TYPE = '0' and
h.AUTO_STATUS = '0'
and h.DEL_FLAG='0' and h.TYPE = '0' and
(h.AUTO_STATUS = '0' or h.AUTO_STATUS_YSD = '0')
GROUP BY s.EMP_IDCARD
</select>
...
...
@@ -320,14 +320,14 @@
'' companyNo ,s.NAME companyName,'' isPrint,'' createMonth,'是' isDownLoad,'否' danDuoSheet
,'否' danDanSheet,'是' duoDanSheet,'' startDate,'' endDate,'' isSalary,'' returnInfo
from sys_house_hold_info s
where s.DEL_FLAG='0' and s.TYPE = '0' and
s.AUTO_STATUS = '0'
where s.DEL_FLAG='0' and s.TYPE = '0' and
(s.AUTO_STATUS = '0' or s.AUTO_STATUS_YSD = '0')
</select>
<!-- 社保士兵实缴3张表查询2_合肥-社保-人员缴费明细打印 -->
<select
id=
"getSoldierPaymentSelectTwoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierPaymentSelectTwoVo"
>
select
s.NAME companyName,'' paymentType,'' payMonth,'' returnInfo ,'' returnInfoOne ,'' returnInfoTwo
from sys_house_hold_info s
where s.DEL_FLAG='0' and s.TYPE = '0' and
s.AUTO_STATUS = '0'
where s.DEL_FLAG='0' and s.TYPE = '0' and
(s.AUTO_STATUS = '0' or s.AUTO_STATUS_YSD = '0')
</select>
<!-- 社保士兵实缴3张表查询3_合肥-医保-单位缴费明细查询 -->
<select
id=
"getSoldierPaymentSelectThreeList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierPaymentSelectThreeVo"
>
...
...
@@ -339,7 +339,7 @@
,'' returnInfoOne
,'' returnInfoTwo
from sys_house_hold_info s
where s.DEL_FLAG='0' and s.TYPE = '0' and
s.AUTO_STATUS = '0'
where s.DEL_FLAG='0' and s.TYPE = '0' and
(s.AUTO_STATUS = '0' or s.AUTO_STATUS_YSD = '0')
</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