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
323041e6
Commit
323041e6
authored
Jan 25, 2022
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysql5.7关键字冲突virtual
parent
d8c540cc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
Contract.java
src/main/java/common/model/Contract.java
+6
-6
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+1
-1
No files found.
src/main/java/common/model/Contract.java
View file @
323041e6
...
...
@@ -53,7 +53,7 @@ public class Contract {
private
Date
modifyTime
;
private
Date
createTime
;
private
String
ds
;
private
Boolean
virtual
;
private
Boolean
virtual
Flag
;
private
Long
firstBackId
;
//先回款记录的id
...
...
@@ -126,12 +126,12 @@ public class Contract {
this
.
id
=
id
;
}
public
Boolean
getVirtual
()
{
return
virtual
;
public
Boolean
getVirtual
Flag
()
{
return
virtual
Flag
;
}
public
void
setVirtual
(
Boolean
virtual
)
{
this
.
virtual
=
virtual
;
public
void
setVirtual
Flag
(
Boolean
virtualFlag
)
{
this
.
virtual
Flag
=
virtualFlag
;
}
public
Long
getFirstBackId
()
{
...
...
@@ -747,7 +747,7 @@ public class Contract {
", modifyTime="
+
modifyTime
+
", createTime="
+
createTime
+
", ds='"
+
ds
+
'\''
+
", virtual
="
+
virtual
+
", virtual
Flag="
+
virtualFlag
+
", firstBackId="
+
firstBackId
+
", adjustmentFund="
+
adjustmentFund
+
", adjustmentFundForm='"
+
adjustmentFundForm
+
'\''
+
...
...
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
323041e6
...
...
@@ -501,7 +501,7 @@ public class ContractServiceImpl implements ContractService {
if
(
null
!=
user
)
{
contract
.
setSale
(
user
.
getId
());
}
contract
.
setVirtual
(
true
);
contract
.
setVirtual
Flag
(
true
);
Account
account
=
accountRepository
.
findByEmail
(
contract
.
getEmail
());
contract
.
setCustomerBody
(
account
.
getCompany
());
contract
.
setType
(
"increment"
);
...
...
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