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
c2f4df04
Commit
c2f4df04
authored
3 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DMP 收入
parent
37ebb5dc
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
5 deletions
+38
-5
DmpIncomeController.java
src/main/java/common/controller/DmpIncomeController.java
+5
-3
Contract.java
src/main/java/common/model/Contract.java
+20
-0
DmpIncome.java
src/main/java/common/model/DmpIncome.java
+2
-2
DmpIncomeService.java
src/main/java/common/service/DmpIncomeService.java
+2
-0
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+9
-0
DmpIncomeServiceImpl.java
src/main/java/common/service/impl/DmpIncomeServiceImpl.java
+0
-0
No files found.
src/main/java/common/controller/DmpIncomeController.java
View file @
c2f4df04
...
...
@@ -44,11 +44,13 @@ public class DmpIncomeController {
}
@PostMapping
(
"/upload
/{platform}
"
)
public
ResultModel
uploadList
(
@RequestParam
(
"file"
)
MultipartFile
file
,
@
PathVariable
String
platform
,
@
CurrentAccount
User
loginAccount
)
{
@PostMapping
(
"/upload"
)
public
ResultModel
uploadList
(
@RequestParam
(
"file"
)
MultipartFile
file
,
@CurrentAccount
User
loginAccount
)
{
//上传收入数据
dmpIncomeService
.
uploadFile
(
file
,
platform
,
loginAccount
);
dmpIncomeService
.
uploadFile
(
file
,
"dmp"
,
loginAccount
);
return
ResultModel
.
OK
();
}
}
This diff is collapsed.
Click to expand it.
src/main/java/common/model/Contract.java
View file @
c2f4df04
...
...
@@ -107,6 +107,8 @@ public class Contract {
private
int
businessType
;
//业务类型 1 VIP 2 共管
private
int
agreementType
;
//协议类型 1 普通协议 2 框架协议
private
String
businessTypeName
;
//业务类型 1 VIP 2 共管
private
String
agreementTypeName
;
//协议类型 1 普通协议 2 框架协议
@Id
@GeneratedValue
...
...
@@ -791,4 +793,22 @@ public class Contract {
public
void
setAgreementType
(
int
agreementType
)
{
this
.
agreementType
=
agreementType
;
}
@Transient
public
String
getBusinessTypeName
()
{
return
businessTypeName
;
}
public
void
setBusinessTypeName
(
String
businessTypeName
)
{
this
.
businessTypeName
=
businessTypeName
;
}
@Transient
public
String
getAgreementTypeName
()
{
return
agreementTypeName
;
}
public
void
setAgreementTypeName
(
String
agreementTypeName
)
{
this
.
agreementTypeName
=
agreementTypeName
;
}
}
This diff is collapsed.
Click to expand it.
src/main/java/common/model/DmpIncome.java
View file @
c2f4df04
...
...
@@ -9,8 +9,8 @@ import java.util.Date;
@Entity
public
class
DmpIncome
{
private
Long
id
;
private
String
contractCode
;
private
Long
id
;
// ID
private
String
contractCode
;
//合同编号
private
String
incomeMonth
;
//收入月份
private
String
period
;
//结算周期
private
String
sysSettlement
;
//系统结算
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/service/DmpIncomeService.java
View file @
c2f4df04
...
...
@@ -21,4 +21,6 @@ public interface DmpIncomeService {
Long
delete
(
Long
id
);
ResultModel
uploadFile
(
MultipartFile
file
,
String
platform
,
User
loginAccount
);
ResultModel
contractUploadFile
(
MultipartFile
file
,
String
platform
,
User
loginAccount
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
c2f4df04
...
...
@@ -232,6 +232,9 @@ public class ContractServiceImpl implements ContractService {
@Autowired
private
CalculationFlowRepository
calculationFlowRepository
;
@Autowired
private
DmpIncomeService
dmpIncomeService
;
@Override
public
Map
<
String
,
Object
>
checkAccount
(
String
email
,
String
platfrom
)
{
...
...
@@ -2487,6 +2490,12 @@ public class ContractServiceImpl implements ContractService {
@Override
public
ResultModel
uploadBatchInfo
(
MultipartFile
file
,
String
platform
,
User
loginAccount
)
{
if
(
"dmp"
.
equals
(
platform
))
{
return
dmpIncomeService
.
contractUploadFile
(
file
,
platform
,
loginAccount
);
}
InputStream
stream
=
null
;
try
{
int
row_length
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/DmpIncomeServiceImpl.java
View file @
c2f4df04
This diff is collapsed.
Click to expand it.
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