Commit fd15251c authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents 353df967 23a62273
......@@ -223,6 +223,8 @@ public class TGzEmpInfoExportMain implements Serializable {
// 日期格式化
@ExcelProperty("预计转正日期")
private String probationDt;
@ExcelAttribute(name = "合同签署主体", isDataId = true, readConverterExp = "V59=安徽皖信人力资源管理有限公司")
@ExcelProperty("合同签署主体")
private String neeProviderId;
@ExcelProperty("合同工作地")
......
......@@ -456,7 +456,7 @@
a.national_id,
a.persist_flag,
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.mail,
a.address_type,
......
......@@ -9,14 +9,17 @@ ARG JAR_FILE=target/yifu-social-biz.jar
COPY ${JAR_FILE} app.jar
## 解决使用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
#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/
##end
EXPOSE 5002
......
#!/usr/bin/env bash
DOCKER_BUILDKIT=1 mvn clean package -Ptest -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file
mvn clean package -Ptest -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment