Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
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
reyun
manager
Commits
d852444c
Commit
d852444c
authored
May 31, 2021
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
492577bc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
ContractRepository.java
src/main/java/common/repository/ContractRepository.java
+3
-0
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+3
-1
No files found.
src/main/java/common/repository/ContractRepository.java
View file @
d852444c
...
@@ -144,4 +144,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
...
@@ -144,4 +144,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query
(
value
=
"select * from contract where platform=?1 and share_sign = ?2 "
,
nativeQuery
=
true
)
@Query
(
value
=
"select * from contract where platform=?1 and share_sign = ?2 "
,
nativeQuery
=
true
)
List
<
Contract
>
findByPlatformAndShareSign
(
String
platform
,
int
share_sign
);
List
<
Contract
>
findByPlatformAndShareSign
(
String
platform
,
int
share_sign
);
@Query
(
value
=
"select * from contract where contract_code = ?1 and status != 'del'"
,
nativeQuery
=
true
)
Contract
findByCodeAndNotDel
(
String
contractCode
);
}
}
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
d852444c
...
@@ -1878,7 +1878,9 @@ public class ContractServiceImpl implements ContractService {
...
@@ -1878,7 +1878,9 @@ public class ContractServiceImpl implements ContractService {
@Override
@Override
public
Contract
change
(
User
loginUser
,
ContractChange
resource
,
FlowChange
flowChange
)
{
public
Contract
change
(
User
loginUser
,
ContractChange
resource
,
FlowChange
flowChange
)
{
Contract
contract
=
contractRepository
.
findByCode
(
resource
.
getContractCode
());
//Contract contract = contractRepository.findByCode(resource.getContractCode());
Contract
contract
=
contractRepository
.
findByCodeAndNotDel
(
resource
.
getContractCode
());
Map
<
Long
,
String
>
packageMap
=
getPackageMap
(
contract
);
Map
<
Long
,
String
>
packageMap
=
getPackageMap
(
contract
);
boolean
showTip
=
false
;
boolean
showTip
=
false
;
...
...
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