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
e9ae216c
Commit
e9ae216c
authored
Dec 25, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.18' into MVP1.7.18
parents
701568d4
58b0b3e4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
15 deletions
+18
-15
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1
-9
TSocialFriendPushServiceImpl.java
...ifu/social/service/impl/TSocialFriendPushServiceImpl.java
+12
-4
ExcelToImage.java
...com/yifu/cloud/plus/v1/yifu/social/util/ExcelToImage.java
+3
-0
RandomFontStyleUtil.java
...u/cloud/plus/v1/yifu/social/util/RandomFontStyleUtil.java
+2
-2
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
e9ae216c
...
...
@@ -2141,15 +2141,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialBases
.
clear
();
}
if
(
Common
.
isNotNull
(
fundHolds
))
{
List
<
SysBaseSetInfo
>
fundBases
=
baseSetMapper
.
selectList
(
Wrappers
.<
SysBaseSetInfo
>
query
().
lambda
()
.
eq
(
SysBaseSetInfo:
:
getBaseType
,
CommonConstants
.
ONE_STRING
)
.
le
(
SysBaseSetInfo:
:
getApplyStartDate
,
now
)
.
in
(
SysBaseSetInfo:
:
getDepartName
,
fundHolds
)
.
eq
(
SysBaseSetInfo:
:
getStatus
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysBaseSetInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
and
(
obj
->
obj
.
isNull
(
SysBaseSetInfo:
:
getApplyEndDate
).
or
().
ge
(
SysBaseSetInfo:
:
getApplyEndDate
,
now
))
.
groupBy
(
SysBaseSetInfo:
:
getDepartName
));
//baseSetMapper.getFundBaseSet(fundHolds);
List
<
SysBaseSetInfo
>
fundBases
=
baseSetMapper
.
getFundBaseSet
(
fundHolds
);
if
(
Common
.
isNotNull
(
fundBases
))
{
for
(
SysBaseSetInfo
set
:
fundBases
)
{
fundHoldMap
.
put
(
set
.
getDepartName
(),
set
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
View file @
e9ae216c
...
...
@@ -1363,6 +1363,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
String
cellValue
;
String
key
;
String
newValue
;
String
[]
qianMingArr
;
for
(
Row
row
:
sheet
)
{
for
(
Cell
cell
:
row
)
{
if
(
cell
.
getCellType
()
==
CellType
.
STRING
)
{
...
...
@@ -1370,11 +1371,18 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
if
(
cellValue
.
startsWith
(
"${"
)
&&
cellValue
.
endsWith
(
"}"
))
{
// 正常的主表的单元格的占位,类似"${empName}"
key
=
cellValue
.
substring
(
2
,
cellValue
.
length
()
-
1
);
newValue
=
getFieldValue
(
vo
,
key
);
if
(!
CommonConstants
.
QIAN_MING
.
equals
(
key
))
{
cell
.
setCellValue
(
newValue
);
}
else
{
if
(
key
.
contains
(
CommonConstants
.
QIAN_MING
))
{
qianMingArr
=
key
.
split
(
"&"
);
if
(
qianMingArr
.
length
>
1
)
{
key
=
qianMingArr
[
1
];
}
else
{
key
=
"empName"
;
}
newValue
=
getFieldValue
(
vo
,
key
);
setQianMingStyle
(
cell
,
newValue
);
}
else
{
newValue
=
getFieldValue
(
vo
,
key
);
cell
.
setCellValue
(
newValue
);
}
}
else
if
(
containsPlaceholder
(
cellValue
))
{
// 非正常的主表的单元格的占位,类似"经办人:${empName} 单位名称${unitName}"
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/ExcelToImage.java
View file @
e9ae216c
...
...
@@ -162,6 +162,9 @@ public class ExcelToImage {
int
targetHeight
=
200
;
// 高度
// 创建缩放后的公章图像
if
(
seal
==
null
)
{
return
image
;
}
Image
scaledSeal
=
seal
.
getScaledInstance
(
targetWidth
,
targetHeight
,
Image
.
SCALE_SMOOTH
);
BufferedImage
resizedSeal
=
new
BufferedImage
(
targetWidth
,
targetHeight
,
BufferedImage
.
TYPE_INT_ARGB
);
Graphics2D
g2d
=
resizedSeal
.
createGraphics
();
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/RandomFontStyleUtil.java
View file @
e9ae216c
...
...
@@ -58,10 +58,10 @@ public class RandomFontStyleUtil {
cellStyle
.
setFont
(
font
);
//设置单元格边框样式
cellStyle
.
setBorderTop
(
BorderStyle
.
THIN
);
/*
cellStyle.setBorderTop(BorderStyle.THIN);
cellStyle.setBorderBottom(BorderStyle.THIN);
cellStyle.setBorderLeft(BorderStyle.THIN);
cellStyle
.
setBorderRight
(
BorderStyle
.
THIN
);
cellStyle.setBorderRight(BorderStyle.THIN);
*/
cell
.
setCellStyle
(
cellStyle
);
cell
.
setCellValue
(
value
);
...
...
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