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
a7e52580
Commit
a7e52580
authored
Oct 14, 2024
by
wei
🎱
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
该对象不是已发布状态
parent
c3878359
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
ExpenditureContractUtils.java
...yonde/dcs/plan/core/factory/ExpenditureContractUtils.java
+2
-0
InComeContractUtils.java
.../com/yonde/dcs/plan/core/factory/InComeContractUtils.java
+0
-1
ExtSupplierManageServiceImpl.java
.../plan/core/service/impl/ExtSupplierManageServiceImpl.java
+1
-1
No files found.
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/factory/ExpenditureContractUtils.java
View file @
a7e52580
...
@@ -51,6 +51,8 @@ public class ExpenditureContractUtils {
...
@@ -51,6 +51,8 @@ public class ExpenditureContractUtils {
String designPhase = Objects.isNull(dynamicAttrs.get("designPhase")) ? "" : (String) dynamicAttrs.get("designPhase");*/
String designPhase = Objects.isNull(dynamicAttrs.get("designPhase")) ? "" : (String) dynamicAttrs.get("designPhase");*/
JSONObject
jsonObject
=
(
JSONObject
)
JSONObject
.
toJSON
(
expenditureContractVO
);
JSONObject
jsonObject
=
(
JSONObject
)
JSONObject
.
toJSON
(
expenditureContractVO
);
jsonObject
.
put
(
"agree"
,
"☑"
);
jsonObject
.
put
(
"reject"
,
"□"
);
//项目代号
//项目代号
/*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));
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/factory/InComeContractUtils.java
View file @
a7e52580
...
@@ -51,7 +51,6 @@ public class InComeContractUtils {
...
@@ -51,7 +51,6 @@ public class InComeContractUtils {
FileUtil
.
mkdir
(
outFilePath
);
FileUtil
.
mkdir
(
outFilePath
);
JSONObject
jsonObject
=
(
JSONObject
)
JSONObject
.
toJSON
(
inComeContractVO
);
JSONObject
jsonObject
=
(
JSONObject
)
JSONObject
.
toJSON
(
inComeContractVO
);
//获取参与者
//获取参与者
List
<
DxWfProcessTaskVO
>
activities
=
wfProcessInfoVO
.
getHistoryInfo
();
List
<
DxWfProcessTaskVO
>
activities
=
wfProcessInfoVO
.
getHistoryInfo
();
if
(!
CollectionUtils
.
isEmpty
(
activities
))
{
if
(!
CollectionUtils
.
isEmpty
(
activities
))
{
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtSupplierManageServiceImpl.java
View file @
a7e52580
...
@@ -159,7 +159,7 @@ public class ExtSupplierManageServiceImpl<V extends ExtSupplierManageVO> impleme
...
@@ -159,7 +159,7 @@ public class ExtSupplierManageServiceImpl<V extends ExtSupplierManageVO> impleme
throw
new
DxBusinessException
(
"500"
,
"获取不到对象"
);
throw
new
DxBusinessException
(
"500"
,
"获取不到对象"
);
}
}
if
(!
extSupplierManageVO
.
getState
().
equals
(
Constants
.
RELEASE
))
{
if
(!
extSupplierManageVO
.
getState
().
equals
(
Constants
.
RELEASE
))
{
throw
new
DxBusinessException
(
"500"
,
"该对象不是
编制
状态"
);
throw
new
DxBusinessException
(
"500"
,
"该对象不是
已发布
状态"
);
}
}
return
this
.
changeStatus
(
extSupplierManageVO
.
getId
(),
Constants
.
CONTEXT_DISABLE
,
true
);
return
this
.
changeStatus
(
extSupplierManageVO
.
getId
(),
Constants
.
CONTEXT_DISABLE
,
true
);
}
}
...
...
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