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
f9f68621
Commit
f9f68621
authored
Nov 29, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.17-离职待办-优化代码
parent
2710a135
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
81 additions
and
8 deletions
+81
-8
TInsuranceAlert.java
...cloud/plus/v1/yifu/insurances/entity/TInsuranceAlert.java
+21
-0
TInsuranceWarnServiceImpl.java
...ces/service/insurance/impl/TInsuranceWarnServiceImpl.java
+4
-5
TInsurancePreRenewDetailMapper.xml
...rces/mapper/insurances/TInsurancePreRenewDetailMapper.xml
+2
-2
TInsuranceWarnMapper.xml
...main/resources/mapper/insurances/TInsuranceWarnMapper.xml
+54
-1
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceAlert.java
View file @
f9f68621
...
...
@@ -271,5 +271,26 @@ public class TInsuranceAlert extends BaseEntity {
@Schema
(
description
=
"新派单的商险ID"
)
private
String
insurancesIdNew
;
/**
* 保单开始时间
*/
@TableField
(
exist
=
false
)
@Schema
(
description
=
"保单开始时间-新"
)
private
LocalDate
policyStartNew
;
/**
* 保单结束时间
*/
@TableField
(
exist
=
false
)
@Schema
(
description
=
"保单结束时间-新"
)
private
LocalDate
policyEndNew
;
/**
* 保单生效日期
*/
@TableField
(
exist
=
false
)
@Schema
(
description
=
"保单生效日期-新"
)
private
LocalDate
policyEffectNew
;
private
static
final
long
serialVersionUID
=
1L
;
}
\ No newline at end of file
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceWarnServiceImpl.java
View file @
f9f68621
...
...
@@ -320,7 +320,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
detail
.
setPolicyEffectOld
(
vo
.
getPolicyEffect
());
detail
.
setPolicyStartOld
(
vo
.
getPolicyStart
());
detail
.
setPolicyEndOld
(
vo
.
getPolicyEnd
());
detail
.
setBuyType
(
vo
.
getBuyType
()
);
detail
.
setBuyType
(
CommonConstants
.
ONE_INT
);
detail
.
setConfigId
(
vo
.
getConfigId
());
detail
.
setConfigName
(
vo
.
getConfigName
());
detail
.
setInsuranceCompanyName
(
vo
.
getInsuranceCompanyName
());
...
...
@@ -332,14 +332,13 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
AutoDeptDetailVO
detailVO
=
deptMap
.
get
(
vo
.
getDeptNo
());
// 预计派单时间
if
(
Common
.
isNotNull
(
vo
.
getPolicyEnd
()))
{
detail
.
setPolicyStart
(
vo
.
getPolicyEnd
().
plusDays
(
CommonConstants
.
ONE_INT
));
detail
.
setPolicyEffect
(
detail
.
getPolicyStart
());
LocalDate
days
=
calculateThreeWorkDays
(
vo
.
getPolicyEnd
(),
holidayMap
);
if
(
days
!=
null
&&
Common
.
isNotNull
(
days
))
{
// 新增逻辑
detail
.
setExpectedCollectionTime
(
days
.
atTime
(
15
,
20
));
if
(
Common
.
isNotNull
(
vo
.
getPolicyStart
()))
{
detail
.
setPolicyStart
(
vo
.
getPolicyStart
().
plusDays
(
CommonConstants
.
ONE_INT
));
}
detail
.
setPolicyEffect
(
detail
.
getPolicyStart
());
Integer
month
=
CommonConstants
.
ONE_INT
;
if
(
detailVO
!=
null
&&
Common
.
isNotNull
(
detailVO
.
getNum
()))
{
month
=
detailVO
.
getNum
();
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsurancePreRenewDetailMapper.xml
View file @
f9f68621
...
...
@@ -308,7 +308,7 @@
JOIN t_insurance_alert b ON b.INSURANCES_PRE_RENEW_DETAIL_ID = a.ID
where b.EXPIRE_IGNORE_FLAG = '1' and b.DELETE_FLAG=0 and a.is_leave = '0' and b.IS_OVERDUE = 0
AND a.process_status in ('0','1','2','5')
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d")
<![CDATA[ <= ]]>
CURDATE(
)
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d")
<![CDATA[ <= ]]>
DATE_FORMAT(CURDATE(),"%Y-%m-%d"
)
</select>
<!-- 获取所有待确认的数据 -->
...
...
@@ -319,7 +319,7 @@
JOIN t_insurance_alert b ON b.INSURANCES_PRE_RENEW_DETAIL_ID = a.ID
where b.EXPIRE_IGNORE_FLAG = '1' and b.DELETE_FLAG=0 and a.is_leave = '0' and b.IS_OVERDUE = 0
AND a.process_status = '0' and DATE_FORMAT(a.confirm_Date,"%Y-%m-%d")
<![CDATA[ <= ]]>
CURDATE()
AND DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") >= CURDATE()
group by a.customer_user_loginname
</select>
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceWarnMapper.xml
View file @
f9f68621
...
...
@@ -56,6 +56,9 @@
<result
property=
"isAddress"
column=
"IS_ADDRESS"
jdbcType=
"CHAR"
/>
<result
property=
"expectedCollectionTime"
column=
"expected_collection_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"insurancesIdNew"
column=
"INSURANCES_ID_NEW"
jdbcType=
"VARCHAR"
/>
<result
property=
"policyStartNew"
column=
"POLICY_START_NEW"
jdbcType=
"DATE"
/>
<result
property=
"policyEndNew"
column=
"POLICY_END_NEW"
jdbcType=
"DATE"
/>
<result
property=
"policyEffectNew"
column=
"POLICY_EFFECT_NEW"
jdbcType=
"DATE"
/>
</resultMap>
<!-- 商险续签待办专用 -->
...
...
@@ -285,7 +288,57 @@
<!--tInsuranceAlert简单分页查询-->
<select
id=
"getTInsuranceAlertList2000"
resultMap=
"BaseResultMap"
>
SELECT
<include
refid=
"Alert_Column_List"
/>
a.ID,
a.EMP_NAME,
a.EMP_IDCARD_NO,
a.DEPT_NO,
a.POST,
b.INSURANCE_COMPANY_NAME,
b.INSURANCE_TYPE_NAME,
b.INSURANCE_CITY_NAME,
a.INSURANCE_HANDLE_CITY_NAME,
a.INSURANCE_HANDLE_PROVINCE_NAME,
b.INSURANCE_PROVINCE_NAME,
b.BUY_STANDARD,
a.UNIT_NAME,
a.UNIT_NO,
a.SETTLE_TYPE,
a.POLICY_EFFECT,
a.EXPIRE_REMARK,
a.EXPIRE_IGNORE_FLAG,
a.SETTLE_MONTH,
a.POLICY_START,
a.POLICY_END,
a.ACTUAL_PREMIUM,
a.ESTIMATE_PREMIUM,
a.INVOICE_NO,
a.MEDICAL_QUOTA,
a.DIE_DISABLE_QUOTA,
a.DEPT_NAME,
a.POLICY_NO,
a.IS_OVERDUE,
a.REMARK,
a.CREATE_BY,
a.DELETE_FLAG,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME,
a.CREATE_USER_DEPT_NAME,
a.IS_EFFECT,
a.ALERTER,
a.ALERT_ID,
a.HAVE_WORK_DAY,
a.INSURANCES_PRE_RENEW_DETAIL_ID,
b.BUY_TYPE,
b.process_status,
b.error_info,
b.error_time
,DATE_FORMAT(b.expected_collection_time,'%Y-%m-%d %H:%i') expected_collection_time
,b.INSURANCES_ID_NEW,
b.POLICY_EFFECT POLICY_EFFECT_NEW,
b.POLICY_START POLICY_EFFECT_NEW,
b.POLICY_END POLICY_EFFECT_NEW
FROM t_insurance_alert a
JOIN t_insurance_pre_renew_detail b ON a.INSURANCES_PRE_RENEW_DETAIL_ID = b.ID
<where>
...
...
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