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
fd15251c
Commit
fd15251c
authored
Jun 25, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
353df967
23a62273
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
TGzEmpInfoExportMain.java
.../cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
+2
-0
TGzEmpInfoMapper.xml
...chives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
+1
-1
Dockerfile
yifu-social/yifu-social-biz/Dockerfile
+7
-4
build-test.sh
yifu-social/yifu-social-biz/build-test.sh
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
View file @
fd15251c
...
@@ -223,6 +223,8 @@ public class TGzEmpInfoExportMain implements Serializable {
...
@@ -223,6 +223,8 @@ public class TGzEmpInfoExportMain implements Serializable {
// 日期格式化
// 日期格式化
@ExcelProperty
(
"预计转正日期"
)
@ExcelProperty
(
"预计转正日期"
)
private
String
probationDt
;
private
String
probationDt
;
@ExcelAttribute
(
name
=
"合同签署主体"
,
isDataId
=
true
,
readConverterExp
=
"V59=安徽皖信人力资源管理有限公司"
)
@ExcelProperty
(
"合同签署主体"
)
@ExcelProperty
(
"合同签署主体"
)
private
String
neeProviderId
;
private
String
neeProviderId
;
@ExcelProperty
(
"合同工作地"
)
@ExcelProperty
(
"合同工作地"
)
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
View file @
fd15251c
...
@@ -456,7 +456,7 @@
...
@@ -456,7 +456,7 @@
a.national_id,
a.national_id,
a.persist_flag,
a.persist_flag,
date_format(a.nid_start_date, '%Y-%m-%d') nid_start_date,
date_format(a.nid_start_date, '%Y-%m-%d') nid_start_date,
date_format(a.nid_expiry_date, '%Y-%m-%d'
) nid_expiry_date,
if ( a.nid_expiry_date = '9999-12-31', '长期', date_format(a.nid_expiry_date, '%Y-%m-%d')
) nid_expiry_date,
a.phone,
a.phone,
a.mail,
a.mail,
a.address_type,
a.address_type,
...
...
yifu-social/yifu-social-biz/Dockerfile
View file @
fd15251c
...
@@ -9,14 +9,17 @@ ARG JAR_FILE=target/yifu-social-biz.jar
...
@@ -9,14 +9,17 @@ ARG JAR_FILE=target/yifu-social-biz.jar
COPY
${JAR_FILE} app.jar
COPY
${JAR_FILE} app.jar
## 解决使用excel工具转png docker乱码没有宋体
## 解决使用excel工具转png docker乱码没有宋体
# 使用缓存安装 fontconfig hgw 20250625
#RUN --mount=type=cache,target=/var/cache/apk set -xe && apk --no-cache add fontconfig
#RUN set -xe && apk --no-cache add fontconfig
#RUN set -xe && apk --no-cache add fontconfig
#COPY simsun.ttc /usr/share/fonts/
# 先安装字体包(单独作为一层)
RUN
apk add
--update
fontconfig
&&
\
rm
-rf
/var/cache/apk/
*
# 使用缓存安装 fontconfig hgw 20250625
# 后添加字体文件(变更频率高的操作放后面)
RUN
--mount
=
type
=
cache,target
=
/var/cache/apk
set
-xe
&&
apk
--no-cache
add fontconfig
# 添加宋体(仅在 simsun.ttc 变更时重新复制)
COPY
simsun.ttc /usr/share/fonts/
COPY
simsun.ttc /usr/share/fonts/
##end
##end
EXPOSE
5002
EXPOSE
5002
...
...
yifu-social/yifu-social-biz/build-test.sh
View file @
fd15251c
#!/usr/bin/env bash
#!/usr/bin/env bash
DOCKER_BUILDKIT
=
1 mvn clean package
-Ptest
-Dmaven
.test.skip
=
true
docker:build
-DpushImage
mvn clean package
-Ptest
-Dmaven
.test.skip
=
true
docker:build
-DpushImage
\ No newline at end of file
\ No newline at end of file
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