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
2b2c201f
Commit
2b2c201f
authored
Oct 09, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-社保自动化相关提价
parent
2f3b4d3e
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
223 additions
and
25 deletions
+223
-25
pom.xml
yifu-archives/yifu-archives-api/pom.xml
+6
-0
TSocialPreDetail.java
.../cloud/plus/v1/yifu/archives/entity/TSocialPreDetail.java
+10
-11
EmployeeRegistrationPreVo.java
...d/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
+11
-0
pom.xml
yifu-archives/yifu-archives-biz/pom.xml
+24
-0
EmployeeRegistrationPreController.java
...rchives/controller/EmployeeRegistrationPreController.java
+11
-0
EmployeeRegistrationPreService.java
...yifu/archives/service/EmployeeRegistrationPreService.java
+2
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+10
-0
TSocialPreDetailMapper.xml
...-biz/src/main/resources/mapper/TSocialPreDetailMapper.xml
+0
-5
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+11
-0
SocialDaprUtils.java
.../cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
+12
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+56
-0
TDispatchInfoPre.java
...fu/cloud/plus/v1/yifu/social/entity/TDispatchInfoPre.java
+7
-0
TDispatchInfoPreVo.java
...yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoPreVo.java
+16
-0
UnSocialFundInfoVo.java
...yifu/cloud/plus/v1/yifu/social/vo/UnSocialFundInfoVo.java
+4
-5
TSocialFundInfoController.java
.../v1/yifu/social/controller/TSocialFundInfoController.java
+15
-0
TSocialFundInfoMapper.java
...oud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
+2
-0
TSocialFundInfoService.java
...d/plus/v1/yifu/social/service/TSocialFundInfoService.java
+3
-0
TSocialFundInfoServiceImpl.java
.../yifu/social/service/impl/TSocialFundInfoServiceImpl.java
+10
-0
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+3
-1
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+10
-3
No files found.
yifu-archives/yifu-archives-api/pom.xml
View file @
2b2c201f
...
...
@@ -42,5 +42,11 @@
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-social-api
</artifactId>
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
</dependencies>
</project>
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSocialPreDetail.java
View file @
2b2c201f
...
...
@@ -11,8 +11,6 @@ import lombok.Data;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
java.util.Date
;
/**
* 入职确认信息社保已购买记录
*
...
...
@@ -24,7 +22,6 @@ import java.util.Date;
@EqualsAndHashCode
(
callSuper
=
true
)
@Schema
(
description
=
" 入职确认信息社保已购买记录"
)
public
class
TSocialPreDetail
extends
BaseEntity
{
/**
* ID
*/
...
...
@@ -88,14 +85,16 @@ public class TSocialPreDetail extends BaseEntity {
@ExcelProperty
(
"入职确认信息主表id"
)
@Schema
(
description
=
"入职确认信息主表id"
)
private
String
registerId
;
/**
* 缴费政策类型 0-最低 1-自定义 2-最高
*/
private
String
paymentType
;
/**
*
0未删除1删除
*
社保状态
*/
@ExcelAttribute
(
name
=
"0未删除1删除"
,
maxLength
=
1
)
@Length
(
max
=
1
,
message
=
"0未删除1删除不能超过1个字符"
)
@ExcelProperty
(
"0未删除1删除"
)
@Schema
(
description
=
"0未删除1删除"
)
private
String
deleteFlag
;
private
String
socialStatus
;
/**
* 派单人
*/
...
...
@@ -107,9 +106,9 @@ public class TSocialPreDetail extends BaseEntity {
/**
* 派单时间
*/
@ExcelAttribute
(
name
=
"派单时间"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"派单时间"
)
@ExcelProperty
(
"派单时间"
)
@Schema
(
description
=
"派单时间"
)
private
Date
dispatchTime
;
private
String
dispatchTime
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
View file @
2b2c201f
...
...
@@ -2,8 +2,10 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import
com.baomidou.mybatisplus.annotation.FieldStrategy
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSocialPreDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreVo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -120,6 +122,9 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema
(
description
=
"商险是否已购买 0 是 1 否"
)
private
String
insuranceIsBuy
;
@Schema
(
description
=
"社保是否已参保 0 是 1 否"
)
private
String
socialIsBuy
;
@Schema
(
description
=
"身份证合集"
)
private
List
<
String
>
idcardList
;
...
...
@@ -132,6 +137,12 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema
(
description
=
"合同待派单信息"
)
private
TEmployeeContractPreVo
employeeContractPreVos
;
@Schema
(
description
=
"社保待购买信息"
)
private
TDispatchInfoPreVo
dispatchInfoPreVo
;
@Schema
(
description
=
"社保流程中信息集合"
)
private
List
<
TSocialPreDetail
>
exitSocialInfoList
;
@Schema
(
description
=
"附件集合"
)
private
List
<
TAttaInfoSaveVo
>
attaList
;
...
...
yifu-archives/yifu-archives-biz/pom.xml
View file @
2b2c201f
...
...
@@ -57,6 +57,12 @@
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-common-log
</artifactId>
<exclusions>
<exclusion>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-reload4j
</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--必备:swagger-->
<dependency>
...
...
@@ -72,6 +78,12 @@
<groupId>
com.fadada.api
</groupId>
<version>
1.8.0
</version>
<artifactId>
fadada-java-sdk-api3
</artifactId>
<exclusions>
<exclusion>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-reload4j
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.apache.httpcomponents
</groupId>
...
...
@@ -123,10 +135,22 @@
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-social-api
</artifactId>
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
<dependency>
<groupId>
com.fadada.api
</groupId>
<artifactId>
fasc-openapi-java-sdk
</artifactId>
<version>
5.7.4.0910
</version>
<exclusions>
<exclusion>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-reload4j
</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 二维码生成JAR结束 -->
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/EmployeeRegistrationPreController.java
View file @
2b2c201f
...
...
@@ -211,4 +211,15 @@ public class EmployeeRegistrationPreController {
public
R
<
EmployeeInfoMsgVo
>
getGzEmployeeInfo
(
@RequestBody
EmployeeInfoMsgVo
vo
)
{
return
employeeRegistrationPreService
.
getGzEmployeeInfo
(
vo
);
}
/**
* @Author huyc
* @Description 新增社保已购买明细数据
* @Date 18:02 2025/10/9
**/
@Inner
@PostMapping
(
"/saveExitSocialDetailInfo"
)
public
String
saveExitSocialDetailInfo
(
@RequestBody
EmployeeRegistrationPreVo
preVo
)
{
return
employeeRegistrationPreService
.
saveExitSocialDetailInfo
(
preVo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/EmployeeRegistrationPreService.java
View file @
2b2c201f
...
...
@@ -121,4 +121,6 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
**/
EmployeeRegistrationPre
getEmployeeRegistrationPreById
(
String
id
);
String
saveExitSocialDetailInfo
(
EmployeeRegistrationPreVo
preVo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
2b2c201f
...
...
@@ -102,6 +102,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
private
final
TGzOfferInfoMapper
gzOfferInfoMapper
;
private
final
TSocialPreDetailService
socialPreDetailService
;
@Autowired
@Lazy
private
ScheduleService
scheduleService
;
...
...
@@ -1491,4 +1493,12 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return
pre
;
}
@Override
public
String
saveExitSocialDetailInfo
(
EmployeeRegistrationPreVo
preVo
)
{
if
(
Common
.
isNotNull
(
preVo
.
getExitSocialInfoList
())
&&
!
preVo
.
getExitSocialInfoList
().
isEmpty
())
{
socialPreDetailService
.
saveBatch
(
preVo
.
getExitSocialInfoList
());
}
return
CommonConstants
.
RESULT_DATA_SUCESS
;
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSocialPreDetailMapper.xml
View file @
2b2c201f
...
...
@@ -18,7 +18,6 @@
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"deleteFlag"
column=
"DELETE_FLAG"
/>
<result
property=
"dispatchName"
column=
"DISPATCH_NAME"
/>
<result
property=
"dispatchTime"
column=
"DISPATCH_TIME"
/>
</resultMap>
...
...
@@ -37,7 +36,6 @@
a.CREATE_NAME,
a.UPDATE_TIME,
a.CREATE_TIME,
a.DELETE_FLAG,
a.DISPATCH_NAME,
a.DISPATCH_TIME
</sql>
...
...
@@ -82,9 +80,6 @@
<if
test=
"tSocialPreDetail.createTime != null"
>
AND a.CREATE_TIME = #{tSocialPreDetail.createTime}
</if>
<if
test=
"tSocialPreDetail.deleteFlag != null and tSocialPreDetail.deleteFlag.trim() != ''"
>
AND a.DELETE_FLAG = #{tSocialPreDetail.deleteFlag}
</if>
<if
test=
"tSocialPreDetail.dispatchName != null and tSocialPreDetail.dispatchName.trim() != ''"
>
AND a.DISPATCH_NAME = #{tSocialPreDetail.dispatchName}
</if>
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
2b2c201f
...
...
@@ -649,4 +649,15 @@ public class ArchivesDaprUtil {
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractpre/inner/saveContractPreInfo"
,
JSON
.
toJSONString
(
preVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
/**
* @Author huyc
* @Description 新增社保已购买明细数据
* @Date 18:02 2025/10/9
* @Param
* @return
**/
public
R
<
String
>
saveExitSocialDetailInfo
(
EmployeeRegistrationPreVo
preVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/employeeregistrationpre/saveExitSocialDetailInfo"
,
JSON
.
toJSONString
(
preVo
),
String
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
View file @
2b2c201f
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
common
.
dapr
.
util
;
import
com.alibaba.fastjson.JSON
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistCheckVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -210,4 +211,15 @@ public class SocialDaprUtils {
public
R
<
TEmployeeInsuranceWorkDayVo
>
getContractAfterWorkDay
(
TEmployeeInsuranceWorkDayVo
vo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tholidayinfo/inner/selectBeforeOrAfterWorkDayCommon"
,
JSON
.
toJSONString
(
vo
),
TEmployeeInsuranceWorkDayVo
.
class
,
SecurityConstants
.
FROM_IN
);
}
/**
* @Author huyc
* @Description 判断是否存在正常或者在途的合同
* @Date 10:26 2025/6/12
* @Param
* @return
**/
public
R
<
Boolean
>
selectExitEmpSocial
(
TEmployeeAutoRegistCheckVo
cardVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tsocialfundinfo/selectExitEmpSocial"
,
JSON
.
toJSONString
(
cardVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
2b2c201f
...
...
@@ -43,6 +43,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
...
...
@@ -634,6 +635,23 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//1.9.16社保自动化校验逻辑
if
(
preVo
.
getServerItem
().
contains
(
"社保购买"
)
&&
null
!=
preVo
.
getEmployeeContractPreVos
())
{
//根据身份证号码和项目编号查询合同
TEmployeeAutoRegistCheckVo
cardVo
=
new
TEmployeeAutoRegistCheckVo
();
cardVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
R
<
Boolean
>
flag
=
socialDaprUtils
.
selectExitEmpSocial
(
cardVo
);
//是否已签署为是需要判断合同是否在用或者流程中
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
preVo
.
getSocialIsBuy
())
&&
(
Common
.
isEmpty
(
flag
)
||
Boolean
.
TRUE
.
equals
(!
flag
.
getData
())))
{
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
"未找到流程中或者在用的社保信息!"
);
}
//是否已签署为否需要判断是否在用或者流程中的合同
if
(
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getSocialIsBuy
())
&&
Common
.
isNotNull
(
flag
)
&&
Boolean
.
TRUE
.
equals
(
flag
.
getData
()))
{
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
"该人员存在在途/有效的社保数据,请将“是否已参保”调整为“是”"
);
}
}
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
//状态将更新成“已处理”;处理记录中,针对此情况,记录真实的进项时间,备注:先于登记入项
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
...
...
@@ -682,6 +700,22 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//生成合同待购买数据
initContractPreInfo
(
registration
,
preVo
.
getEmployeeContractPreVos
(),
user
,
domainR
.
getData
());
}
//服务类型包含社保购买时
if
(
preVo
.
getServerItem
().
contains
(
"社保购买"
)
&&
null
!=
preVo
.
getExitSocialInfoList
()
&&
!
preVo
.
getExitSocialInfoList
().
isEmpty
()
&&
Common
.
isNotNull
(
preVo
.
getSocialIsBuy
())
&&
preVo
.
getSocialIsBuy
().
equals
(
CommonConstants
.
ZERO_STRING
))
{
preVo
.
getExitSocialInfoList
().
forEach
(
s
->
s
.
setRegisterId
(
domainR
.
getData
()));
//生成社保已购买数据
archivesDaprUtil
.
saveExitSocialDetailInfo
(
preVo
);
}
else
if
(
preVo
.
getServerItem
().
contains
(
"社保购买"
)
&&
null
!=
preVo
.
getDispatchInfoPreVo
()
&&
Common
.
isNotNull
(
preVo
.
getSocialIsBuy
())
&&
preVo
.
getSocialIsBuy
().
equals
(
CommonConstants
.
ONE_STRING
))
{
//生成社保待购买数据
initSocialPreInfo
(
registration
,
preVo
.
getDispatchInfoPreVo
(),
user
,
domainR
.
getData
());
}
}
}
catch
(
Exception
e
)
{
log
.
error
(
"执行异常"
,
e
);
...
...
@@ -1636,6 +1670,28 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 15:20"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
}
//社保待购买数据初始化
private
void
initSocialPreInfo
(
EmployeeRegistration
registration
,
TDispatchInfoPreVo
preVo
,
YifuUser
user
,
String
id
)
throws
ParseException
{
preVo
.
setRegisterId
(
id
);
preVo
.
setCustomerUsername
(
registration
.
getCustomerUsernameNew
());
preVo
.
setCustomerUserLoginName
(
registration
.
getCustomerUserLoginname
());
preVo
.
setDeptName
(
registration
.
getDeptName
());
preVo
.
setDeptId
(
registration
.
getDeptId
());
preVo
.
setJoinLeaveDate
(
registration
.
getJoinLeaveDate
());
preVo
.
setDeptNo
(
registration
.
getDeptNo
());
preVo
.
setEmpName
(
registration
.
getEmployeeName
());
preVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
preVo
.
setCreateBy
(
user
.
getId
());
preVo
.
setCreateName
(
user
.
getNickname
());
preVo
.
setUpdateBy
(
user
.
getId
());
preVo
.
setTypeSub
(
CommonConstants
.
ZERO_STRING
);
preVo
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 15:20"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
preVo
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 09:00"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
}
//商险状态是否正常判断
private
boolean
checkInsuranceIsProcess
(
EmployeeRegistrationPreVo
preVo
)
{
R
<
Boolean
>
flag
=
insuranceDaprUtil
.
checkExitInsuanceIsProcess
(
preVo
);
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfoPre.java
View file @
2b2c201f
...
...
@@ -192,6 +192,13 @@ public class TDispatchInfoPre extends BaseEntity {
@ExcelProperty
(
"前端客服"
)
@Schema
(
description
=
"前端客服"
)
private
String
customerUsername
;
/**
* 前端客服登录名
*/
@ExcelAttribute
(
name
=
"前端客服登录名"
)
@Schema
(
description
=
"前端客服登录名"
)
@ExcelProperty
(
"前端客服登录名"
)
private
String
customerUserLoginName
;
/**
* 预计派单时间
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoPreVo.java
View file @
2b2c201f
...
...
@@ -166,6 +166,13 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@Schema
(
description
=
"前端客服姓名"
)
@ExcelProperty
(
"前端客服姓名"
)
private
String
customerUsername
;
/**
* 前端客服登录名
*/
@ExcelAttribute
(
name
=
"前端客服登录名"
)
@Schema
(
description
=
"前端客服登录名"
)
@ExcelProperty
(
"前端客服登录名"
)
private
String
customerUserLoginName
;
/**
* 预计派单时间
*/
...
...
@@ -321,4 +328,13 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelProperty
(
"合同id"
)
private
String
contractId
;
@Schema
(
description
=
"创建人-姓名"
)
private
String
createName
;
@Schema
(
description
=
"创建人"
)
private
String
createBy
;
@Schema
(
description
=
"更新人"
)
private
String
updateBy
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/UnSocialFundInfoVo.java
View file @
2b2c201f
...
...
@@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* 参保人员信息VO
...
...
@@ -24,7 +23,7 @@ public class UnSocialFundInfoVo implements Serializable {
/**
* 缴费政策类型 0-最低 1-自定义 2-最高
*/
private
Integer
paymentType
;
private
String
paymentType
;
/**
* 社保状态
...
...
@@ -34,12 +33,12 @@ public class UnSocialFundInfoVo implements Serializable {
/**
* 项目编码
*/
private
String
settleDomainCode
;
private
String
deptNo
;
/**
* 项目名称
*/
private
String
settleDomain
Name
;
private
String
dept
Name
;
/**
* 缴纳地-省
...
...
@@ -64,6 +63,6 @@ public class UnSocialFundInfoVo implements Serializable {
/**
* 创建时间
*/
private
LocalDateTime
createTime
;
private
String
createTime
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialFundInfoController.java
View file @
2b2c201f
...
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SocialFundVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistCheckVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
...
...
@@ -233,4 +234,18 @@ public class TSocialFundInfoController {
return
R
.
ok
(
tSocialFundInfoService
.
selectUnSocialFundInfoByEmpIdcard
(
empIdcard
));
}
/**
* @Author huych
* @Description 查询是否存在正常或者在途的社保
* @Date 15:00 2025/10/9
* @Param
* @return
**/
@Operation
(
summary
=
"查询是否存在正常或者在途的社保"
,
description
=
"查询是否存在正常或者在途的保"
)
@PostMapping
(
"/selectExitEmpSocial"
)
public
Boolean
selectExitEmpCopntract
(
@RequestBody
TEmployeeAutoRegistCheckVo
cardVo
)
{
return
tSocialFundInfoService
.
selectExitEmpSocail
(
cardVo
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
View file @
2b2c201f
...
...
@@ -99,4 +99,6 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> {
List
<
UnSocialFundInfoVo
>
selectUnSocialFundInfoByEmpIdcard
(
@Param
(
"empIdcard"
)
String
empIdcard
);
long
selectSocialFundInfoCountByEmpIdcard
(
@Param
(
"empIdcard"
)
String
empIdcard
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFundInfoService.java
View file @
2b2c201f
...
...
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SocialFundVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistCheckVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.ListStringVo
;
...
...
@@ -96,4 +97,6 @@ public interface TSocialFundInfoService extends IService<TSocialFundInfo> {
List
<
UnSocialFundInfoVo
>
selectUnSocialFundInfoByEmpIdcard
(
String
empIdcard
);
Boolean
selectExitEmpSocail
(
TEmployeeAutoRegistCheckVo
cardVo
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @
2b2c201f
...
...
@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SocialFundVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistCheckVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes
;
...
...
@@ -955,4 +956,13 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
public
List
<
UnSocialFundInfoVo
>
selectUnSocialFundInfoByEmpIdcard
(
String
empIdcard
)
{
return
baseMapper
.
selectUnSocialFundInfoByEmpIdcard
(
empIdcard
);
}
@Override
public
Boolean
selectExitEmpSocail
(
TEmployeeAutoRegistCheckVo
cardVo
)
{
if
(
Common
.
isNotNull
(
cardVo
)
&&
Common
.
isNotNull
(
cardVo
.
getEmpIdcard
()))
{
return
baseMapper
.
selectSocialFundInfoCountByEmpIdcard
(
cardVo
.
getEmpIdcard
())
>
0
;
}
else
{
return
false
;
}
}
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
2b2c201f
...
...
@@ -26,6 +26,7 @@
<result
property=
"recordBaseType"
column=
"RECORD_BASE_TYPE"
/>
<result
property=
"joinLeaveDate"
column=
"JOIN_LEAVE_DATE"
/>
<result
property=
"customerUsername"
column=
"CUSTOMER_USERNAME"
/>
<result
property=
"customerUserLoginName"
column=
"CUSTOMER_USER_LOGIN_NAME"
/>
<result
property=
"expectedCollectionTime"
column=
"EXPECTED_COLLECTION_TIME"
/>
<result
property=
"expectedConfirmTime"
column=
"EXPECTED_CONFIRM_TIME"
/>
<result
property=
"isAutoDis"
column=
"IS_AUTO_DIS"
/>
...
...
@@ -91,9 +92,10 @@
a.RECORD_BASE_TYPE,
a.JOIN_LEAVE_DATE,
a.CUSTOMER_USERNAME,
a.CUSTOMER_USER_LOGIN_NAME,
a.EXPECTED_COLLECTION_TIME,
a.EXPECTED_CONFIRM_TIME,
a.I_AUTO_DIS,
a.I
S
_AUTO_DIS,
a.IS_CREATE_DATE,
a.CONFIG_NAME,
a.REGISTER_ID,
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
2b2c201f
...
...
@@ -275,8 +275,8 @@
<result
property=
"socialHouseholdName"
column=
"SOCIAL_HOUSEHOLD_NAME"
/>
<result
property=
"paymentType"
column=
"PAYMENT_TYPE"
/>
<result
property=
"socialStatus"
column=
"SOCIAL_STATUS"
/>
<result
property=
"
settleDomainCode
"
column=
"SETTLE_DOMAIN_CODE"
/>
<result
property=
"
settleDomain
Name"
column=
"SETTLE_DOMAIN_NAME"
/>
<result
property=
"
deptNo
"
column=
"SETTLE_DOMAIN_CODE"
/>
<result
property=
"
dept
Name"
column=
"SETTLE_DOMAIN_NAME"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"socialProvince"
column=
"SOCIAL_PROVINCE"
/>
...
...
@@ -1228,11 +1228,18 @@
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
d.CREATE_NAME,
d.
CREATE_TIME
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as
CREATE_TIME
FROM t_social_fund_info a
inner join t_dispatch_info d on a.DISPATCH_ID = d.ID
where a.EMP_IDCARD = #{empIdcard}
and a.social_status in ('0', '1', '2', '3', '4', '6', '7', '9', '11', '12')
</select>
<select
id=
"selectSocialFundInfoCountByEmpIdcard"
resultType=
"java.lang.Long"
>
SELECT count(1)
FROM t_social_fund_info a
where a.EMP_IDCARD = #{empIdcard}
and a.social_status in ('0', '1', '2', '3', '4', '6', '7', '9', '11', '12')
</select>
</mapper>
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