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
8063bdf0
Commit
8063bdf0
authored
Mar 27, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.8-状态
parent
7aab734b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
SociaFriendYgsAddVo.java
...ifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
+3
-1
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+2
-1
TSocialFriendMapper.xml
...ial-biz/src/main/resources/mapper/TSocialFriendMapper.xml
+4
-2
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
View file @
8063bdf0
...
@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
...
@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
import
lombok.Data
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
/**
/**
* @Author hgw
* @Author hgw
...
@@ -83,6 +82,9 @@ public class SociaFriendYgsAddVo implements Serializable {
...
@@ -83,6 +82,9 @@ public class SociaFriendYgsAddVo implements Serializable {
// 企业职工社会保险增员花名册 qyzgshbxzyhmc
// 企业职工社会保险增员花名册 qyzgshbxzyhmc
private
String
qyzgshbxzyhmc
;
private
String
qyzgshbxzyhmc
;
// 毕业院校
@ExcelProperty
(
"毕业院校"
)
private
String
byyx
;
// 企业职工基本医疗保险参保登记表 qyzgshbxzyhmc
// 企业职工基本医疗保险参保登记表 qyzgshbxzyhmc
private
String
qyzgjbylbxcbdjb
;
private
String
qyzgjbylbxcbdjb
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
8063bdf0
...
@@ -370,7 +370,8 @@ public class SocialFriendConfig {
...
@@ -370,7 +370,8 @@ public class SocialFriendConfig {
tszdxx
.
put
(
"gzsjzd"
,
vo
.
getWorkingHours
());
tszdxx
.
put
(
"gzsjzd"
,
vo
.
getWorkingHours
());
// 医保用工形式 医保新参必填 默认“原固定职工”
// 医保用工形式 医保新参必填 默认“原固定职工”
tszdxx
.
put
(
"ybygxs"
,
"原固定职工"
);
tszdxx
.
put
(
"ybygxs"
,
"原固定职工"
);
// 毕业院校
tszdxx
.
put
(
"byyx"
,
vo
.
getByyx
());
if
(
type
<
3
)
{
if
(
type
<
3
)
{
// 企业职工社会保险增员花名册 安徽非必填!
// 企业职工社会保险增员花名册 安徽非必填!
// 社保增员必填
// 社保增员必填
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendMapper.xml
View file @
8063bdf0
...
@@ -84,7 +84,8 @@
...
@@ -84,7 +84,8 @@
else '法律、行政法规规定的其他情形' end zzyy,
else '法律、行政法规规定的其他情形' end zzyy,
s.SOCIAL_PROVINCE socialProvince,
s.SOCIAL_PROVINCE socialProvince,
s.SOCIAL_CITY socialCity,
s.SOCIAL_CITY socialCity,
s.SOCIAL_TOWN socialTown
s.SOCIAL_TOWN socialTown,
a.SCHOOL_NAME byyx
</sql>
</sql>
...
@@ -228,7 +229,8 @@
...
@@ -228,7 +229,8 @@
else '法律、行政法规规定的其他情形' end zzyy,
else '法律、行政法规规定的其他情形' end zzyy,
s.SOCIAL_PROVINCE socialProvince,
s.SOCIAL_PROVINCE socialProvince,
s.SOCIAL_CITY socialCity,
s.SOCIAL_CITY socialCity,
s.SOCIAL_TOWN socialTown
s.SOCIAL_TOWN socialTown,
a.SCHOOL_NAME byyx
<include
refid=
"getSocialSoldierBaseTwo"
/>
<include
refid=
"getSocialSoldierBaseTwo"
/>
and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','3')
and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','3')
and (
and (
...
...
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