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
86926cce
Commit
86926cce
authored
Oct 30, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
fdc556a6
9ef521e5
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
13 deletions
+25
-13
MessageTempleteVo.java
...ifu/cloud/plus/v1/yifu/archives/vo/MessageTempleteVo.java
+2
-0
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+2
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+2
-2
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+0
-3
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+1
-2
EmployeeRegistrationPreMapper.xml
...c/main/resources/mapper/EmployeeRegistrationPreMapper.xml
+2
-1
RlySmsUtil.java
.../yifu/cloud/plus/v1/yifu/common/core/util/RlySmsUtil.java
+16
-5
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/MessageTempleteVo.java
View file @
86926cce
...
...
@@ -16,4 +16,6 @@ public class MessageTempleteVo implements Serializable {
String
signName
;
// 模版编号
String
templeteCode
;
// 应用AppId
String
appId
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
86926cce
...
...
@@ -236,6 +236,8 @@ public class TEmployeeContractPreController {
.
or
()
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
TWO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
.
or
()
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
FOUR_INT
)
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
));
return
R
.
ok
(
employeeContractInfo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
86926cce
...
...
@@ -1226,7 +1226,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
t
=
new
String
[
1
][
3
];
// 创建正确大小的二维数组
t
[
0
]=
paramsDetail
;
//调用RlySmsUtil的sendBatchSms方法
sendResult
=
rlySmsUtil
.
sendBatchSms
(
phonesArr
,
templeteVo
.
getTempleteCode
(),
t
);
sendResult
=
rlySmsUtil
.
sendBatchSms
(
phonesArr
,
templeteVo
.
getTempleteCode
(),
t
,
templeteVo
.
getAppId
()
);
handleSmsRes
(
sendResult
,
errorList
,
updatePre
,
smsEmployee
);
}
...
...
@@ -1277,7 +1277,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
t
=
new
String
[
1
][
3
];
// 创建正确大小的二维数组
t
[
0
]=
paramsDetail
;
//调用RlySmsUtil的sendBatchSms方法
sendResult
=
rlySmsUtil
.
sendBatchSms
(
phonesArr
,
templeteVo
.
getTempleteCode
(),
t
);
sendResult
=
rlySmsUtil
.
sendBatchSms
(
phonesArr
,
templeteVo
.
getTempleteCode
(),
t
,
templeteVo
.
getAppId
()
);
handleSmsRes
(
sendResult
,
errorList
,
updatePre
,
smsEmployee
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
86926cce
...
...
@@ -562,9 +562,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre
.
setErrorInfo
(
""
);
contractPre
.
setErrorTime
(
null
);
contractPreMapper
.
updateById
(
contractPre
);
if
(
"0"
.
equals
(
contractPre
.
getSignType
()))
{
tEmployeeContractInfo
.
setAuditStatus
(
CommonConstants
.
FOUR_INT
);
}
}
}
// 瓜子项目编码:皖A694302
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
86926cce
...
...
@@ -300,7 +300,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
Map
<
String
,
String
>
loginNameMap
=
new
HashMap
<>();
//发起派单
List
<
ErrorMessage
>
errorMessageListAll
=
new
ArrayList
<>();
List
<
EmployeeContractVO
>
excelVOList
=
baseMapper
.
getDisPatcherContractList
(
idList
,
CommonConstants
.
socialInfoStatus
,
type
);
List
<
EmployeeContractVO
>
excelVOList
=
baseMapper
.
getDisPatcherContractList
(
idList
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"11"
)
,
type
);
// 拆分电子签和线下签
List
<
EmployeeContractVO
>
electronicSignList
=
new
ArrayList
<>();
...
...
@@ -388,7 +388,6 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
List
<
EmployeeContractVO
>
singleContractList
=
new
ArrayList
<>();
singleContractList
.
add
(
contractVO
);
List
<
ErrorMessage
>
singleErrorMessageList
=
new
ArrayList
<>();
// 调用合同导入方法
contractInfoService
.
importContract
(
singleContractList
,
singleErrorMessageList
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/EmployeeRegistrationPreMapper.xml
View file @
86926cce
...
...
@@ -275,7 +275,8 @@
<select
id=
"selectTempleteVo"
resultMap=
"messageTempleteVoMap"
>
SELECT
a.model_code,
a.sign_name
a.sign_name,
a.APP_ID
from t_message_templete a
where id = #{id}
</select>
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/RlySmsUtil.java
View file @
86926cce
...
...
@@ -35,9 +35,10 @@ public class RlySmsUtil {
// 主账号令牌
private
String
accountToken
=
"5487aa42bb574b47aca1c785b4e7c018"
;
// 应用ID
// 应用ID
-生产
private
String
appId
=
"2c94811c9787a27f019854cd1b532b7e"
;
/**
* 初始化SDK
*
...
...
@@ -65,10 +66,15 @@ public class RlySmsUtil {
* @param phoneNumber 手机号码
* @param templateId 模板ID
* @param datas 短信参数
* @param appIdTemp 应用ID 有配置的话,则使用配置的appId
* @return 发送结果 true-成功 false-失败
*/
public
boolean
sendSingleSms
(
String
phoneNumber
,
String
templateId
,
String
[]
datas
)
{
init
(
accountSId
,
accountToken
,
appId
);
public
boolean
sendSingleSms
(
String
phoneNumber
,
String
templateId
,
String
[]
datas
,
String
appIdTemp
)
{
if
(
Common
.
isNotNull
(
appIdTemp
)){
init
(
accountSId
,
accountToken
,
appIdTemp
);
}
else
{
init
(
accountSId
,
accountToken
,
appId
);
}
HashMap
<
String
,
Object
>
result
=
sdk
.
sendTemplateSMS
(
phoneNumber
,
templateId
,
datas
);
if
(
"000000"
.
equals
(
result
.
get
(
"statusCode"
)))
{
...
...
@@ -92,10 +98,15 @@ public class RlySmsUtil {
* @param phoneNumbers 手机号码数组
* @param templateId 模板ID
* @param datas 短信参数
* @param appIdTemp 应用ID 有配置的话,则使用配置的appId
* @return 发送结果 true-成功 false-失败
*/
public
HashMap
<
String
,
Object
>
sendBatchSms
(
String
[]
phoneNumbers
,
String
templateId
,
String
[][]
datas
)
{
init
(
accountSId
,
accountToken
,
appId
);
public
HashMap
<
String
,
Object
>
sendBatchSms
(
String
[]
phoneNumbers
,
String
templateId
,
String
[][]
datas
,
String
appIdTemp
)
{
if
(
Common
.
isNotNull
(
appIdTemp
)){
init
(
accountSId
,
accountToken
,
appIdTemp
);
}
else
{
init
(
accountSId
,
accountToken
,
appId
);
}
// 将手机号数组转换为逗号分隔的字符串
StringBuilder
phoneNumbersStr
=
new
StringBuilder
();
for
(
int
i
=
0
;
i
<
phoneNumbers
.
length
;
i
++)
{
...
...
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