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
002e6b8d
Commit
002e6b8d
authored
Oct 30, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
8f8c40a7
f5559e52
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
8 deletions
+37
-8
FascController.java
...loud/plus/v1/yifu/archives/controller/FascController.java
+9
-0
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+19
-2
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+5
-2
application-prd.yml
.../yifu-archives-biz/src/main/resources/application-prd.yml
+4
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FascController.java
View file @
002e6b8d
...
...
@@ -185,6 +185,15 @@ public class FascController {
String
signTaskId
=
jsonObject
.
getString
(
"signTaskId"
);
// 原因
String
terminationNote
=
jsonObject
.
getString
(
"terminationNote"
);
if
(
Common
.
isEmpty
(
terminationNote
))
{
terminationNote
=
jsonObject
.
getString
(
"signRejectReason"
);
}
if
(
Common
.
isEmpty
(
terminationNote
))
{
terminationNote
=
jsonObject
.
getString
(
"fillRejectReason"
);
}
if
(
Common
.
isEmpty
(
terminationNote
))
{
terminationNote
=
jsonObject
.
getString
(
"signFailedReason"
);
}
// 操作人
//String userName = jsonObject.getString("userName")
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
002e6b8d
...
...
@@ -1371,9 +1371,26 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
try
{
// 添加了异常处理,避免 recordBase 不是合法数字格式时程序崩溃
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
rel
.
getPaymentType
())){
if
(
BigDecimal
.
valueOf
(
Double
.
valueOf
(
rel
.
getRecordBase
())).
compareTo
(
setInfo
.
getLowerLimit
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerLimit
());
BigDecimal
recordBaseDecimal
=
new
BigDecimal
(
rel
.
getRecordBase
());
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
setInfo
.
getIsSameBase
())){
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerLimit
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerLimit
());
}
}
else
{
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerPersion
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerPersion
());
}
else
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerMedical
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerMedical
());
}
else
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerBirth
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerBirth
());
}
else
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerInjury
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerInjury
());
}
else
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerUnemployment
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerUnemployment
());
}
}
}
}
catch
(
NumberFormatException
e
)
{
return
R
.
failed
(
"备案基数格式不正确"
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
002e6b8d
...
...
@@ -615,12 +615,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
if
(
Common
.
isNotNull
(
pre
.
getSignType
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
pre
.
getSignType
())
&&
Common
.
isNotNull
(
pre
.
getRequestId
()))
{
try
{
result
=
fascService
.
cancelTask
(
pre
.
get
Request
Id
());
result
=
fascService
.
cancelTask
(
pre
.
getId
());
if
(!
R
.
isSuccess
(
result
))
{
// 产品暂未设计失败了怎么做
return
result
;
}
}
catch
(
ApiException
e
)
{
// 产品暂未设计失败了怎么做
return
R
.
failed
(
"推送法大大失败!"
+
e
.
getMessage
());
}
}
//电子待归档、线下签待归档、已完结的不能撤销签署
...
...
@@ -635,6 +637,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
audit
.
setRootName
(
"撤销签署"
);
audit
.
setLinkId
(
pre
.
getContractId
());
audit
.
setLinkType
(
CommonConstants
.
ONE_INT
);
audit
.
setRemark
(
registRevokeVo
.
getReason
());
tEmployeeContractAuditService
.
save
(
audit
);
}
pre
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
...
...
@@ -649,7 +652,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractInfo
))
{
contractInfo
.
setAuditStatus
(
CommonConstants
.
ZERO
_INT
);
contractInfo
.
setAuditStatus
(
CommonConstants
.
FIVE
_INT
);
contractInfo
.
setInUse
(
CommonConstants
.
ONE_STRING
);
contractInfoService
.
updateById
(
contractInfo
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/application-prd.yml
View file @
002e6b8d
...
...
@@ -43,9 +43,9 @@ gz:
#法大大专业版fasc配置
fasc
:
appId
:
80003662
appSecret
:
DXREUVHOLEFJMWLGYFGF1JKID8YCEDWZ
appUrl
:
https://
uat-
api.fadada.com/api/v5
openId
:
ebcd6e2e0eb2401b9ca9239e78fad203
appId
:
00003399
appSecret
:
CIOV5RSQB6JSY5BKCWFWC026H6KXGX3C
appUrl
:
https://api.fadada.com/api/v5
openId
:
1fdb6a439b4e4ef2ae0df7583a4cd5d0
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