Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-fb
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王衍超
cloud-fb
Commits
8574d8ee
Commit
8574d8ee
authored
May 11, 2021
by
shiwenbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改合同中对场站的关联
parent
2536052c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 additions
and
5 deletions
+1
-5
ContractServiceImpl.java
.../dinas/contract/internal/service/ContractServiceImpl.java
+0
-3
ContractPerformWarningProcessor.java
...ract/query/processor/ContractPerformWarningProcessor.java
+0
-1
ProjectQueryView.jmx
...rces/com/xyst/dinas/sales/advanquery/ProjectQueryView.jmx
+1
-1
No files found.
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java
View file @
8574d8ee
...
...
@@ -291,15 +291,12 @@ public class ContractServiceImpl implements ContractService {
UUID
regionalCompanyId
=
regionalCompany
!=
null
?
regionalCompany
.
getUuid
(
"id"
):
emptyUUID
;
String
purchaseSandUnitName
=
contract
.
get
(
"purchaseSandUnit"
).
getString
(
"name"
);
String
contractName
=
contract
.
getString
(
"contractName"
);
KObject
station
=
contract
.
get
(
"station"
);
UUID
stationId
=
station
!=
null
?
station
.
getUuid
(
"id"
):
emptyUUID
;
//
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"contractName"
,
contractName
);
jsonObject
.
put
(
"projectName"
,
projectName
);
jsonObject
.
put
(
"purchaseSandUnitName"
,
purchaseSandUnitName
);
jsonObject
.
put
(
"regionalCompanyId"
,
regionalCompanyId
.
toString
());
jsonObject
.
put
(
"stationId"
,
stationId
.
toString
());
jsonObject
.
put
(
"contractId"
,
contract
.
getUuid
(
"id"
));
jsonObject
.
put
(
"projectId"
,
project
.
getUuid
(
"id"
));
jsonObject
.
put
(
"purchaseSandUnitId"
,
contract
.
get
(
"purchaseSandUnit"
).
getUuid
(
"id"
));
...
...
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/query/processor/ContractPerformWarningProcessor.java
View file @
8574d8ee
...
...
@@ -30,7 +30,6 @@ public class ContractPerformWarningProcessor implements DataProcessor {
row
.
put
(
"purchaseSandUnitName"
,
purchaseSandUnitName
);
//contract.getString("purchaseSandUnitName")
//KObject warnSetting = row.get("warnSetting");
row
.
put
(
"regionalCompanyName"
,
contract
.
getString
(
"regionalCompanyName"
));
row
.
put
(
"stationName"
,
contract
.
isNull
(
"station"
)
?
""
:
contract
.
get
(
"station"
).
getString
(
"stationName"
));
}
}
}
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/ProjectQueryView.jmx
View file @
8574d8ee
...
...
@@ -50,7 +50,7 @@
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize":
20
0,
"pageSize":
1
0,
"orders":[
],
...
...
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