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
8a1b30e1
Commit
8a1b30e1
authored
Jan 26, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
版本切换-fxj
parent
75f727f6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+2
-2
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+3
-2
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+2
-1
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
8a1b30e1
...
@@ -1185,9 +1185,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1185,9 +1185,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//计费方式(0:按天,1:按月)
//计费方式(0:按天,1:按月)
if
(
null
!=
insuranceDetailVO
.
getBillingType
()){
if
(
null
!=
insuranceDetailVO
.
getBillingType
()){
if
(
CommonConstants
.
ZERO_INT
==
insuranceDetailVO
.
getBillingType
().
intValue
()){
if
(
CommonConstants
.
ZERO_INT
==
insuranceDetailVO
.
getBillingType
().
intValue
()){
insuranceDetailVO
.
set
PurchaseCycle
(
insuranceDetailVO
.
getPurchaseCycle
()
+
"天"
);
insuranceDetailVO
.
set
BuyCycle
(
insuranceDetailVO
.
getPurchaseCycle
()
);
}
else
if
(
CommonConstants
.
ONE_INT
==
insuranceDetailVO
.
getBillingType
().
intValue
()){
}
else
if
(
CommonConstants
.
ONE_INT
==
insuranceDetailVO
.
getBillingType
().
intValue
()){
insuranceDetailVO
.
set
PurchaseCycle
(
insuranceDetailVO
.
getPurchaseCycle
()
+
"个月"
);
insuranceDetailVO
.
set
BuyCycle
(
insuranceDetailVO
.
getPurchaseCycle
()
);
}
}
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
8a1b30e1
...
@@ -131,7 +131,7 @@
...
@@ -131,7 +131,7 @@
a.PAYMENT_STATUS as paymentStatus,
a.PAYMENT_STATUS as paymentStatus,
a.PAYMENT_TIME as paymentTime,
a.PAYMENT_TIME as paymentTime,
a.IS_JFCD as isJfcd,
a.IS_JFCD as isJfcd,
a.PURCHASE_CYCLE
as purchaseCycle,
IF(a.BILLING_TYPE='0',CONCAT(a.PURCHASE_CYCLE,'天'),CONCAT(a.PURCHASE_CYCLE,'个月'))
as purchaseCycle,
a.BILLING_TYPE as billingType,
a.BILLING_TYPE as billingType,
a.PRE_HANDLE_TIME as preHandleTime,
a.PRE_HANDLE_TIME as preHandleTime,
a.ESTIMATE_PREMIUM as estimatePremium
a.ESTIMATE_PREMIUM as estimatePremium
...
@@ -436,7 +436,8 @@
...
@@ -436,7 +436,8 @@
a.REFUND_ID as refundId,
a.REFUND_ID as refundId,
a.EXPIRE_REMARK,
a.EXPIRE_REMARK,
a.EXPIRE_IGNORE_FLAG,
a.EXPIRE_IGNORE_FLAG,
a.IS_ADRESS as isAdress,PAYMENT_STATUS,PAYMENT_TIME,IS_JFCD,PURCHASE_CYCLE,PRE_HANDLE_TIME
a.IS_ADRESS as isAdress,a.PAYMENT_STATUS,a.PAYMENT_TIME,a.IS_JFCD,
IF(a.BILLING_TYPE='0',CONCAT(a.PURCHASE_CYCLE,'天'),CONCAT(a.PURCHASE_CYCLE,'个月')) PURCHASE_CYCLE,a.PRE_HANDLE_TIME
from t_insurance_detail a
from t_insurance_detail a
left join t_insurance_settle tis on a.DEFAULT_SETTLE_ID = tis.ID
left join t_insurance_settle tis on a.DEFAULT_SETTLE_ID = tis.ID
where a.ID = #{id}
where a.ID = #{id}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
8a1b30e1
...
@@ -2390,6 +2390,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2390,6 +2390,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
empVoMap
;
return
empVoMap
;
}
}
//autoFalg "0" 为自动化
private
boolean
validImport
(
List
<
ErrorMessage
>
errorMessageList
,
private
boolean
validImport
(
List
<
ErrorMessage
>
errorMessageList
,
TDispatchImportVo
excel
,
TDispatchImportVo
excel
,
ProjectSetInfoVo
setInfoVo
,
ProjectSetInfoVo
setInfoVo
,
...
@@ -2517,7 +2518,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2517,7 +2518,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//档案试用期必填 20241128 fxj 1.7.2
//档案试用期必填 20241128 fxj 1.7.2
if
(
Common
.
isEmpty
(
empVo
.
getTryPeriod
())
if
(
Common
.
isEmpty
(
empVo
.
getTryPeriod
())
&&
Common
.
isEmpty
(
excel
.
getTryPeriod
())
&&
Common
.
isEmpty
(
excel
.
getTryPeriod
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
empVo
.
getTryPeriod
()))
{
&&
CommonConstants
.
ZERO_STRING
.
equals
(
empVo
.
getTryPeriod
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
autoFlag
)
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_TRYPERIOD_NOT_EMPTY
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_TRYPERIOD_NOT_EMPTY
)));
return
true
;
return
true
;
}
}
...
...
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