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
36975467
Commit
36975467
authored
Jun 25, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 瓜子代码调整
parent
35f3cbf9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
11 deletions
+15
-11
LGuaziOfferRecordServiceImpl.java
...u/archives/service/impl/LGuaziOfferRecordServiceImpl.java
+4
-9
TGzOfferInfoServiceImpl.java
...1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
+10
-2
application.yml
yifu-upms/yifu-upms-biz/src/main/resources/application.yml
+1
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/LGuaziOfferRecordServiceImpl.java
View file @
36975467
...
@@ -143,13 +143,13 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM
...
@@ -143,13 +143,13 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM
// 发送短信
// 发送短信
switch
(
lGuaziOfferRecordVo
.
getRecordFrom
())
{
switch
(
lGuaziOfferRecordVo
.
getRecordFrom
())
{
case
CommonConstants
.
THREE_STRING
:
case
CommonConstants
.
THREE_STRING
:
sendFrom
=
"
发送
Offer查阅短信"
;
sendFrom
=
"Offer查阅短信"
;
break
;
break
;
case
CommonConstants
.
FOUR_STRING
:
case
CommonConstants
.
FOUR_STRING
:
sendFrom
=
"
发送
信息收集短信"
;
sendFrom
=
"信息收集短信"
;
break
;
break
;
default
:
default
:
sendFrom
=
"
发送
合同下载短信"
;
sendFrom
=
"合同下载短信"
;
break
;
break
;
}
}
content
=
MessageFormat
.
format
(
sendSmsTemplate
,
sendFrom
,
sendSmsRes
);
content
=
MessageFormat
.
format
(
sendSmsTemplate
,
sendFrom
,
sendSmsRes
);
...
@@ -163,12 +163,7 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM
...
@@ -163,12 +163,7 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM
if
(
changeArr
.
size
()
!=
2
){
if
(
changeArr
.
size
()
!=
2
){
continue
;
continue
;
}
}
if
(
Common
.
isEmpty
(
this
.
getStatusLabel
(
changeArr
.
get
(
0
)))
String
fieldChangeContent
=
fieldZhName
+
":由"
+
changeArr
.
get
(
0
)+
"更新为"
+
changeArr
.
get
(
1
)+
";"
;
||
Common
.
isEmpty
(
this
.
getStatusLabel
(
changeArr
.
get
(
1
)))){
continue
;
}
String
fieldChangeContent
=
fieldZhName
+
":由"
+
changeArr
.
get
(
0
)+
"更新为"
+
changeArr
.
get
(
1
)+
";"
;
content
=
content
+
fieldChangeContent
;
content
=
content
+
fieldChangeContent
;
}
}
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
View file @
36975467
...
@@ -97,6 +97,9 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -97,6 +97,9 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
// 当前Offer更新状态,无法再发起更新:5:拒绝Offer、10:取消offer、8:合同审核通过、99:已归档
// 当前Offer更新状态,无法再发起更新:5:拒绝Offer、10:取消offer、8:合同审核通过、99:已归档
private
final
String
[]
failStatusArr
=
{
"5"
,
"10"
,
"8"
,
"99"
};
private
final
String
[]
failStatusArr
=
{
"5"
,
"10"
,
"8"
,
"99"
};
// 当前Offer更新状态,允许编辑:3:待发送Offer,4:待接受Offer
private
final
String
[]
allowUpdateArr
=
{
"3"
,
"4"
};
private
final
TGzEmpInfoService
tGzEmpInfoService
;
private
final
TGzEmpInfoService
tGzEmpInfoService
;
/**
/**
...
@@ -152,6 +155,11 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -152,6 +155,11 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
if
(
Common
.
isEmpty
(
findInfo
))
{
if
(
Common
.
isEmpty
(
findInfo
))
{
return
R
.
failed
(
CommonConstants
.
ERROR_NO_DOMAIN
);
return
R
.
failed
(
CommonConstants
.
ERROR_NO_DOMAIN
);
}
}
// 判断当前Offer更新状态,是否可以编辑
if
(!
ArrayUtils
.
contains
(
allowUpdateArr
,
findInfo
.
getOfferStatus
()))
{
return
R
.
failed
(
"当前Offer状态,禁止编辑"
);
}
tGzOfferInfo
.
setUpdateBy
(
user
.
getId
());
tGzOfferInfo
.
setUpdateBy
(
user
.
getId
());
tGzOfferInfo
.
setUpdateTime
(
LocalDateTime
.
now
());
tGzOfferInfo
.
setUpdateTime
(
LocalDateTime
.
now
());
...
@@ -160,13 +168,13 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -160,13 +168,13 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
// 记录offer操作日志
// 记录offer操作日志
LGuaziOfferRecordVo
lGuaziOfferRecordVo
=
new
LGuaziOfferRecordVo
();
LGuaziOfferRecordVo
lGuaziOfferRecordVo
=
new
LGuaziOfferRecordVo
();
Map
<
String
,
List
<
String
>>
changeInfoMap
=
new
HashMap
<>();
Map
<
String
,
List
<
String
>>
changeInfoMap
=
new
HashMap
<>();
if
(!
tGzOfferInfo
.
getPhone
().
equals
(
findInfo
.
getPhone
())){
if
(
Common
.
isNotNull
(
tGzOfferInfo
.
getPhone
())
&&
!
tGzOfferInfo
.
getPhone
().
equals
(
findInfo
.
getPhone
())){
List
<
String
>
valueList
=
new
ArrayList
<>();
List
<
String
>
valueList
=
new
ArrayList
<>();
valueList
.
add
(
findInfo
.
getPhone
());
valueList
.
add
(
findInfo
.
getPhone
());
valueList
.
add
(
tGzOfferInfo
.
getPhone
());
valueList
.
add
(
tGzOfferInfo
.
getPhone
());
changeInfoMap
.
put
(
"个人手机号"
,
valueList
);
changeInfoMap
.
put
(
"个人手机号"
,
valueList
);
}
}
if
(!
tGzOfferInfo
.
getEmail
().
equals
(
findInfo
.
getEmail
())){
if
(
Common
.
isNotNull
(
tGzOfferInfo
.
getEmail
())
&&
!
tGzOfferInfo
.
getEmail
().
equals
(
findInfo
.
getEmail
())){
List
<
String
>
valueList
=
new
ArrayList
<>();
List
<
String
>
valueList
=
new
ArrayList
<>();
valueList
.
add
(
findInfo
.
getEmail
());
valueList
.
add
(
findInfo
.
getEmail
());
valueList
.
add
(
tGzOfferInfo
.
getEmail
());
valueList
.
add
(
tGzOfferInfo
.
getEmail
());
...
...
yifu-upms/yifu-upms-biz/src/main/resources/application.yml
View file @
36975467
...
@@ -45,6 +45,7 @@ security:
...
@@ -45,6 +45,7 @@ security:
-
/sysguazibankbranch/page
-
/sysguazibankbranch/page
-
/sysoutempforminfo/configList
-
/sysoutempforminfo/configList
-
/dict/getDictMapByClientId
-
/dict/getDictMapByClientId
-
/sysoutreldictitem/inner/getDictMap
...
...
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