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
2803b252
Commit
2803b252
authored
Jun 11, 2021
by
shiwenbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同增加service接口
parent
9a565898
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletions
+13
-1
ContractServiceImpl.java
.../dinas/contract/internal/service/ContractServiceImpl.java
+10
-0
ContractWarnSettingProcessor.java
...ontract/query/processor/ContractWarnSettingProcessor.java
+1
-1
ContractService.java
...java/com/xyst/dinas/contract/service/ContractService.java
+2
-0
No files found.
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java
View file @
2803b252
...
@@ -188,6 +188,16 @@ public class ContractServiceImpl implements ContractService {
...
@@ -188,6 +188,16 @@ public class ContractServiceImpl implements ContractService {
}
}
@Override
@Override
public
KObject
getExecutingContractByContractInfoId
(
UUID
infoId
)
{
List
<
KObject
>
executingContracts
=
contractDao
.
getExecutingContractByContractInfoId
(
infoId
);
if
(
executingContracts
.
size
()
!=
1
){
//不该出现的情况,需要查明
logger
.
error
(
"不该出现的情况,需要查明:合同["
+
infoId
.
toString
()+
"]是变更审批,审批完成后发现原合同没有执行中的"
);
}
return
executingContracts
.
get
(
0
);
}
@Override
public
void
changelog
(
UUID
infoId
)
{
public
void
changelog
(
UUID
infoId
)
{
KObject
log
=
Amino
.
getApplicationContext
()
KObject
log
=
Amino
.
getApplicationContext
()
.
getBean
(
LogConstants
.
LOG_ENTIY_NAME
,
KClass
.
class
).
newInstance
();
.
getBean
(
LogConstants
.
LOG_ENTIY_NAME
,
KClass
.
class
).
newInstance
();
...
...
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/query/processor/ContractWarnSettingProcessor.java
View file @
2803b252
...
@@ -36,7 +36,7 @@ public class ContractWarnSettingProcessor implements DataProcessor {
...
@@ -36,7 +36,7 @@ public class ContractWarnSettingProcessor implements DataProcessor {
//合同,项目,购砂单位
//合同,项目,购砂单位
UUID
contractId
=
UUID
.
fromString
(
row
.
get
(
"billId"
).
toString
());
UUID
contractId
=
UUID
.
fromString
(
row
.
get
(
"billId"
).
toString
());
KObject
contractInfo
=
contractService
.
queryContractInfo
(
contractId
);
KObject
contractInfo
=
contractService
.
queryContractInfo
(
contractId
);
KObject
contract
=
contractService
.
get
LastContractBy
InfoId
(
contractInfo
.
getUuid
(
"id"
));
KObject
contract
=
contractService
.
get
ExecutingContractByContract
InfoId
(
contractInfo
.
getUuid
(
"id"
));
Assert
.
notNull
(
contract
,
"找不到对应的合同!"
);
Assert
.
notNull
(
contract
,
"找不到对应的合同!"
);
row
.
put
(
"projectName"
,
contract
.
isNull
(
"project"
)
?
""
:
contract
.
get
(
"project"
).
getString
(
"projectName"
));
row
.
put
(
"projectName"
,
contract
.
isNull
(
"project"
)
?
""
:
contract
.
get
(
"project"
).
getString
(
"projectName"
));
row
.
put
(
"contractName"
,
contract
.
getString
(
"contractName"
));
row
.
put
(
"contractName"
,
contract
.
getString
(
"contractName"
));
...
...
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/service/ContractService.java
View file @
2803b252
...
@@ -60,6 +60,8 @@ public interface ContractService {
...
@@ -60,6 +60,8 @@ public interface ContractService {
KObject
getLastContractByInfoId
(
UUID
infoId
);
KObject
getLastContractByInfoId
(
UUID
infoId
);
KObject
getExecutingContractByContractInfoId
(
UUID
infoId
);
/**
/**
* 记录变更操作日志
* 记录变更操作日志
**/
**/
...
...
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