Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-plan
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
INET-TWO
server
dcs-plan
Commits
c3878359
Commit
c3878359
authored
Oct 13, 2024
by
wei
🎱
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
打点日志
parent
bcda1bb6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
16 deletions
+2
-16
ExpenditureContractUtils.java
...yonde/dcs/plan/core/factory/ExpenditureContractUtils.java
+1
-15
InComeContractUtils.java
.../com/yonde/dcs/plan/core/factory/InComeContractUtils.java
+1
-1
No files found.
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/factory/ExpenditureContractUtils.java
View file @
c3878359
...
@@ -55,20 +55,6 @@ public class ExpenditureContractUtils {
...
@@ -55,20 +55,6 @@ public class ExpenditureContractUtils {
/*String projectCode = ObjectUtils.isEmpty(v.getDxDocumentExpand().getProjectCode()) ? "" : v.getDxDocumentExpand().getProjectCode();
/*String projectCode = ObjectUtils.isEmpty(v.getDxDocumentExpand().getProjectCode()) ? "" : v.getDxDocumentExpand().getProjectCode();
jsonObject.put("projectCode", extDocService.searchDictDataByDictCode(Constants.PROJECT_CODE, projectCode));
jsonObject.put("projectCode", extDocService.searchDictDataByDictCode(Constants.PROJECT_CODE, projectCode));
jsonObject.put("projectCode", projectCode);*/
jsonObject.put("projectCode", projectCode);*/
//合同名称
//合同乙方
//合同编号
//合同金额
//合同密级
//合同乙方保密资质等级
//合同类型
//学校/院归口管理部门
//合同成果形式
//成果交付地点(样机存放地方)
//起止时间
//承办部门
//经办人
//
//页数
//页数
//jsonObject.put("pages",v.getDxDocumentExpand().getAttachPages());
//jsonObject.put("pages",v.getDxDocumentExpand().getAttachPages());
...
@@ -81,7 +67,7 @@ public class ExpenditureContractUtils {
...
@@ -81,7 +67,7 @@ public class ExpenditureContractUtils {
jsonObject
.
put
(
"bz_comments"
,
extExpenditureContractService
.
getComments
(
activities
,
SignConstants
.
SIGN_KEY_BZ
));
jsonObject
.
put
(
"bz_comments"
,
extExpenditureContractService
.
getComments
(
activities
,
SignConstants
.
SIGN_KEY_BZ
));
}
}
log
.
info
(
"settingDocData.jsonObject:{}"
,
jsonObject
.
toString
());
log
.
info
(
"
ExpenditureContractUtils.
settingDocData.jsonObject:{}"
,
jsonObject
.
toString
());
//模板名称
//模板名称
importWordService
.
getWordAllTable
(
jsonObject
,
path
+
file
+
".docx"
,
outFilePath
+
"outFile.docx"
);
importWordService
.
getWordAllTable
(
jsonObject
,
path
+
file
+
".docx"
,
outFilePath
+
"outFile.docx"
);
return
jsonObject
;
return
jsonObject
;
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/factory/InComeContractUtils.java
View file @
c3878359
...
@@ -88,7 +88,7 @@ public class InComeContractUtils {
...
@@ -88,7 +88,7 @@ public class InComeContractUtils {
jsonObject
.
put
(
"xmzgyld_date"
,
extExpenditureContractService
.
getEndDate
(
activities
,
SignConstants
.
SIGN_KEY_XMZGYLD_IN_COME_CONTRACT
));
jsonObject
.
put
(
"xmzgyld_date"
,
extExpenditureContractService
.
getEndDate
(
activities
,
SignConstants
.
SIGN_KEY_XMZGYLD_IN_COME_CONTRACT
));
jsonObject
.
put
(
"xmzgyld_comments"
,
extExpenditureContractService
.
getComments
(
activities
,
SignConstants
.
SIGN_KEY_XMZGYLD_IN_COME_CONTRACT
));
jsonObject
.
put
(
"xmzgyld_comments"
,
extExpenditureContractService
.
getComments
(
activities
,
SignConstants
.
SIGN_KEY_XMZGYLD_IN_COME_CONTRACT
));
}
}
log
.
info
(
"settingDocData.jsonObject:{}"
,
jsonObject
.
toString
());
log
.
info
(
"
InComeContractUtils.
settingDocData.jsonObject:{}"
,
jsonObject
.
toString
());
//模板名称
//模板名称
importWordService
.
getWordAllTable
(
jsonObject
,
path
+
file
+
".docx"
,
outFilePath
+
"outFile.docx"
);
importWordService
.
getWordAllTable
(
jsonObject
,
path
+
file
+
".docx"
,
outFilePath
+
"outFile.docx"
);
return
jsonObject
;
return
jsonObject
;
...
...
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