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
a56f26c5
Commit
a56f26c5
authored
Oct 10, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
436a0cb6
b44684ad
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
416 additions
and
45 deletions
+416
-45
EmployeeRegistrationPreVo.java
...d/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
+9
-0
TDispatchInfoPreVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
+17
-1
TSocialPreDetailVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TSocialPreDetailVo.java
+110
-0
pom.xml
yifu-archives/yifu-archives-biz/pom.xml
+18
-0
EmployeeRegistrationPreController.java
...rchives/controller/EmployeeRegistrationPreController.java
+1
-0
TSocialPreDetailMapper.java
.../plus/v1/yifu/archives/mapper/TSocialPreDetailMapper.java
+1
-1
SocialDaprUtils.java
.../cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
+26
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+48
-1
TDispatchInfoPre.java
...fu/cloud/plus/v1/yifu/social/entity/TDispatchInfoPre.java
+14
-8
TSocialPreDetail.java
...fu/cloud/plus/v1/yifu/social/entity/TSocialPreDetail.java
+11
-12
UnSocialFundInfoVo.java
...yifu/cloud/plus/v1/yifu/social/vo/UnSocialFundInfoVo.java
+4
-5
TDispatchInfoPreController.java
...v1/yifu/social/controller/TDispatchInfoPreController.java
+14
-0
TSocialFundInfoController.java
.../v1/yifu/social/controller/TSocialFundInfoController.java
+15
-0
TSocialFundInfoMapper.java
...oud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
+2
-0
TSocialPreDetailMapper.java
...ud/plus/v1/yifu/social/mapper/TSocialPreDetailMapper.java
+16
-0
TDispatchInfoPreService.java
.../plus/v1/yifu/social/service/TDispatchInfoPreService.java
+8
-0
TSocialFundInfoService.java
...d/plus/v1/yifu/social/service/TSocialFundInfoService.java
+3
-0
TSocialPreDetailService.java
.../plus/v1/yifu/social/service/TSocialPreDetailService.java
+2
-2
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+68
-0
TSocialFundInfoServiceImpl.java
.../yifu/social/service/impl/TSocialFundInfoServiceImpl.java
+10
-0
TSocialPreDetailServiceImpl.java
...yifu/social/service/impl/TSocialPreDetailServiceImpl.java
+4
-4
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+3
-1
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+10
-3
TSocialPreDetailMapper.xml
...-biz/src/main/resources/mapper/TSocialPreDetailMapper.xml
+2
-7
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
View file @
a56f26c5
...
...
@@ -120,6 +120,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 +135,12 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema
(
description
=
"合同待派单信息"
)
private
TEmployeeContractPreVo
employeeContractPreVos
;
@Schema
(
description
=
"社保待购买信息"
)
private
TDispatchInfoPreVo
dispatchInfoPreVo
;
@Schema
(
description
=
"社保流程中信息集合"
)
private
List
<
TSocialPreDetailVo
>
exitSocialInfoList
;
@Schema
(
description
=
"附件集合"
)
private
List
<
TAttaInfoSaveVo
>
attaList
;
...
...
yifu-
social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social
/vo/TDispatchInfoPreVo.java
→
yifu-
archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives
/vo/TDispatchInfoPreVo.java
View file @
a56f26c5
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
...
...
@@ -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-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSocialPreDetailVo.java
0 → 100644
View file @
a56f26c5
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
java.io.Serializable
;
/**
* 入职确认信息社保已购买记录
*
* @author huych
* @date 2025-09-30 16:41:57
*/
@Data
public
class
TSocialPreDetailVo
implements
Serializable
{
/**
* ID
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@ExcelProperty
(
"ID"
)
@Schema
(
description
=
"ID"
)
private
String
id
;
/**
* 社保缴纳地-省
*/
@ExcelAttribute
(
name
=
"社保缴纳地-省"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"社保缴纳地-省不能超过32个字符"
)
@ExcelProperty
(
"社保缴纳地-省"
)
@Schema
(
description
=
"社保缴纳地-省"
)
private
String
socialProvince
;
/**
* 社保缴纳地-市
*/
@ExcelAttribute
(
name
=
"社保缴纳地-市"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"社保缴纳地-市不能超过32个字符"
)
@ExcelProperty
(
"社保缴纳地-市"
)
@Schema
(
description
=
"社保缴纳地-市"
)
private
String
socialCity
;
/**
* 社保缴纳地-县
*/
@ExcelAttribute
(
name
=
"社保缴纳地-县"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"社保缴纳地-县不能超过32个字符"
)
@ExcelProperty
(
"社保缴纳地-县"
)
@Schema
(
description
=
"社保缴纳地-县"
)
private
String
socialTown
;
/**
* 项目名称
*/
@ExcelAttribute
(
name
=
"项目名称"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"项目名称不能超过50个字符"
)
@ExcelProperty
(
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
/**
* 项目编码
*/
@ExcelAttribute
(
name
=
"项目编码"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"项目编码不能超过50个字符"
)
@ExcelProperty
(
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
private
String
deptNo
;
/**
* 社保户名称
*/
@ExcelAttribute
(
name
=
"社保户名称"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"社保户名称不能超过50个字符"
)
@ExcelProperty
(
"社保户名称"
)
@Schema
(
description
=
"社保户名称"
)
private
String
socialHouseholdName
;
/**
* 入职确认信息主表id
*/
@ExcelAttribute
(
name
=
"入职确认信息主表id"
,
maxLength
=
36
)
@Length
(
max
=
36
,
message
=
"入职确认信息主表id不能超过36个字符"
)
@ExcelProperty
(
"入职确认信息主表id"
)
@Schema
(
description
=
"入职确认信息主表id"
)
private
String
registerId
;
/**
* 缴费政策类型 0-最低 1-自定义 2-最高
*/
private
String
paymentType
;
/**
* 社保状态
*/
private
String
socialStatus
;
/**
* 派单人
*/
@ExcelAttribute
(
name
=
"派单人"
,
maxLength
=
64
)
@Length
(
max
=
64
,
message
=
"派单人不能超过64个字符"
)
@ExcelProperty
(
"派单人"
)
@Schema
(
description
=
"派单人"
)
private
String
dispatchName
;
/**
* 派单时间
*/
@ExcelAttribute
(
name
=
"派单时间"
)
@ExcelProperty
(
"派单时间"
)
@Schema
(
description
=
"派单时间"
)
private
String
dispatchTime
;
}
yifu-archives/yifu-archives-biz/pom.xml
View file @
a56f26c5
...
...
@@ -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>
...
...
@@ -127,6 +139,12 @@
<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 @
a56f26c5
...
...
@@ -211,4 +211,5 @@ public class EmployeeRegistrationPreController {
public
R
<
EmployeeInfoMsgVo
>
getGzEmployeeInfo
(
@RequestBody
EmployeeInfoMsgVo
vo
)
{
return
employeeRegistrationPreService
.
getGzEmployeeInfo
(
vo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSocialPreDetailMapper.java
View file @
a56f26c5
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.
archives
.entity.TSocialPreDetail
;
import
com.yifu.cloud.plus.v1.yifu.
social
.entity.TSocialPreDetail
;
import
org.apache.ibatis.annotations.Mapper
;
/**
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
View file @
a56f26c5
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
common
.
dapr
.
util
;
import
com.alibaba.fastjson.JSON
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
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 +212,28 @@ 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
);
}
/**
* @Author huyc
* @Description 新增社保待购买信息
* @Date 9:22 2025/10/10
* @Param
* @return
**/
public
R
<
Boolean
>
saveSocialPreInfo
(
EmployeeRegistrationPreVo
preVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tdispatchinfopre/saveSocialPreInfo"
,
JSON
.
toJSONString
(
preVo
),
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 @
a56f26c5
...
...
@@ -634,6 +634,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,9 +699,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//生成合同待购买数据
initContractPreInfo
(
registration
,
preVo
.
getEmployeeContractPreVos
(),
user
,
domainR
.
getData
());
}
//服务类型包含社保购买时
if
(
preVo
.
getServerItem
().
contains
(
"社保购买"
)
&&
(
null
!=
preVo
.
getExitSocialInfoList
()
||
null
!=
preVo
.
getDispatchInfoPreVo
()))
{
//生成社保待购买或者已购买数据
initSocialPreInfo
(
registration
,
preVo
.
getDispatchInfoPreVo
(),
user
,
domainR
.
getData
());
socialDaprUtils
.
saveSocialPreInfo
(
preVo
);
}
}
}
catch
(
Exception
e
)
{
log
.
error
(
"执行异常"
,
e
);
log
.
error
(
"
自动化办理
执行异常"
,
e
);
}
return
R
.
ok
();
}
...
...
@@ -1636,6 +1660,29 @@ 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
.
setProcessStatus
(
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 @
a56f26c5
...
...
@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -12,6 +13,7 @@ import lombok.EqualsAndHashCode;
import
org.hibernate.validator.constraints.Length
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
/**
...
...
@@ -180,8 +182,7 @@ public class TDispatchInfoPre extends BaseEntity {
/**
* 入职日期
*/
@ExcelAttribute
(
name
=
"入职日期"
,
isDate
=
true
)
@ExcelProperty
(
"入职日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
@Schema
(
description
=
"入职日期"
)
private
Date
joinLeaveDate
;
/**
...
...
@@ -192,20 +193,25 @@ public class TDispatchInfoPre extends BaseEntity {
@ExcelProperty
(
"前端客服"
)
@Schema
(
description
=
"前端客服"
)
private
String
customerUsername
;
/**
* 前端客服登录名
*/
@ExcelAttribute
(
name
=
"前端客服登录名"
)
@Schema
(
description
=
"前端客服登录名"
)
@ExcelProperty
(
"前端客服登录名"
)
private
String
customerUserLoginName
;
/**
* 预计派单时间
*/
@ExcelAttribute
(
name
=
"预计派单时间"
,
isDate
=
true
)
@ExcelProperty
(
"预计派单时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+08:00"
)
@Schema
(
description
=
"预计派单时间"
)
private
Dat
e
expectedCollectionTime
;
private
LocalDateTim
e
expectedCollectionTime
;
/**
* 派单确认时间
*/
@ExcelAttribute
(
name
=
"派单确认时间"
,
isDate
=
true
)
@ExcelProperty
(
"派单确认时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+08:00"
)
@Schema
(
description
=
"派单确认时间"
)
private
Dat
e
expectedConfirmTime
;
private
LocalDateTim
e
expectedConfirmTime
;
/**
* 是否自动触发派增 0 是 1否
*/
...
...
yifu-
archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives
/entity/TSocialPreDetail.java
→
yifu-
social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social
/entity/TSocialPreDetail.java
View file @
a56f26c5
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
entity
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
...
...
@@ -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-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/UnSocialFundInfoVo.java
View file @
a56f26c5
...
...
@@ -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/TDispatchInfoPreController.java
View file @
a56f26c5
...
...
@@ -2,10 +2,12 @@ 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.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfoPre
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoPreService
;
...
...
@@ -140,4 +142,16 @@ public class TDispatchInfoPreController {
menuUtil
.
setAuthSql
(
user
,
searchVo
);
return
R
.
ok
(
tDispatchInfoPreService
.
getDispatchInfoCount
(
searchVo
));
}
/**
* 新增社保待购买
* @author huych
* @date 2025-10-10 9:26:35
**/
@Operation
(
description
=
"新增社保待购买"
)
@Inner
@PostMapping
(
"/saveSocialPreInfo"
)
public
Boolean
saveSocialPreInfo
(
@RequestBody
EmployeeRegistrationPreVo
preVo
)
{
return
tDispatchInfoPreService
.
saveSocialPreInfo
(
preVo
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialFundInfoController.java
View file @
a56f26c5
...
...
@@ -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 @
a56f26c5
...
...
@@ -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/mapper/TSocialPreDetailMapper.java
0 → 100644
View file @
a56f26c5
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialPreDetail
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* 入职确认信息社保已购买记录
*
* @author huych
* @date 2025-09-30 16:41:57
*/
@Mapper
public
interface
TSocialPreDetailMapper
extends
BaseMapper
<
TSocialPreDetail
>
{
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoPreService.java
View file @
a56f26c5
...
...
@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
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.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfoPre
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreSearchVo
;
...
...
@@ -46,4 +47,11 @@ public interface TDispatchInfoPreService extends IService<TDispatchInfoPre> {
* @return
*/
long
getDispatchInfoCount
(
TDispatchInfoPreSearchVo
searchVo
);
/**
* 新增社保待购买信息
* @param preVo
* @return
*/
Boolean
saveSocialPreInfo
(
EmployeeRegistrationPreVo
preVo
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFundInfoService.java
View file @
a56f26c5
...
...
@@ -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-
archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives
/service/TSocialPreDetailService.java
→
yifu-
social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social
/service/TSocialPreDetailService.java
View file @
a56f26c5
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.
archives
.entity.TSocialPreDetail
;
import
com.yifu.cloud.plus.v1.yifu.
social
.entity.TSocialPreDetail
;
/**
* 入职确认信息社保已购买记录
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
a56f26c5
...
...
@@ -8,22 +8,29 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TDispatchInfoPreVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainRegistListVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSocialPreDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants
;
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.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.LocalDateTimeUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfoPre
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialPreDetail
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchInfoPreMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoPreService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialPreDetailService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreExportVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreSearchVo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -31,6 +38,7 @@ import javax.servlet.ServletOutputStream;
import
javax.servlet.http.HttpServletResponse
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
/**
...
...
@@ -47,6 +55,8 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
@Autowired
private
ArchivesDaprUtil
archivesDaprUtil
;
private
final
TSocialPreDetailService
socialPreDetailService
;
/**
* 社保待购买表简单分页查询
* @param tDispatchInfoPre 社保待购买表
...
...
@@ -135,6 +145,64 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
return
baseMapper
.
selectExportCount
(
searchVo
);
}
@Override
public
Boolean
saveSocialPreInfo
(
EmployeeRegistrationPreVo
registrationPreVo
)
{
if
(
Common
.
isNotNull
(
registrationPreVo
.
getSocialIsBuy
())
&&
registrationPreVo
.
getSocialIsBuy
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
registrationPreVo
.
getExitSocialInfoList
().
isEmpty
())
{
//删除已存在的入职确认信息对应的社保明细
socialPreDetailService
.
remove
(
Wrappers
.<
TSocialPreDetail
>
lambdaQuery
()
.
eq
(
TSocialPreDetail:
:
getRegisterId
,
registrationPreVo
.
getExitSocialInfoList
()
.
get
(
0
).
getRegisterId
()));
//批量新增
for
(
TSocialPreDetailVo
vo
:
registrationPreVo
.
getExitSocialInfoList
())
{
TSocialPreDetail
preDetal
=
new
TSocialPreDetail
();
BeanUtils
.
copyProperties
(
vo
,
preDetal
);
socialPreDetailService
.
save
(
preDetal
);
}
//批量删除社保待购买列表中的待确认、待派单、派单失败、审核、办理失败的数据
baseMapper
.
delete
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
().
in
(
TDispatchInfoPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"2"
,
"4"
,
"8"
))
.
eq
(
TDispatchInfoPre:
:
getRegisterId
,
registrationPreVo
.
getExitSocialInfoList
()
.
get
(
0
).
getRegisterId
()));
}
else
{
TDispatchInfoPreVo
preVo
=
registrationPreVo
.
getDispatchInfoPreVo
();
if
(
null
!=
preVo
)
{
try
{
//删除已存在的入职确认信息对应的社保明细
socialPreDetailService
.
remove
(
Wrappers
.<
TSocialPreDetail
>
lambdaQuery
()
.
eq
(
TSocialPreDetail:
:
getRegisterId
,
preVo
.
getRegisterId
()));
//判断是否存在社保待购买信息
TDispatchInfoPre
preExit
=
baseMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
.
eq
(
TDispatchInfoPre:
:
getRegisterId
,
preVo
.
getRegisterId
())
.
eq
(
TDispatchInfoPre:
:
getEmpIdcard
,
preVo
.
getEmpIdcard
())
.
in
(
TDispatchInfoPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"2"
,
"4"
,
"8"
))
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
TDispatchInfoPre
pre
=
new
TDispatchInfoPre
();
BeanUtils
.
copyProperties
(
preVo
,
pre
);
//时间格式转化
if
(
Common
.
isNotNull
(
preVo
.
getExpectedCollectionTime
()))
{
pre
.
setExpectedCollectionTime
(
LocalDateTimeUtils
.
dateToLocalDateTime
(
preVo
.
getExpectedCollectionTime
()));
}
if
(
Common
.
isNotNull
(
preVo
.
getExpectedConfirmTime
()))
{
pre
.
setExpectedConfirmTime
(
LocalDateTimeUtils
.
dateToLocalDateTime
(
preVo
.
getExpectedConfirmTime
()));
}
if
(
Common
.
isNotNull
(
preExit
))
{
pre
.
setId
(
preExit
.
getId
());
baseMapper
.
deleteById
(
preExit
);
baseMapper
.
insert
(
pre
);
}
else
{
baseMapper
.
insert
(
pre
);
}
}
catch
(
Exception
e
)
{
log
.
error
(
"执行异常"
,
e
);
return
false
;
}
}
}
return
true
;
}
/**
* @Description: 获取前端客服的所有项目权限
* @Author: huych
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @
a56f26c5
...
...
@@ -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-
archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives
/service/impl/TSocialPreDetailServiceImpl.java
→
yifu-
social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social
/service/impl/TSocialPreDetailServiceImpl.java
View file @
a56f26c5
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
.
impl
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.
archives
.entity.TSocialPreDetail
;
import
com.yifu.cloud.plus.v1.yifu.
archives
.mapper.TSocialPreDetailMapper
;
import
com.yifu.cloud.plus.v1.yifu.
archives
.service.TSocialPreDetailService
;
import
com.yifu.cloud.plus.v1.yifu.
social
.entity.TSocialPreDetail
;
import
com.yifu.cloud.plus.v1.yifu.
social
.mapper.TSocialPreDetailMapper
;
import
com.yifu.cloud.plus.v1.yifu.
social
.service.TSocialPreDetailService
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
a56f26c5
...
...
@@ -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 @
a56f26c5
...
...
@@ -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>
yifu-
archives/yifu-archives
-biz/src/main/resources/mapper/TSocialPreDetailMapper.xml
→
yifu-
social/yifu-social
-biz/src/main/resources/mapper/TSocialPreDetailMapper.xml
View file @
a56f26c5
...
...
@@ -2,9 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.
archives
.mapper.TSocialPreDetailMapper"
>
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.
social
.mapper.TSocialPreDetailMapper"
>
<resultMap
id=
"tSocialPreDetailMap"
type=
"com.yifu.cloud.plus.v1.yifu.
archives
.entity.TSocialPreDetail"
>
<resultMap
id=
"tSocialPreDetailMap"
type=
"com.yifu.cloud.plus.v1.yifu.
social
.entity.TSocialPreDetail"
>
<id
property=
"id"
column=
"ID"
/>
<result
property=
"socialProvince"
column=
"SOCIAL_PROVINCE"
/>
<result
property=
"socialCity"
column=
"SOCIAL_CITY"
/>
...
...
@@ -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>
...
...
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