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
e0a5670c
Commit
e0a5670c
authored
Nov 28, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.2' into MVP1.7.2
parents
17ccdafb
5c452624
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
TMainExportAllVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/TMainExportAllVO.java
+2
-0
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+1
-7
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+1
-1
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+6
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TMainExportAllVO.java
View file @
e0a5670c
...
@@ -97,6 +97,8 @@ public class TMainExportAllVO {
...
@@ -97,6 +97,8 @@ public class TMainExportAllVO {
private
String
field23
;
private
String
field23
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"项目名称"
)
@ExcelAttribute
(
needExport
=
true
,
name
=
"项目名称"
)
private
String
field24
;
private
String
field24
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"项目编码"
)
private
String
field64
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"业务类型"
)
@ExcelAttribute
(
needExport
=
true
,
name
=
"业务类型"
)
private
String
field25
;
private
String
field25
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"合同类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
PERSONNEL_TYPE
)
@ExcelAttribute
(
needExport
=
true
,
name
=
"合同类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
PERSONNEL_TYPE
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
e0a5670c
...
@@ -352,13 +352,6 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -352,13 +352,6 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
response
.
setHeader
(
CommonConstants
.
CONTENT_DISPOSITION
,
CommonConstants
.
ATTACHMENT_FILENAME
+
URLEncoder
.
encode
(
fileName
,
CommonConstants
.
UTF8
));
response
.
setHeader
(
CommonConstants
.
CONTENT_DISPOSITION
,
CommonConstants
.
ATTACHMENT_FILENAME
+
URLEncoder
.
encode
(
fileName
,
CommonConstants
.
UTF8
));
ExcelWriter
excelWriter
=
null
;
ExcelWriter
excelWriter
=
null
;
if
(
count
>
200000
)
{
if
(
count
>
200000
)
{
//if (count > CommonConstants.EXCEL_EXPORT_LIMIT)
/*List<List<String>> strList = new ArrayList<>();
strList.add(this.getNewArrayList(new String[]{"数据超过20万条,请联系管理员后端导出!"}));
List<List<String>> headList = Lists.newArrayList();
headList.add(this.getNewArrayList(new String[]{"提示"}));
EasyExcelFactory.write(out).head(headList).sheet("数据超限")
.registerConverter(new DictConverter(null, null)).doWrite(strList);*/
exportError
(
response
,
"数据超过20万条,请联系管理员后端导出"
);
exportError
(
response
,
"数据超过20万条,请联系管理员后端导出"
);
}
else
{
}
else
{
exportLimit
.
setDeleteFlag
(
CommonConstants
.
ZERO_INT
);
exportLimit
.
setDeleteFlag
(
CommonConstants
.
ZERO_INT
);
...
@@ -398,6 +391,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -398,6 +391,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
oneTitle
=
"在项信息"
;
oneTitle
=
"在项信息"
;
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"客户名称"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"客户名称"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"项目名称"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"项目名称"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"项目编码"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"业务类型"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"业务类型"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"合同类型"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"合同类型"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"工时制"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"工时制"
}));
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
e0a5670c
...
@@ -346,7 +346,7 @@
...
@@ -346,7 +346,7 @@
,e.POLITICAL_STATUS field15,e.EMP_PHONE field16,e.EMP_EMAIL field17
,e.POLITICAL_STATUS field15,e.EMP_PHONE field16,e.EMP_EMAIL field17
,e.ID_PROVINCE field18,e.ID_CITY field69,e.ID_TOWN field70,e.ID_PROVINCE field18,e.EMP_REGIS_TYPE field19
,e.ID_PROVINCE field18,e.ID_CITY field69,e.ID_TOWN field70,e.ID_PROVINCE field18,e.EMP_REGIS_TYPE field19
,e.FILE_PROVINCE field20,e.FILE_CITY field71,e.FILE_TOWN field72,if(e.status=0,'草稿','已审核') field21
,e.FILE_PROVINCE field20,e.FILE_CITY field71,e.FILE_TOWN field72,if(e.status=0,'草稿','已审核') field21
,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24
,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24
,p.DEPT_NO field64
,concat(p.BUSINESS_PRIMARY_TYPE,'-',ifnull(p.BUSINESS_SECOND_TYPE,''),'-',ifnull(p.BUSINESS_THIRD_TYPE,'')) field25
,concat(p.BUSINESS_PRIMARY_TYPE,'-',ifnull(p.BUSINESS_SECOND_TYPE,''),'-',ifnull(p.BUSINESS_THIRD_TYPE,'')) field25
,p.EMP_LABEL field31
,p.EMP_LABEL field31
,ec.EMP_NAME field32,ec.RELATION_TYPE field33,ec.ADDRESS field34,ec.TEL field35
,ec.EMP_NAME field32,ec.RELATION_TYPE field33,ec.ADDRESS field34,ec.TEL field35
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
e0a5670c
...
@@ -141,8 +141,12 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -141,8 +141,12 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
log
.
info
(
"开始推昨日新增网银到账明细条数"
);
log
.
info
(
"开始推昨日新增网银到账明细条数"
);
String
tranDate
=
DateUtil
.
addDay
(-
1
).
replace
(
"-"
,
""
);
String
tranDate
=
DateUtil
.
addDay
(-
1
).
replace
(
"-"
,
""
);
String
beginDate
=
tranDate
;
// todo 原代码
String
endDate
=
tranDate
;
//String beginDate = tranDate;
//String endDate = tranDate;
String
beginDate
=
"20241122"
;
String
endDate
=
"20241122"
;
return
getIcbcTransactionFlowCommon
(
tranDate
,
beginDate
,
endDate
);
return
getIcbcTransactionFlowCommon
(
tranDate
,
beginDate
,
endDate
);
}
}
...
...
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