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
3ea592db
Commit
3ea592db
authored
Jun 24, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
ad58ceb3
91d724b9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
15 deletions
+9
-15
TGzOfferInfoExportDetailVo.java
.../plus/v1/yifu/archives/vo/TGzOfferInfoExportDetailVo.java
+2
-2
TGzOfferInfoImportVo.java
.../cloud/plus/v1/yifu/archives/vo/TGzOfferInfoImportVo.java
+2
-2
GzConfig.java
...com/yifu/cloud/plus/v1/yifu/archives/config/GzConfig.java
+1
-1
TGzOfferInfoServiceImpl.java
...1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
+2
-2
TGzOfferInfoMapper.xml
...ives-biz/src/main/resources/mapper/TGzOfferInfoMapper.xml
+2
-8
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzOfferInfoExportDetailVo.java
View file @
3ea592db
...
@@ -40,10 +40,10 @@ public class TGzOfferInfoExportDetailVo implements Serializable {
...
@@ -40,10 +40,10 @@ public class TGzOfferInfoExportDetailVo implements Serializable {
private
String
bizId
;
private
String
bizId
;
@ExcelProperty
(
"人员类别编码"
)
@ExcelProperty
(
"人员类别编码"
)
private
String
empType
;
private
String
emp
l
Type
;
@ExcelProperty
(
"人员类别名称"
)
@ExcelProperty
(
"人员类别名称"
)
private
String
empTypeDescr
;
private
String
emp
l
TypeDescr
;
/**
/**
* 外签类型:A: 洼地外签/ B:属地外签
* 外签类型:A: 洼地外签/ B:属地外签
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzOfferInfoImportVo.java
View file @
3ea592db
...
@@ -36,10 +36,10 @@ public class TGzOfferInfoImportVo extends RowIndex implements Serializable {
...
@@ -36,10 +36,10 @@ public class TGzOfferInfoImportVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"人员类别编码"
,
maxLength
=
2
)
@ExcelAttribute
(
name
=
"人员类别编码"
,
maxLength
=
2
)
private
String
empType
;
private
String
emp
l
Type
;
@ExcelAttribute
(
name
=
"人员类别名称"
,
maxLength
=
32
)
@ExcelAttribute
(
name
=
"人员类别名称"
,
maxLength
=
32
)
private
String
empTypeDescr
;
private
String
emp
l
TypeDescr
;
/**
/**
* 外签类型:A: 洼地外签/ B:属地外签
* 外签类型:A: 洼地外签/ B:属地外签
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/config/GzConfig.java
View file @
3ea592db
...
@@ -64,7 +64,7 @@ public class GzConfig {
...
@@ -64,7 +64,7 @@ public class GzConfig {
dataObject
=
(
JSONObject
)
dataArray
.
get
(
i
);
dataObject
=
(
JSONObject
)
dataArray
.
get
(
i
);
bankCd
=
dataObject
.
getString
(
"bankCd"
);
bankCd
=
dataObject
.
getString
(
"bankCd"
);
cnapsId
=
dataObject
.
getString
(
"cnapsId"
);
cnapsId
=
dataObject
.
getString
(
"cnapsId"
);
// TODO - 继续解析参数并存储
// TODO - 继续解析参数并存储
—— 根据 cnapsId 字段,选择新增还是修改
System
.
out
.
println
(
"bankCd="
+
bankCd
);
System
.
out
.
println
(
"bankCd="
+
bankCd
);
System
.
out
.
println
(
"cnapsId="
+
cnapsId
);
System
.
out
.
println
(
"cnapsId="
+
cnapsId
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
View file @
3ea592db
...
@@ -433,7 +433,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -433,7 +433,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
*/
*/
private
void
saveData
()
{
private
void
saveData
()
{
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
import
TDispatchExportLog
(
cachedDataList
);
import
GzOffer
(
cachedDataList
);
log
.
info
(
"存储数据库成功!"
);
log
.
info
(
"存储数据库成功!"
);
}
}
}).
sheet
().
doRead
();
}).
sheet
().
doRead
();
...
@@ -729,7 +729,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -729,7 +729,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
return
YiFuSmsUtil
.
sendRegistBatchSms
(
phones
,
params
,
signNames
,
templeteVo
.
getTempleteCode
());
return
YiFuSmsUtil
.
sendRegistBatchSms
(
phones
,
params
,
signNames
,
templeteVo
.
getTempleteCode
());
}
}
private
void
import
TDispatchExportLog
(
List
<
TGzOfferInfoImportVo
>
excelVOList
)
{
private
void
import
GzOffer
(
List
<
TGzOfferInfoImportVo
>
excelVOList
)
{
// 个性化校验逻辑
// 个性化校验逻辑
// 执行数据插入操作 组装
// 执行数据插入操作 组装
TGzOfferInfoImportVo
excel
;
TGzOfferInfoImportVo
excel
;
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzOfferInfoMapper.xml
View file @
3ea592db
...
@@ -149,12 +149,6 @@
...
@@ -149,12 +149,6 @@
<if
test=
"tGzOfferInfo.updateTime != null"
>
<if
test=
"tGzOfferInfo.updateTime != null"
>
AND a.update_time = #{tGzOfferInfo.updateTime}
AND a.update_time = #{tGzOfferInfo.updateTime}
</if>
</if>
<if
test=
"tGzOfferInfo.empType != null and tGzOfferInfo.empType.trim() != ''"
>
AND a.emp_type = #{tGzOfferInfo.empType}
</if>
<if
test=
"tGzOfferInfo.empTypeDescr != null and tGzOfferInfo.empTypeDescr.trim() != ''"
>
AND a.emp_type_descr = #{tGzOfferInfo.empTypeDescr}
</if>
<if
test=
"tGzOfferInfo.outSginType != null and tGzOfferInfo.outSginType.trim() != ''"
>
<if
test=
"tGzOfferInfo.outSginType != null and tGzOfferInfo.outSginType.trim() != ''"
>
AND a.out_sgin_type = #{tGzOfferInfo.outSginType}
AND a.out_sgin_type = #{tGzOfferInfo.outSginType}
</if>
</if>
...
@@ -315,8 +309,8 @@
...
@@ -315,8 +309,8 @@
a.offer_send_status,
a.offer_send_status,
a.update_by,
a.update_by,
a.update_time,
a.update_time,
a.emp_type,
a.emp
l
_type,
a.emp_type_descr,
a.emp
l
_type_descr,
a.out_sgin_type,
a.out_sgin_type,
a.company,
a.company,
a.name,
a.name,
...
...
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