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
eea843dd
Commit
eea843dd
authored
Feb 17, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.6' into MVP1.7.6
parents
c4078104
b053b47b
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
78 additions
and
70 deletions
+78
-70
PreUploadEmpImportTwoVo.java
...oud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
+2
-2
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+32
-30
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-6
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+1
-1
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+0
-3
TInsuranceEkpServiceImpl.java
...nces/service/insurance/impl/TInsuranceEkpServiceImpl.java
+12
-16
DoJointInsuranceTask.java
...ud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
+18
-6
EkpSettleMapper.xml
...ces-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
+10
-6
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
View file @
eea843dd
...
@@ -187,10 +187,10 @@ public class PreUploadEmpImportTwoVo implements Serializable {
...
@@ -187,10 +187,10 @@ public class PreUploadEmpImportTwoVo implements Serializable {
@ExcelAttribute
(
name
=
"身份证截止日期-值"
)
@ExcelAttribute
(
name
=
"身份证截止日期-值"
)
private
Date
validityEndValue
;
private
Date
validityEndValue
;
@ExcelAttribute
(
name
=
"是否有
职业资格证书
"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"是否有
不良记录
"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
private
String
badRecordFlag
;
private
String
badRecordFlag
;
@ExcelAttribute
(
name
=
"是否有
不良记录
"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"是否有
职业资格证书
"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
private
String
haveQualification
;
private
String
haveQualification
;
// 字典值结束
// 字典值结束
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
eea843dd
...
@@ -1515,23 +1515,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -1515,23 +1515,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
else
{
}
else
{
saveEmp
.
setIdProvince
(
Integer
.
parseInt
(
areaStr
));
saveEmp
.
setIdProvince
(
Integer
.
parseInt
(
areaStr
));
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getIdCity
()))
{
if
(
Common
.
isNotNull
(
excel
.
getIdCity
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdProvince
().
trim
());
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdProvince
().
trim
());
if
(
Common
.
isEmpty
(
areaStr
))
{
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
}
else
{
}
else
{
saveEmp
.
setIdCity
(
Integer
.
parseInt
(
areaStr
));
saveEmp
.
setIdCity
(
Integer
.
parseInt
(
areaStr
));
}
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getIdTown
()))
{
if
(
Common
.
isNotNull
(
excel
.
getIdTown
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdTown
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdCity
().
trim
());
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdTown
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdCity
().
trim
());
if
(
Common
.
isEmpty
(
areaStr
))
{
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
}
else
{
}
else
{
saveEmp
.
setIdTown
(
Integer
.
parseInt
(
areaStr
));
saveEmp
.
setIdTown
(
Integer
.
parseInt
(
areaStr
));
}
}
}
}
}
// 档案所在地
// 档案所在地
if
(
Common
.
isNotNull
(
excel
.
getFileProvince
()))
{
if
(
Common
.
isNotNull
(
excel
.
getFileProvince
()))
{
saveEmp
.
setFileProvince
(
Integer
.
parseInt
(
excel
.
getFileProvince
()));
saveEmp
.
setFileProvince
(
Integer
.
parseInt
(
excel
.
getFileProvince
()));
...
@@ -2046,23 +2047,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2046,23 +2047,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
else
{
}
else
{
saveEmp
.
setIdProvince
(
Integer
.
parseInt
(
areaStr
));
saveEmp
.
setIdProvince
(
Integer
.
parseInt
(
areaStr
));
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getIdCity
()))
{
if
(
Common
.
isNotNull
(
excel
.
getIdCity
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdProvince
().
trim
());
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdProvince
().
trim
());
if
(
Common
.
isEmpty
(
areaStr
))
{
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
}
else
{
}
else
{
saveEmp
.
setIdCity
(
Integer
.
parseInt
(
areaStr
));
saveEmp
.
setIdCity
(
Integer
.
parseInt
(
areaStr
));
}
}
if
(
Common
.
isNotNull
(
excel
.
getIdTown
()))
{
}
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdTown
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdCity
().
trim
());
if
(
Common
.
isNotNull
(
excel
.
getIdTown
()
))
{
if
(
Common
.
isEmpty
(
areaStr
))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdTown
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdCity
().
trim
(
));
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()
));
if
(
Common
.
isEmpty
(
areaStr
))
{
}
else
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()
));
saveEmp
.
setIdTown
(
Integer
.
parseInt
(
areaStr
));
}
else
{
}
saveEmp
.
setIdTown
(
Integer
.
parseInt
(
areaStr
));
}
}
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getIsCollege
()))
{
if
(
Common
.
isNotNull
(
excel
.
getIsCollege
()))
{
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getIsCollege
()))
{
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getIsCollege
()))
{
saveEmp
.
setIsCollege
(
CommonConstants
.
ONE_INT
);
saveEmp
.
setIsCollege
(
CommonConstants
.
ONE_INT
);
...
@@ -3824,7 +3826,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -3824,7 +3826,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
&&
(
"是"
.
equals
(
excel
.
getBadRecordFlag
())
||
"否"
.
equals
(
excel
.
getBadRecordFlag
()))
&&
(
"是"
.
equals
(
excel
.
getBadRecordFlag
())
||
"否"
.
equals
(
excel
.
getBadRecordFlag
()))
)
{
)
{
String
badFlag
=
CommonConstants
.
ZERO_STRING
;
String
badFlag
=
CommonConstants
.
ZERO_STRING
;
if
(
"否"
.
equals
(
excel
.
get
HaveQualification
())){
if
(
"否"
.
equals
(
excel
.
get
BadRecordFlag
())){
badFlag
=
CommonConstants
.
ONE_STRING
;
badFlag
=
CommonConstants
.
ONE_STRING
;
}
}
badRecord
=
new
TEmpBadRecord
();
badRecord
=
new
TEmpBadRecord
();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
eea843dd
...
@@ -1472,7 +1472,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1472,7 +1472,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isNotNull
(
tPreEmpBadRecord
.
getRemark
())){
if
(
Common
.
isNotNull
(
tPreEmpBadRecord
.
getRemark
())){
if
(
tPreEmpBadRecord
.
getRemark
().
contains
(
"未曾经"
)){
if
(
tPreEmpBadRecord
.
getRemark
().
contains
(
"未曾经"
)){
tPreEmpBadRecord
.
setBadRecordFlag
(
CommonConstants
.
ONE_STRING
);
tPreEmpBadRecord
.
setBadRecordFlag
(
CommonConstants
.
ONE_STRING
);
}
else
{
}
else
{
tPreEmpBadRecord
.
setBadRecordFlag
(
CommonConstants
.
ZERO_STRING
);
tPreEmpBadRecord
.
setBadRecordFlag
(
CommonConstants
.
ZERO_STRING
);
}
}
...
@@ -1490,8 +1489,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1490,8 +1489,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
.
set
(
TPreEmpBadRecord:
:
getHappenTime
,
null
)
.
set
(
TPreEmpBadRecord:
:
getHappenTime
,
null
)
.
set
(
TPreEmpBadRecord:
:
getLoseFee
,
null
)
.
set
(
TPreEmpBadRecord:
:
getLoseFee
,
null
)
.
set
(
TPreEmpBadRecord:
:
getLoseFeeOther
,
null
)
.
set
(
TPreEmpBadRecord:
:
getLoseFeeOther
,
null
)
.
set
(
TPreEmpBadRecord:
:
getProject
,
null
)
.
set
(
TPreEmpBadRecord:
:
getProjectCode
,
null
)
.
set
(
TPreEmpBadRecord:
:
getUpdateBy
,
user
.
getId
())
.
set
(
TPreEmpBadRecord:
:
getUpdateBy
,
user
.
getId
())
.
set
(
TPreEmpBadRecord:
:
getUpdateTime
,
LocalDateTime
.
now
());
.
set
(
TPreEmpBadRecord:
:
getUpdateTime
,
LocalDateTime
.
now
());
tPreEmpBadRecordService
.
update
(
null
,
updateDiyInfoWrapper
);
tPreEmpBadRecordService
.
update
(
null
,
updateDiyInfoWrapper
);
...
@@ -3889,6 +3886,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -3889,6 +3886,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpBadRecord
=
new
TPreEmpBadRecord
();
tPreEmpBadRecord
=
new
TPreEmpBadRecord
();
tPreEmpBadRecord
.
setOldId
(
oldBadRecordMap
.
get
(
empIdCard
));
tPreEmpBadRecord
.
setOldId
(
oldBadRecordMap
.
get
(
empIdCard
));
tPreEmpBadRecord
.
setPreMainId
(
mainId
);
tPreEmpBadRecord
.
setPreMainId
(
mainId
);
tPreEmpBadRecord
.
setSettleDomain
(
deptId
);
tPreEmpBadRecord
.
setProject
(
dept
.
getDepartName
());
tPreEmpBadRecord
.
setProjectCode
(
dept
.
getDepartNo
());
if
(
employee
!=
null
)
{
if
(
employee
!=
null
)
{
tPreEmpBadRecord
.
setEmpName
(
employee
.
getEmpName
());
tPreEmpBadRecord
.
setEmpName
(
employee
.
getEmpName
());
}
}
...
@@ -3898,9 +3898,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -3898,9 +3898,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpBadRecord
.
setCreateTime
(
LocalDateTime
.
now
());
tPreEmpBadRecord
.
setCreateTime
(
LocalDateTime
.
now
());
if
(
"是"
.
equals
(
info
.
getRemark
()))
{
if
(
"是"
.
equals
(
info
.
getRemark
()))
{
// 有不良记录,存项目信息
// 有不良记录,存项目信息
tPreEmpBadRecord
.
setSettleDomain
(
deptId
);
tPreEmpBadRecord
.
setProject
(
dept
.
getDepartName
());
tPreEmpBadRecord
.
setProjectCode
(
dept
.
getDepartNo
());
tPreEmpBadRecord
.
setRemark
(
"曾经或正在追究与承担过刑事责任"
);
tPreEmpBadRecord
.
setRemark
(
"曾经或正在追究与承担过刑事责任"
);
// 1.9.6-chenyuxi: 记录不良记录标识
// 1.9.6-chenyuxi: 记录不良记录标识
tPreEmpBadRecord
.
setBadRecordFlag
(
CommonConstants
.
ZERO_STRING
);
tPreEmpBadRecord
.
setBadRecordFlag
(
CommonConstants
.
ZERO_STRING
);
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
eea843dd
...
@@ -363,7 +363,7 @@ public interface CommonConstants {
...
@@ -363,7 +363,7 @@ public interface CommonConstants {
public
static
final
String
JAR_TYPE
=
"jar"
;
public
static
final
String
JAR_TYPE
=
"jar"
;
int
BATCH_COUNT
=
100
;
int
BATCH_COUNT
=
100
;
int
BATCH_COUNT1
=
2000
;
int
BATCH_COUNT1
=
2000
;
String
IMPORT_DATA_ANALYSIS_ERROR
=
"数据导入解析异常,请检查表数据格式(常见错误:1.日期格式:yyyy-MM-dd,2.比例为整数且不含%)"
;
String
IMPORT_DATA_ANALYSIS_ERROR
=
"数据导入解析异常,请检查表数据格式(常见错误:1.日期格式:yyyy-MM-dd,2.比例为整数且不含%
,3涉及金额相关的只能填数字
)"
;
String
IMPORT_DATA_ANALYSIS_ERROR_TWO
=
"数据导入解析异常,请检查表数据格式"
;
String
IMPORT_DATA_ANALYSIS_ERROR_TWO
=
"数据导入解析异常,请检查表数据格式"
;
String
CREATE_TIME
=
"CREATE_TIME"
;
String
CREATE_TIME
=
"CREATE_TIME"
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
eea843dd
...
@@ -30,7 +30,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
...
@@ -30,7 +30,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants
;
import
com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants
;
import
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil
;
import
com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants
;
import
com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceAreaResMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceAreaResMapper
;
...
@@ -111,8 +110,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -111,8 +110,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
private
TInsuranceRefundService
tInsuranceRefundService
;
private
TInsuranceRefundService
tInsuranceRefundService
;
@Resource
@Resource
private
TInsuranceEkpService
tInsuranceEkpService
;
private
TInsuranceEkpService
tInsuranceEkpService
;
@Resource
private
EkpInsuranceUtil
eKPInsuranceUtil
;
@Resource
@Resource
private
EkpSettleService
ekpSettleService
;
private
EkpSettleService
ekpSettleService
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceEkpServiceImpl.java
View file @
eea843dd
...
@@ -6,17 +6,16 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
...
@@ -6,17 +6,16 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants
;
import
com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants
;
import
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil
;
import
com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants
;
import
com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle
;
import
com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEkpMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEkpMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.DoJointInsuranceTask
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInteractiveParam
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInteractiveParam
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -40,18 +39,15 @@ import java.util.List;
...
@@ -40,18 +39,15 @@ import java.util.List;
public
class
TInsuranceEkpServiceImpl
extends
ServiceImpl
<
TInsuranceEkpMapper
,
TInsuranceEkp
>
implements
TInsuranceEkpService
{
public
class
TInsuranceEkpServiceImpl
extends
ServiceImpl
<
TInsuranceEkpMapper
,
TInsuranceEkp
>
implements
TInsuranceEkpService
{
@Resource
@Resource
EkpInsuranceUtil
ekpInsuranceUtil
;
@Lazy
private
DoJointInsuranceTask
doJointInsuranceTask
;
@Resource
@Resource
TInsuranceSettleService
tInsuranceSettleService
;
TInsuranceSettleService
tInsuranceSettleService
;
@Resource
@Lazy
TInsuranceDetailService
tInsuranceDetailService
;
@Resource
@Resource
@Lazy
@Lazy
EkpSettleService
ekpSettleService
;
TInsuranceDetailService
tInsuranceDetailService
;
@Override
@Override
public
R
resend
()
{
public
R
resend
()
{
...
@@ -113,7 +109,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -113,7 +109,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
}
else
{
}
else
{
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
NEW_SETTLE_BILL
);
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
NEW_SETTLE_BILL
);
ekpParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
ekpParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
s
=
ekpInsuranceUtil
.
sendToEkp
(
ekpParam
);
s
=
doJointInsuranceTask
.
insertInsrancesDetail
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
settleUpdate
.
set
(
TInsuranceSettle
::
getEstimatePushTime
,
LocalDateTime
.
now
())
settleUpdate
.
set
(
TInsuranceSettle
::
getEstimatePushTime
,
LocalDateTime
.
now
())
.
set
(
TInsuranceSettle
::
getIsEstimatePush
,
CommonConstants
.
ONE_INT
);
.
set
(
TInsuranceSettle
::
getIsEstimatePush
,
CommonConstants
.
ONE_INT
);
...
@@ -145,7 +141,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -145,7 +141,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
}
else
{
}
else
{
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
NEW_SETTLE_BILL
);
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
NEW_SETTLE_BILL
);
ekpParam
.
setSettleType
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
);
ekpParam
.
setSettleType
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
);
s
=
ekpInsuranceUtil
.
sendToEkp
(
ekpParam
);
s
=
doJointInsuranceTask
.
insertInsrancesDetail
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
settleUpdate
.
set
(
TInsuranceSettle
::
getActualPushTime
,
LocalDateTime
.
now
())
settleUpdate
.
set
(
TInsuranceSettle
::
getActualPushTime
,
LocalDateTime
.
now
())
.
set
(
TInsuranceSettle
::
getIsActualPush
,
CommonConstants
.
ONE_INT
);
.
set
(
TInsuranceSettle
::
getIsActualPush
,
CommonConstants
.
ONE_INT
);
...
@@ -187,7 +183,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -187,7 +183,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
}
else
{
}
else
{
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
UPDATE_SETTLE_BILL
);
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
UPDATE_SETTLE_BILL
);
ekpParam
.
setSettleType
(
CommonConstants
.
EMPTY_STRING
);
ekpParam
.
setSettleType
(
CommonConstants
.
EMPTY_STRING
);
s
=
ekpInsuranceUtil
.
sendToEkp
(
ekpParam
);
s
=
doJointInsuranceTask
.
insertInsrancesDetail
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
...
@@ -203,7 +199,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -203,7 +199,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
if
(
eStatus
&&
aStatus
){
if
(
eStatus
&&
aStatus
){
ekpParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
ekpParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
ABOLISH_SETTLE_BILL
);
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
ABOLISH_SETTLE_BILL
);
s
=
ekpInsuranceUtil
.
sendToEkp
(
ekpParam
);
s
=
doJointInsuranceTask
.
insertInsrancesDetail
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
...
@@ -219,7 +215,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -219,7 +215,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
BigDecimal
estimatePremium
=
ekpParam
.
getEstimatePremium
();
BigDecimal
estimatePremium
=
ekpParam
.
getEstimatePremium
();
ekpParam
.
setEstimatePremium
(
estimatePremium
.
negate
());
ekpParam
.
setEstimatePremium
(
estimatePremium
.
negate
());
ekpParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
ekpParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
s
=
ekpInsuranceUtil
.
sendToEkp
(
ekpParam
);
s
=
doJointInsuranceTask
.
insertInsrancesDetail
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
...
@@ -233,7 +229,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -233,7 +229,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
ekpParam
.
setSettleType
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
);
ekpParam
.
setSettleType
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
);
BigDecimal
actualPremium
=
ekpParam
.
getActualPremium
();
BigDecimal
actualPremium
=
ekpParam
.
getActualPremium
();
ekpParam
.
setActualPremium
(
actualPremium
.
negate
());
ekpParam
.
setActualPremium
(
actualPremium
.
negate
());
s
=
ekpInsuranceUtil
.
sendToEkp
(
ekpParam
);
s
=
doJointInsuranceTask
.
insertInsrancesDetail
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
...
@@ -248,7 +244,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -248,7 +244,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
if
(
CommonConstants
.
FIVE_INT
==
pushType
){
if
(
CommonConstants
.
FIVE_INT
==
pushType
){
ekpParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
ekpParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
CORRECT_SETTLE_BILL
);
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
CORRECT_SETTLE_BILL
);
s
=
ekpInsuranceUtil
.
sendToEkp
(
ekpParam
);
s
=
doJointInsuranceTask
.
insertInsrancesDetail
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
...
@@ -261,7 +257,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -261,7 +257,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
if
(
CommonConstants
.
SIX_INT
==
pushType
){
if
(
CommonConstants
.
SIX_INT
==
pushType
){
ekpParam
.
setSettleType
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
);
ekpParam
.
setSettleType
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
);
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
CORRECT_SETTLE_BILL
);
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
CORRECT_SETTLE_BILL
);
s
=
ekpInsuranceUtil
.
sendToEkp
(
ekpParam
);
s
=
doJointInsuranceTask
.
insertInsrancesDetail
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
ekpUpdate
.
set
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ONE_INT
)
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
.
set
(
TInsuranceEkp
::
getPushTime
,
LocalDateTime
.
now
());
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @
eea843dd
...
@@ -567,7 +567,13 @@ public class DoJointInsuranceTask {
...
@@ -567,7 +567,13 @@ public class DoJointInsuranceTask {
//新建商险订单明细
//新建商险订单明细
if
(
InsurancesConstants
.
NEW_SETTLE_BILL
.
equals
(
param
.
getInteractiveType
()))
{
if
(
InsurancesConstants
.
NEW_SETTLE_BILL
.
equals
(
param
.
getInteractiveType
()))
{
EkpInsurancesInfo
pushParam
=
new
EkpInsurancesInfo
();
EkpInsurancesInfo
pushParam
=
new
EkpInsurancesInfo
();
initValues
(
pushParam
,
deptInfoVo
,
param
);
String
code
=
""
;
if
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
.
equals
(
param
.
getSettleType
()))
{
code
=
"1"
;
}
else
if
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
.
equals
(
param
.
getSettleType
()))
{
code
=
"2"
;
}
initValues
(
pushParam
,
deptInfoVo
,
param
,
code
);
//应收
//应收
double
ys
=
0L
;
double
ys
=
0L
;
if
(!
"是"
.
equals
(
deptInfoVo
.
getIsBpo
()))
{
if
(!
"是"
.
equals
(
deptInfoVo
.
getIsBpo
()))
{
...
@@ -603,7 +609,13 @@ public class DoJointInsuranceTask {
...
@@ -603,7 +609,13 @@ public class DoJointInsuranceTask {
//红冲
//红冲
if
(
InsurancesConstants
.
CORRECT_SETTLE_BILL
.
equals
(
param
.
getInteractiveType
()))
{
if
(
InsurancesConstants
.
CORRECT_SETTLE_BILL
.
equals
(
param
.
getInteractiveType
()))
{
EkpInsurancesInfo
pushParam
=
new
EkpInsurancesInfo
();
EkpInsurancesInfo
pushParam
=
new
EkpInsurancesInfo
();
initValues
(
pushParam
,
deptInfoVo
,
param
);
String
code
=
""
;
if
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
.
equals
(
param
.
getSettleType
()))
{
code
=
"3"
;
}
else
if
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
.
equals
(
param
.
getSettleType
()))
{
code
=
"4"
;
}
initValues
(
pushParam
,
deptInfoVo
,
param
,
code
);
//应收
//应收
pushParam
.
setFd_3adfe6e30f2a3c
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
.
equals
(
param
.
getSettleType
())
?
param
.
getActualPremium
().
doubleValue
()
:
param
.
getEstimatePremium
().
doubleValue
());
pushParam
.
setFd_3adfe6e30f2a3c
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
.
equals
(
param
.
getSettleType
())
?
param
.
getActualPremium
().
doubleValue
()
:
param
.
getEstimatePremium
().
doubleValue
());
insurancesInfoMapper
.
insert
(
pushParam
);
insurancesInfoMapper
.
insert
(
pushParam
);
...
@@ -721,10 +733,10 @@ public class DoJointInsuranceTask {
...
@@ -721,10 +733,10 @@ public class DoJointInsuranceTask {
}
}
//商险新增初始化
//商险新增初始化
public
void
initValues
(
EkpInsurancesInfo
pushParam
,
EkpInsuranceDeptInfoVo
deptInfoVo
,
EkpInteractiveParam
param
)
throws
ParseException
{
public
void
initValues
(
EkpInsurancesInfo
pushParam
,
EkpInsuranceDeptInfoVo
deptInfoVo
,
EkpInteractiveParam
param
,
String
code
)
throws
ParseException
{
//单号
//单号
,sxdd + 商险id + 标识
pushParam
.
setFd_3adfe67a9f6364
(
"SXDD"
+
LocalDateTimeUtils
.
formatTime
(
LocalDateTime
.
now
(),
DateUtil
.
ISO_DATE_FORMAT
)
pushParam
.
setFd_3adfe67a9f6364
(
"SXDD"
+
LocalDateTimeUtils
.
formatTime
(
LocalDateTime
.
now
(),
DateUtil
.
ISO_DATE_FORMAT
)
+
"_"
+
param
.
getDetailId
()
);
+
param
.
getDetailId
()
+
code
);
//项目id 项目编码
//项目id 项目编码
pushParam
.
setFd_3b16dfb32778f2
(
deptInfoVo
.
getFdId
());
pushParam
.
setFd_3b16dfb32778f2
(
deptInfoVo
.
getFdId
());
pushParam
.
setFd_3b16dfb32778f2_text
(
deptInfoVo
.
getDeptNo
());
pushParam
.
setFd_3b16dfb32778f2_text
(
deptInfoVo
.
getDeptNo
());
...
@@ -801,7 +813,7 @@ public class DoJointInsuranceTask {
...
@@ -801,7 +813,7 @@ public class DoJointInsuranceTask {
//商险更新赋值
//商险更新赋值
public
void
initValueUpdate
(
EkpInsurancesInfo
info
,
EkpInsuranceDeptInfoVo
deptInfoVo
,
EkpInteractiveParam
param
)
throws
ParseException
{
public
void
initValueUpdate
(
EkpInsurancesInfo
info
,
EkpInsuranceDeptInfoVo
deptInfoVo
,
EkpInteractiveParam
param
)
throws
ParseException
{
//实际结算月份
//实际结算月份
info
.
setFd_3af9d11088facc
(
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
())
?
DateUtil
.
parseDate
(
param
.
getSettleMonth
(),
"yyyyMM"
)
:
null
);
info
.
setFd_3af9d11088facc
(
!
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
())
?
DateUtil
.
parseDate
(
param
.
getSettleMonth
(),
DateUtil
.
DATETIME_YYYY_MM
)
:
null
);
//是否全部结算
//是否全部结算
info
.
setFd_3b13b2ecc164aa
(
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
())
?
"是"
:
"否"
);
info
.
setFd_3b13b2ecc164aa
(
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
())
?
"是"
:
"否"
);
//预估保费
//预估保费
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
View file @
eea843dd
...
@@ -50,18 +50,22 @@
...
@@ -50,18 +50,22 @@
<select
id=
"getSettle"
resultMap=
"BaseResultMap"
>
<select
id=
"getSettle"
resultMap=
"BaseResultMap"
>
select
select
<include
refid=
"Base_Column_List"
></include>
fd_id,
fd_3b0a5743acab7e as fd_3b05ba46bb042e,
MAX(case when fd_3adfe6af71a1cc = '预估' THEN fd_3adfe6ec6a8cbe END) AS fd_3b05ba4808a3ca,
MAX(case when fd_3adfe6af71a1cc = '实缴' THEN fd_3adfe6ec6a8cbe END) AS fd_3b05bd5ed0b976
from
from
ekp_
f80727b647a403b975ae
ekp_
insurances_info
where
where
fd_3b05ba46bb042e = #{id}
fd_3b0a5743acab7e = #{id}
group by fd_3b0a5743acab7e
</select>
</select>
<select
id=
"getSettleStatusFromEkpInsuranceDetail"
resultType=
"java.lang.String"
>
<select
id=
"getSettleStatusFromEkpInsuranceDetail"
resultType=
"java.lang.String"
>
select
select
fd_3adfe6ec6a8cbe
fd_3adfe6ec6a8cbe
from
from
ekp_e96a0a28442447c81ec0
ekp_insurances_info
where
where
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '实缴' limit 1
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '实缴' limit 1
</select>
</select>
...
@@ -70,7 +74,7 @@
...
@@ -70,7 +74,7 @@
select
select
<include
refid=
"Base_Column_Dept"
></include>
<include
refid=
"Base_Column_Dept"
></include>
from
from
ekp_e96a0a28442447c81ec0
ekp_insurances_info
where
where
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '实缴' limit 1
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '实缴' limit 1
</select>
</select>
...
@@ -79,7 +83,7 @@
...
@@ -79,7 +83,7 @@
select
select
<include
refid=
"Base_Column_Dept"
></include>
<include
refid=
"Base_Column_Dept"
></include>
from
from
ekp_
e96a0a28442447c81ec0
ekp_
insurances_info
where
where
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '预估' limit 1
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '预估' limit 1
</select>
</select>
...
...
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