Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
2f341d35
提交
2f341d35
authored
5月 11, 2022
作者:
zjm
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(单位模版生成): 修改部件名字计算逻辑的问题
修改部件名字计算逻辑的问题
上级
030b2610
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
5 行增加
和
5 行删除
+5
-5
JavaToPdfHtmlFreeMarker.java
...om/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
+5
-5
没有找到文件。
dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
浏览文件 @
2f341d35
...
@@ -326,7 +326,7 @@ public class JavaToPdfHtmlFreeMarker {
...
@@ -326,7 +326,7 @@ public class JavaToPdfHtmlFreeMarker {
String
s
=
String
.
join
(
""
,
toListString
(
documentDevice
.
getDeviceSerialNumber
(),
56
));
String
s
=
String
.
join
(
""
,
toListString
(
documentDevice
.
getDeviceSerialNumber
(),
56
));
documentDevice
.
setOneCount
(
max
);
documentDevice
.
setOneCount
(
max
);
documentDevice
.
setModel
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getModel
(),
13
)));
documentDevice
.
setModel
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getModel
(),
13
)));
documentDevice
.
setParts
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getParts
(),
1
3
)));
documentDevice
.
setParts
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getParts
(),
1
2
)));
documentDevice
.
setRemark
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getRemark
(),
12
)));
documentDevice
.
setRemark
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getRemark
(),
12
)));
documentDevice
.
setDeviceSerialNumber
(
s
);
documentDevice
.
setDeviceSerialNumber
(
s
);
code
++;
code
++;
...
@@ -340,7 +340,7 @@ public class JavaToPdfHtmlFreeMarker {
...
@@ -340,7 +340,7 @@ public class JavaToPdfHtmlFreeMarker {
int
differ
=
14
-
i
;
int
differ
=
14
-
i
;
List
<
String
>
modelList
=
toListString
(
documentDevice
.
getModel
(),
13
);
List
<
String
>
modelList
=
toListString
(
documentDevice
.
getModel
(),
13
);
List
<
String
>
seqList
=
toListString
(
documentDevice
.
getDeviceSerialNumber
(),
56
);
List
<
String
>
seqList
=
toListString
(
documentDevice
.
getDeviceSerialNumber
(),
56
);
List
<
String
>
pasList
=
toListString
(
documentDevice
.
getParts
(),
1
3
);
List
<
String
>
pasList
=
toListString
(
documentDevice
.
getParts
(),
1
2
);
List
<
String
>
remarkList
=
toListString
(
documentDevice
.
getRemark
(),
12
);
List
<
String
>
remarkList
=
toListString
(
documentDevice
.
getRemark
(),
12
);
DocumentDevice
documentDevice1
=
new
DocumentDevice
();
DocumentDevice
documentDevice1
=
new
DocumentDevice
();
if
(
modelList
.
size
()>
differ
){
if
(
modelList
.
size
()>
differ
){
...
@@ -385,7 +385,7 @@ public class JavaToPdfHtmlFreeMarker {
...
@@ -385,7 +385,7 @@ public class JavaToPdfHtmlFreeMarker {
code
++;
code
++;
documentDevice
.
setCode
(
code
);
documentDevice
.
setCode
(
code
);
documentDevice
.
setModel
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getModel
(),
13
)));
documentDevice
.
setModel
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getModel
(),
13
)));
documentDevice
.
setParts
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getParts
(),
1
3
)));
documentDevice
.
setParts
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getParts
(),
1
2
)));
documentDevice
.
setRemark
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getRemark
(),
12
)));
documentDevice
.
setRemark
(
String
.
join
(
""
,
toListString
(
documentDevice
.
getRemark
(),
12
)));
documentDevice
.
setOneCount
(
max
);
documentDevice
.
setOneCount
(
max
);
documentDevice
.
setDeviceSerialNumber
(
s
);
documentDevice
.
setDeviceSerialNumber
(
s
);
...
@@ -406,7 +406,7 @@ public class JavaToPdfHtmlFreeMarker {
...
@@ -406,7 +406,7 @@ public class JavaToPdfHtmlFreeMarker {
int
deviceSerialNumberCount
=
String_length
(
documentDevice
.
getDeviceSerialNumber
());
int
deviceSerialNumberCount
=
String_length
(
documentDevice
.
getDeviceSerialNumber
());
int
modelCount
=
String_length
(
documentDevice
.
getModel
());
int
modelCount
=
String_length
(
documentDevice
.
getModel
());
int
remarkCount
=
String_length
(
documentDevice
.
getRemark
());
int
remarkCount
=
String_length
(
documentDevice
.
getRemark
());
int
parts
=
(
partsCount
%
1
3
>
0
)
?
partsCount
/
13
+
1
:
partsCount
/
13
;
int
parts
=
(
partsCount
%
1
2
>
0
)
?
partsCount
/
12
+
1
:
partsCount
/
12
;
int
deviceSerialNumber
=(
deviceSerialNumberCount
%
56
>
0
)
?
deviceSerialNumberCount
/
56
+
1
:
deviceSerialNumberCount
/
56
;
int
deviceSerialNumber
=(
deviceSerialNumberCount
%
56
>
0
)
?
deviceSerialNumberCount
/
56
+
1
:
deviceSerialNumberCount
/
56
;
int
model
=(
modelCount
%
13
>
0
)
?
modelCount
/
13
+
1
:
modelCount
/
13
;
int
model
=(
modelCount
%
13
>
0
)
?
modelCount
/
13
+
1
:
modelCount
/
13
;
int
remark
=(
remarkCount
%
12
>
0
)
?
remarkCount
/
12
+
1
:
remarkCount
/
12
;
int
remark
=(
remarkCount
%
12
>
0
)
?
remarkCount
/
12
+
1
:
remarkCount
/
12
;
...
@@ -787,7 +787,7 @@ public class JavaToPdfHtmlFreeMarker {
...
@@ -787,7 +787,7 @@ public class JavaToPdfHtmlFreeMarker {
int
differ
=
14
-
i
;
int
differ
=
14
-
i
;
List
<
String
>
modelList
=
toListString
(
documentDevice
.
getModel
(),
13
);
List
<
String
>
modelList
=
toListString
(
documentDevice
.
getModel
(),
13
);
List
<
String
>
seqList
=
toListString
(
documentDevice
.
getDeviceSerialNumber
(),
56
);
List
<
String
>
seqList
=
toListString
(
documentDevice
.
getDeviceSerialNumber
(),
56
);
List
<
String
>
pasList
=
toListString
(
documentDevice
.
getParts
(),
1
3
);
List
<
String
>
pasList
=
toListString
(
documentDevice
.
getParts
(),
1
2
);
DocumentDevice
documentDevice1
=
new
DocumentDevice
();
DocumentDevice
documentDevice1
=
new
DocumentDevice
();
if
(
modelList
.
size
()>
differ
){
if
(
modelList
.
size
()>
differ
){
documentDevice
.
setModel
(
String
.
join
(
""
,
modelList
.
subList
(
0
,
differ
)));
documentDevice
.
setModel
(
String
.
join
(
""
,
modelList
.
subList
(
0
,
differ
)));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论