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
35aa21f5
Commit
35aa21f5
authored
Jun 28, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5
parents
e77598fc
83c8de2a
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
73 additions
and
26 deletions
+73
-26
FeedBackDetail.java
...fu/cloud/plus/v1/yifu/archives/entity/FeedBackDetail.java
+10
-0
TEmpContractAlert.java
...cloud/plus/v1/yifu/archives/entity/TEmpContractAlert.java
+4
-0
ChangeFeedBackAllVo.java
...u/cloud/plus/v1/yifu/archives/vo/ChangeFeedBackAllVo.java
+3
-0
TEmpContractAlertController.java
...yifu/archives/controller/TEmpContractAlertController.java
+3
-3
FeedBackDetailMapper.java
...ud/plus/v1/yifu/archives/mapper/FeedBackDetailMapper.java
+4
-1
TEmpContractAlertMapper.java
...plus/v1/yifu/archives/mapper/TEmpContractAlertMapper.java
+1
-0
TEmpContractAlertService.java
...us/v1/yifu/archives/service/TEmpContractAlertService.java
+1
-1
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+19
-4
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+8
-5
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+1
-1
FeedBackDetailMapper.xml
...es-biz/src/main/resources/mapper/FeedBackDetailMapper.xml
+14
-1
TEmpContractAlertMapper.xml
...biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
+2
-2
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+1
-7
TDispatchImportVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
+2
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FeedBackDetail.java
View file @
35aa21f5
...
...
@@ -49,5 +49,15 @@ public class FeedBackDetail implements Serializable {
@Schema
(
description
=
"续签代办表关联主键"
)
private
String
contractAlertId
;
/**
* 续签代办表关联主键
*/
@Schema
(
description
=
"申请编号"
)
private
String
applyNo
;
@Schema
(
description
=
"是否反馈"
)
private
Integer
isFeedback
;
private
static
final
long
serialVersionUID
=
1L
;
}
\ No newline at end of file
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpContractAlert.java
View file @
35aa21f5
...
...
@@ -320,4 +320,8 @@ public class TEmpContractAlert extends BaseEntity {
*/
@TableField
(
exist
=
false
)
private
Date
auditTime
;
@Schema
(
description
=
"申请编码"
)
private
String
applyNo
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ChangeFeedBackAllVo.java
View file @
35aa21f5
...
...
@@ -47,4 +47,7 @@ public class ChangeFeedBackAllVo {
@Schema
(
description
=
"反馈时间"
)
private
Date
feedbackTime
;
@Schema
(
description
=
"申请编号"
)
private
String
applyNo
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpContractAlertController.java
View file @
35aa21f5
...
...
@@ -196,9 +196,9 @@ public class TEmpContractAlertController {
* @return {@link R}
*/
@Operation
(
summary
=
"获取反馈日志详情"
,
description
=
"获取反馈日志详情"
)
@GetMapping
(
"/getFeedbackDetail/{
id
}"
)
public
R
getFeedbackDetail
(
@PathVariable
(
"
id"
)
String
id
)
{
return
R
.
ok
(
tEmpContractAlertService
.
getFeedbackDetail
(
id
));
@GetMapping
(
"/getFeedbackDetail/{
applyNo
}"
)
public
R
getFeedbackDetail
(
@PathVariable
(
"
applyNo"
)
String
applyNo
)
{
return
R
.
ok
(
tEmpContractAlertService
.
getFeedbackDetail
(
applyNo
));
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/FeedBackDetailMapper.java
View file @
35aa21f5
...
...
@@ -11,6 +11,9 @@ import java.util.List;
@Mapper
public
interface
FeedBackDetailMapper
extends
BaseMapper
<
FeedBackDetail
>
{
List
<
FeedBackDetail
>
getDetail
(
@Param
(
"
id"
)
String
id
);
List
<
FeedBackDetail
>
getDetail
(
@Param
(
"
applyNo"
)
String
applyNo
);
List
<
FeedBackDetail
>
getAll
();
FeedBackDetail
findByApplyNo
(
@Param
(
"applyNo"
)
String
applyNo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmpContractAlertMapper.java
View file @
35aa21f5
...
...
@@ -35,4 +35,5 @@ public interface TEmpContractAlertMapper extends BaseMapper<TEmpContractAlert> {
void
truncate
();
boolean
changeFeedBackAll
(
@Param
(
"changeFeedBackAllVo"
)
ChangeFeedBackAllVo
changeFeedBackAllVo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpContractAlertService.java
View file @
35aa21f5
...
...
@@ -54,7 +54,7 @@ public interface TEmpContractAlertService extends IService<TEmpContractAlert> {
boolean
changeFeedBackAll
(
ChangeFeedBackAllVo
changeFeedBackAllVo
);
List
<
FeedBackDetail
>
getFeedbackDetail
(
String
id
);
List
<
FeedBackDetail
>
getFeedbackDetail
(
String
applyNo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
35aa21f5
...
...
@@ -365,12 +365,26 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
}
else
{
alert
.
setFirstAlertTime
(
new
Date
());
}
List
<
FeedBackDetail
>
list
=
feedbackDetailMapper
.
getAll
();
for
(
FeedBackDetail
feedBackDetail
:
list
)
{
FeedBackDetail
feedBackDetail1
=
feedbackDetailMapper
.
findByApplyNo
(
feedBackDetail
.
getApplyNo
());
if
(
null
!=
feedbackDetailMapper
.
findByApplyNo
(
contract
.
getApplyNo
())){
alert
.
setIsFeedback
(
feedBackDetail1
.
getIsFeedback
());
alert
.
setFeedbackDetail
(
feedBackDetail1
.
getFeedbackDetail
());
alert
.
setFeedbackReason
(
feedBackDetail1
.
getFeedbackReason
());
alert
.
setFeedbackPerson
(
feedBackDetail1
.
getFeedbackPerson
());
alert
.
setFeedbackTime
(
feedBackDetail1
.
getFeedbackTime
());
}
else
{
alert
.
setIsFeedback
(
CommonConstants
.
ZERO_INT
);
}
}
alert
.
setApplyNo
(
contract
.
getApplyNo
());
// 2023-4-3 09:38:21 hgw 添加
alert
.
setUnitId
(
contract
.
getCustomerId
());
alert
.
setUnitName
(
contract
.
getSubjectUnit
());
alert
.
setUnitNo
(
contract
.
getUnitNo
());
alert
.
setEmpPhone
(
employeeInfo
.
getEmpPhone
());
alert
.
setCreateBy
(
contract
.
getCreateBy
());
alert
.
setCreateName
(
contract
.
getCreateName
());
alert
.
setContractId
(
contract
.
getId
());
...
...
@@ -418,9 +432,10 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
FeedBackDetail
feedbackDetail
=
new
FeedBackDetail
();
feedbackDetail
.
setFeedbackPerson
(
user
.
getNickname
());
feedbackDetail
.
setFeedbackTime
(
DateTime
.
now
());
feedbackDetail
.
set
ContractAlertId
(
changeFeedBackAllVo
.
getIds
()[
i
]);
feedbackDetail
.
set
ApplyNo
(
changeFeedBackAllVo
.
getIds
()[
i
]);
feedbackDetail
.
setFeedbackReason
(
changeFeedBackAllVo
.
getFeedbackReason
());
feedbackDetail
.
setFeedbackDetail
(
changeFeedBackAllVo
.
getFeedbackDetail
());
feedbackDetail
.
setIsFeedback
(
CommonConstants
.
ONE_INT
);
feedbackDetailMapper
.
insert
(
feedbackDetail
);
}
changeFeedBackAllVo
.
setIsFeedback
(
CommonConstants
.
ONE_INTEGER
);
...
...
@@ -430,8 +445,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
}
@Override
public
List
<
FeedBackDetail
>
getFeedbackDetail
(
String
id
)
{
return
feedbackDetailMapper
.
getDetail
(
id
);
public
List
<
FeedBackDetail
>
getFeedbackDetail
(
String
applyNo
)
{
return
feedbackDetailMapper
.
getDetail
(
applyNo
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
35aa21f5
...
...
@@ -489,6 +489,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
this
.
judgeAuditStatus
(
tEmployeeContractInfo
,
user
);
baseMapper
.
updateById
(
tEmployeeContractInfo
);
//如果是否同步终止合同、减项、减档为是则生成同步任务处理清单
//增加任务处理情况查询表数据
...
...
@@ -515,6 +516,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
this
.
updateFileMainId
(
tEmployeeContractInfo
);
}
}
else
{
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
this
.
judgeAuditStatus
(
tEmployeeContractInfo
,
user
);
baseMapper
.
updateById
(
tEmployeeContractInfo
);
}
...
...
@@ -1648,10 +1651,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TEmployeeProject
tEmployeeProjectOld
=
tEmployeeProjectService
.
getById
(
tEmployeeProject
.
getId
());
tEmployeeProject
.
setContractStatus
(
CommonConstants
.
TWO_INT
);
//如果该项目仍有社保、公积金的数据不同步减项,如正常减项,记录项目档案操作记录
if
(
tEmployeeProject
.
getSocialStatus
()
==
CommonConstants
.
ZERO_INT
||
tEmployeeProject
.
getSocialStatus
()
==
CommonConstants
.
FOUR_INT
||
tEmployeeProject
.
getFundStatus
()
==
CommonConstants
.
ZERO_INT
||
tEmployeeProject
.
getFundStatus
()
==
CommonConstants
.
FOUR_INT
)
{
if
(
(
tEmployeeProject
.
getSocialStatus
()
==
CommonConstants
.
ZERO_INT
||
tEmployeeProject
.
getSocialStatus
()
==
CommonConstants
.
FOUR_INT
)
&&
(
tEmployeeProject
.
getFundStatus
()
==
CommonConstants
.
ZERO_INT
||
tEmployeeProject
.
getFundStatus
()
==
CommonConstants
.
THREE_INT
)
)
{
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
ONE_INT
);
tEmployeeProject
.
setLeaveRemark
(
"终止合同联动减项"
);
tEmployeeProject
.
setLeaveTime
(
LocalDateTime
.
now
());
...
...
@@ -1915,7 +1918,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
((
tEmployeeProject
.
getSocialStatus
()
==
CommonConstants
.
ZERO_INT
||
tEmployeeProject
.
getSocialStatus
()
==
CommonConstants
.
FOUR_INT
)
&&
(
tEmployeeProject
.
getFundStatus
()
==
CommonConstants
.
ZERO_INT
||
tEmployeeProject
.
getFundStatus
()
==
CommonConstants
.
FOUR
_INT
))
{
||
tEmployeeProject
.
getFundStatus
()
==
CommonConstants
.
THREE
_INT
))
{
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
ONE_INT
);
tEmployeeProject
.
setLeaveRemark
(
"终止合同联动减项"
);
tEmployeeProject
.
setLeaveTime
(
LocalDateTime
.
now
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
35aa21f5
...
...
@@ -1439,7 +1439,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
((
tEmployeeProject
.
getSocialStatus
()
==
CommonConstants
.
ZERO_INT
||
tEmployeeProject
.
getSocialStatus
()
==
CommonConstants
.
FOUR_INT
)
&&
(
tEmployeeProject
.
getFundStatus
()
==
CommonConstants
.
ZERO_INT
||
tEmployeeProject
.
getFundStatus
()
==
CommonConstants
.
FOUR
_INT
))
{
||
tEmployeeProject
.
getFundStatus
()
==
CommonConstants
.
THREE
_INT
))
{
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
ONE_INT
);
tEmployeeProject
.
setLeaveRemark
(
"终止合同联动减项"
);
tEmployeeProject
.
setLeaveTime
(
LocalDateTime
.
now
());
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/FeedBackDetailMapper.xml
View file @
35aa21f5
...
...
@@ -7,6 +7,8 @@
<result
column=
"FEEDBACK_TIME"
jdbcType=
"TIMESTAMP"
property=
"feedbackTime"
/>
<result
column=
"FEEDBACK_REASON"
jdbcType=
"VARCHAR"
property=
"feedbackReason"
/>
<result
column=
"FEEDBACK_DETAIL"
jdbcType=
"VARCHAR"
property=
"feedbackDetail"
/>
<result
column=
"APPLY_NO"
jdbcType=
"VARCHAR"
property=
"applyNo"
/>
<result
column=
"IS_FEEDBACK"
jdbcType=
"VARCHAR"
property=
"isFeedback"
/>
<result
column=
"CONTRACT_ALERT_ID"
jdbcType=
"VARCHAR"
property=
"contractAlertId"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -16,7 +18,18 @@
<select
id=
"getDetail"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.entity.FeedBackDetail"
>
SELECT *
FROM feed_back_detail a
where a.
CONTRACT_ALERT_ID=#{id
}
where a.
APPLY_NO=#{applyNo
}
order by FEEDBACK_TIME DESC
</select>
<select
id=
"getAll"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.entity.FeedBackDetail"
>
SELECT *
FROM feed_back_detail a
</select>
<select
id=
"findByApplyNo"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.entity.FeedBackDetail"
>
SELECT *
FROM feed_back_detail a
where a.APPLY_NO=#{applyNo}
ORDER BY FEEDBACK_TIME desc LIMIT 1
</select>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
View file @
35aa21f5
...
...
@@ -54,6 +54,7 @@
<result
property=
"feedbackReason"
column=
"FEEDBACK_REASON"
/>
<result
property=
"feedbackDetail"
column=
"FEEDBACK_DATAIL"
/>
<result
property=
"contractId"
column=
"CONTRACT_ID"
/>
<result
property=
"applyNo"
column=
"APPLY_NO"
/>
</resultMap>
...
...
@@ -65,11 +66,10 @@
update t_emp_contract_alert a
set a.IS_FEEDBACK=#{changeFeedBackAllVo.isFeedback},a.FEEDBACK_REASON=#{changeFeedBackAllVo.feedbackReason},a.FEEDBACK_DETAIL=#{changeFeedBackAllVo.feedbackDetail},
a.FEEDBACK_PERSON=#{changeFeedBackAllVo.feedbackPerson},a.FEEDBACK_TIME=#{changeFeedBackAllVo.feedbackTime}
where a.
ID
in
where a.
APPLY_NO
in
<foreach
item=
"idStr"
index=
"index"
collection=
"changeFeedBackAllVo.ids"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</update>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
35aa21f5
...
...
@@ -653,16 +653,12 @@
a.LEAVE_DATE,
a.CONTRACT_NO,
a.REDUCE_REASON,
b.AUDIT_STATUS,
b.REMARK
FROM t_employee_contract_info a
join t_employee_contract_audit b on a.ID=b.LINK_ID
left join (select REMARK,LINK_ID from t_employee_contract_audit where ROOT_NAME='合同审核') b on a.ID=b.LINK_ID
<where>
a.DELETE_FLAG = 0
and b.ROOT_NAME='合同审核'
<include
refid=
"tEmployeeContractInfo_where"
/>
<if
test=
"tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"
>
${tEmployeeContractInfo.authSql}
...
...
@@ -680,10 +676,8 @@
SELECT
count(1)
FROM t_employee_contract_info a
join t_employee_contract_audit b on a.ID=b.LINK_ID
<where>
a.DELETE_FLAG = 0
and b.ROOT_NAME='合同审核'
<include
refid=
"tEmployeeContractInfo_where"
/>
<if
test=
"tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"
>
${tEmployeeContractInfo.authSql}
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @
35aa21f5
...
...
@@ -150,7 +150,8 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/**
* 通信地址
*/
@Length
(
max
=
200
,
message
=
"通信地址不能超过200个字符"
)
@ExcelAttribute
(
name
=
"通信地址"
,
maxLength
=
200
)
@Schema
(
description
=
"通信地址"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址"
)
...
...
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