Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zjsgfa_mysql
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jiangyun
zjsgfa_mysql
Commits
5a3fba48
Commit
5a3fba48
authored
Apr 07, 2026
by
MMF
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MMF 2026-04-07 钻井液导出增加区域信息内容
parent
32b1099c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
0 deletions
+22
-0
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java
+9
-0
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjJkzpServiceImpl.java
+13
-0
No files found.
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java
View file @
5a3fba48
...
...
@@ -2598,6 +2598,9 @@ public class SjDjjcController extends BaseController {
.
bind
(
"sjFdsgcsZjyFdxnbList"
,
policyCol
)
//列策略
.
bind
(
"gcfzqk"
,
htmlRenderPolicy
)
//列策略
.
bind
(
"zjyfzqk"
,
htmlRenderPolicy
)
//列策略
.
bind
(
"ljzsqqk"
,
htmlRenderPolicy
)
//富文本策略
.
bind
(
"fjdzjyxn_t"
,
htmlRenderPolicy
)
//富文本策略
.
bind
(
"fjdzjytx"
,
htmlRenderPolicy
)
//富文本策略
.
build
();
XWPFTemplate
compile
=
XWPFTemplate
.
compile
(
in
,
config
);
// 加载模板并填充数据
...
...
@@ -3057,6 +3060,9 @@ public class SjDjjcController extends BaseController {
dataModel
.
put
(
"fjdcljdjl"
,
sjJkzp1
.
getFjdcljdjl
());
dataModel
.
put
(
"fjdzjywhycl"
,
sjJkzp1
.
getFjdzjywhycl
());
dataModel
.
put
(
"qtyq"
,
sjJkzp1
.
getQtyq
());
dataModel
.
put
(
"ljzsqqk"
,
sjJkzp1
.
getLjzsqqk
());
dataModel
.
put
(
"fjdzjyxn_t"
,
sjJkzp1
.
getFjdzjyxn_t
());
dataModel
.
put
(
"fjdzjytx"
,
sjJkzp1
.
getFjdzjytx
());
}
else
{
dataModel
.
put
(
"zjkzz"
,
sjJkzp
.
getZjkzz
());
...
...
@@ -3076,6 +3082,9 @@ public class SjDjjcController extends BaseController {
dataModel
.
put
(
"fjdcljdjl"
,
sjJkzp
.
getFjdcljdjl
());
dataModel
.
put
(
"fjdzjywhycl"
,
sjJkzp
.
getFjdzjywhycl
());
dataModel
.
put
(
"qtyq"
,
sjJkzp
.
getQtyq
());
dataModel
.
put
(
"ljzsqqk"
,
sjJkzp
.
getLjzsqqk
());
dataModel
.
put
(
"fjdzjyxn_t"
,
sjJkzp
.
getFjdzjyxn_t
());
dataModel
.
put
(
"fjdzjytx"
,
sjJkzp
.
getFjdzjytx
());
}
SjHse
sjHse
=
new
SjHse
();
sjHse
.
setJh
(
jh
);
...
...
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjJkzpServiceImpl.java
View file @
5a3fba48
...
...
@@ -332,6 +332,19 @@ public class SjJkzpServiceImpl implements ISjJkzpService
if
(
StringUtils
.
isNotEmpty
(
sjJkzp
.
getQtyq
())){
sjJkzp
.
setQtyq
(
new
String
(
Base64
.
decode
(
sjJkzp
.
getQtyq
()),
StandardCharsets
.
UTF_8
));
}
if
(
StringUtils
.
isNotEmpty
(
sjJkzp
.
getLjzsqqk
()))
{
sjJkzp
.
setLjzsqqk
(
new
String
(
Base64
.
decode
(
sjJkzp
.
getLjzsqqk
()),
StandardCharsets
.
UTF_8
));
}
if
(
StringUtils
.
isNotEmpty
(
sjJkzp
.
getFjdzjyxn_t
()))
{
sjJkzp
.
setFjdzjyxn_t
(
new
String
(
Base64
.
decode
(
sjJkzp
.
getFjdzjyxn_t
()),
StandardCharsets
.
UTF_8
));
}
if
(
StringUtils
.
isNotEmpty
(
sjJkzp
.
getFjdzjytx
()))
{
sjJkzp
.
setFjdzjytx
(
new
String
(
Base64
.
decode
(
sjJkzp
.
getFjdzjytx
()),
StandardCharsets
.
UTF_8
));
}
sjJkzp
.
setUpdateTime
(
DateUtils
.
getNowDate
());
return
sjJkzpMapper
.
updateSjJkzp
(
sjJkzp
);
}
...
...
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