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
92583dfb
Commit
92583dfb
authored
Dec 09, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.18-税友分支(强制参保+是否批量+医疗金额判断)
parent
b0ea3de8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
235 additions
and
111 deletions
+235
-111
TFascTemplateDetail.java
...oud/plus/v1/yifu/archives/entity/TFascTemplateDetail.java
+6
-0
FascServiceImpl.java
...d/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
+114
-103
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+10
-1
TFascTemplateDetailMapper.xml
...z/src/main/resources/mapper/TFascTemplateDetailMapper.xml
+3
-0
TSocialHouseholdInsertVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
+19
-0
TSocialHouseholdUpdateVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
+18
-0
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+65
-7
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TFascTemplateDetail.java
View file @
92583dfb
...
...
@@ -153,5 +153,11 @@ public class TFascTemplateDetail extends BaseEntity {
@TableField
(
exist
=
false
)
@Schema
(
description
=
"字段格式化或键值对"
)
private
String
fieldValue
;
/**
* 公司主体Id
*/
@TableField
(
exist
=
false
)
@Schema
(
description
=
"公司主体Id"
)
private
String
companyId
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
View file @
92583dfb
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
92583dfb
...
...
@@ -251,7 +251,16 @@ public class FascUtil {
pushLog
.
setTypeName
(
"获取明细映射"
);
tFascPushLogService
.
save
(
pushLog
);
res
=
templateClient
.
getSignTemplateDetail
(
signTemplateDetailReq
);
try
{
res
=
templateClient
.
getSignTemplateDetail
(
signTemplateDetailReq
);
}
catch
(
Exception
e
)
{
try
{
Thread
.
sleep
(
5000
);
// Wait 5 seconds
}
catch
(
InterruptedException
ie
)
{
Thread
.
currentThread
().
interrupt
();
}
res
=
templateClient
.
getSignTemplateDetail
(
signTemplateDetailReq
);
}
if
(
res
!=
null
)
{
// 更新日志
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TFascTemplateDetailMapper.xml
View file @
92583dfb
...
...
@@ -144,6 +144,9 @@
<if
test=
"tFascTemplateDetail.contractType != null and tFascTemplateDetail.contractType.trim() != ''"
>
AND b.contract_type = #{tFascTemplateDetail.contractType}
</if>
<if
test=
"tFascTemplateDetail.companyId != null and tFascTemplateDetail.companyId.trim() != ''"
>
AND b.company_id = #{tFascTemplateDetail.companyId}
</if>
</if>
</sql>
<!--tFascTemplateDetail简单分页查询-->
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
View file @
92583dfb
...
...
@@ -269,4 +269,23 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保仅补缴生成材料"
)
private
String
dataFlagYsd
;
/**
* 推送时,社保是否单个接口 0批量1单个(为空,则随isSingle)
*/
@ExcelAttribute
(
name
=
"社保推送税友接口通道"
)
@Schema
(
description
=
"社保推送税友接口通道"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保推送税友接口通道"
)
private
String
isSingleYgsPush
;
/**
* 推送时,医保是否单个接口 0批量1单个(为空,则随isSingleYsd)
*/
@ExcelAttribute
(
name
=
"医保推送税友接口通道"
)
@Schema
(
description
=
"医保推送税友接口通道"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保推送税友接口通道"
)
private
String
isSingleYsdPush
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
View file @
92583dfb
...
...
@@ -270,4 +270,22 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
@ExcelProperty
(
"医保仅补缴生成材料"
)
private
String
dataFlagYsd
;
/**
* 推送时,社保是否单个接口 0批量1单个(为空,则随isSingle)
*/
@ExcelAttribute
(
name
=
"社保推送税友接口通道"
)
@Schema
(
description
=
"社保推送税友接口通道"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保推送税友接口通道"
)
private
String
isSingleYgsPush
;
/**
* 推送时,医保是否单个接口 0批量1单个(为空,则随isSingleYsd)
*/
@ExcelAttribute
(
name
=
"医保推送税友接口通道"
)
@Schema
(
description
=
"医保推送税友接口通道"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保推送税友接口通道"
)
private
String
isSingleYsdPush
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
92583dfb
...
...
@@ -933,6 +933,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
household
.
setHouseType
(
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
?
"1"
:
"0"
);
household
.
setAuditUser
(
null
==
auditUser
.
getUserId
()
?
""
:
auditUser
.
getUserId
());
household
.
setHandleUser
(
null
==
handlerUser
.
getUserId
()
?
""
:
handlerUser
.
getUserId
());
// 初始化
household
.
setIsSingleYgsPush
(
null
);
//如果社保自动化为是时,才更新 推送类型、是否生成花名册、是否仅补缴生成材料、
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
household
.
getAutoStatus
())){
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
())){
...
...
@@ -947,13 +949,27 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
())){
household
.
setIsSingle
(
excel
.
getIsSingle
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
if
(
excel
.
getIsSingle
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
))
{
household
.
setIsSingle
(
CommonConstants
.
ZERO_STRING
);
}
else
{
household
.
setIsSingle
(
CommonConstants
.
ONE_STRING
);
// MVP 1.7.18,单个里,加了接口通道:
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYgsPush
()))
{
if
(
HouseConfigConstants
.
IS_SINGLE_NO
.
equals
(
excel
.
getIsSingleYgsPush
()))
{
household
.
setIsSingleYgsPush
(
CommonConstants
.
ZERO_STRING
);
}
else
if
(
HouseConfigConstants
.
IS_SINGLE_YES
.
equals
(
excel
.
getIsSingleYgsPush
()))
{
household
.
setIsSingleYgsPush
(
CommonConstants
.
ONE_STRING
);
}
}
}
}
}
else
{
household
.
setRosterAutoFlagYgs
(
null
);
household
.
setDataFlagYgs
(
null
);
household
.
setIsSingle
(
null
);
}
// 初始化
household
.
setIsSingleYsdPush
(
null
);
//如果医保自动化为是时,才更新 推送类型、是否生成花名册、是否仅补缴生成材料、
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
household
.
getAutoStatusYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYsd
())){
...
...
@@ -968,8 +984,21 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())){
household
.
setIsSingleYsd
(
excel
.
getIsSingleYsd
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
if
(
excel
.
getIsSingleYsd
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
))
{
household
.
setIsSingleYsd
(
CommonConstants
.
ZERO_STRING
);
}
else
{
household
.
setIsSingleYsd
(
CommonConstants
.
ONE_STRING
);
// MVP 1.7.18,单个里,加了接口通道:
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsdPush
()))
{
if
(
HouseConfigConstants
.
IS_SINGLE_NO
.
equals
(
excel
.
getIsSingleYsdPush
()))
{
household
.
setIsSingleYsdPush
(
CommonConstants
.
ZERO_STRING
);
}
else
if
(
HouseConfigConstants
.
IS_SINGLE_YES
.
equals
(
excel
.
getIsSingleYsdPush
()))
{
household
.
setIsSingleYsdPush
(
CommonConstants
.
ONE_STRING
);
}
}
}
}
}
else
{
household
.
setRosterAutoFlagYsd
(
null
);
household
.
setDataFlagYsd
(
null
);
...
...
@@ -1304,10 +1333,24 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if
(
Common
.
isNotNull
(
excel
.
getAutoStatusYsd
()))
{
info
.
setAutoStatusYsd
(
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
}
info
.
setIsSingleYgsPush
(
null
);
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
info
.
getAutoStatus
())){
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
()))
{
info
.
setIsSingle
(
excel
.
getIsSingle
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
())){
if
(
excel
.
getIsSingle
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
))
{
info
.
setIsSingle
(
CommonConstants
.
ZERO_STRING
);
}
else
{
info
.
setIsSingle
(
CommonConstants
.
ONE_STRING
);
// MVP 1.7.18,单个里,加了接口通道:
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYgsPush
()))
{
if
(
HouseConfigConstants
.
IS_SINGLE_NO
.
equals
(
excel
.
getIsSingleYgsPush
()))
{
info
.
setIsSingleYgsPush
(
CommonConstants
.
ZERO_STRING
);
}
else
if
(
HouseConfigConstants
.
IS_SINGLE_YES
.
equals
(
excel
.
getIsSingleYgsPush
()))
{
info
.
setIsSingleYgsPush
(
CommonConstants
.
ONE_STRING
);
}
}
}
}
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getRosterAutoFlagYgs
())){
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYgs
()))
{
info
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
...
...
@@ -1324,13 +1367,28 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
info
.
setDataFlagYgs
(
null
);
info
.
setRosterAutoFlagYgs
(
null
);
}
info
.
setIsSingleYsdPush
(
null
);
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
info
.
getAutoStatusYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())){
if
(
excel
.
getIsSingleYsd
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
))
{
info
.
setIsSingleYsd
(
CommonConstants
.
ZERO_STRING
);
}
else
{
info
.
setIsSingleYsd
(
CommonConstants
.
ONE_STRING
);
// MVP 1.7.18,单个里,加了接口通道:
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsdPush
()))
{
if
(
HouseConfigConstants
.
IS_SINGLE_NO
.
equals
(
excel
.
getIsSingleYsdPush
()))
{
info
.
setIsSingleYsdPush
(
CommonConstants
.
ZERO_STRING
);
}
else
if
(
HouseConfigConstants
.
IS_SINGLE_YES
.
equals
(
excel
.
getIsSingleYsdPush
()))
{
info
.
setIsSingleYsdPush
(
CommonConstants
.
ONE_STRING
);
}
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYsd
()))
{
info
.
setRosterAutoFlagYsd
(
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
()))
{
info
.
setIsSingleYsd
(
excel
.
getIsSingleYsd
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getRosterAutoFlagYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYsd
()))
{
info
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
...
...
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