Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
klck
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
位宇华
klck
Commits
e225489b
Commit
e225489b
authored
Aug 05, 2024
by
位宇华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
唐山矿代码提交
parent
3f27dd66
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
10 deletions
+44
-10
ruoyi-wages/src/main/java/com/ruoyi/system/controller/SalaryController.java
...in/java/com/ruoyi/system/controller/SalaryController.java
+18
-6
ruoyi-wages/src/main/java/com/ruoyi/system/service/LxSalaryService.java
...c/main/java/com/ruoyi/system/service/LxSalaryService.java
+8
-0
ruoyi-wages/src/main/java/com/ruoyi/system/service/TsSalarySaveService.java
...in/java/com/ruoyi/system/service/TsSalarySaveService.java
+1
-1
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/LxSalaryServiceImpl.java
...va/com/ruoyi/system/service/impl/LxSalaryServiceImpl.java
+14
-0
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/TsSalarySaveServiceImpl.java
...om/ruoyi/system/service/impl/TsSalarySaveServiceImpl.java
+3
-3
No files found.
ruoyi-wages/src/main/java/com/ruoyi/system/controller/SalaryController.java
View file @
e225489b
package
com.ruoyi.system.controller
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.system.service.SalarySaveService
;
import
com.ruoyi.system.service.LxSalaryService
;
import
com.ruoyi.system.service.TsSalarySaveService
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
...
...
@@ -9,11 +10,13 @@ import org.springframework.web.multipart.MultipartFile;
@RestController
public
class
SalaryController
{
private
final
LxSalaryService
lxSalaryService
;
private
final
SalarySaveService
salarySaveService
;
private
final
Ts
SalarySaveService
salarySaveService
;
public
SalaryController
(
SalarySaveService
salarySave
Service
)
{
public
SalaryController
(
TsSalarySaveService
salarySaveService
,
LxSalaryService
lxSalary
Service
)
{
this
.
salarySaveService
=
salarySaveService
;
this
.
lxSalaryService
=
lxSalaryService
;
}
/**
...
...
@@ -22,10 +25,19 @@ public class SalaryController {
* @param multipartFile
* @return
*/
@PostMapping
(
"/
salary/save
"
)
public
AjaxResult
s
ave
(
@RequestParam
(
"multipartFile"
)
MultipartFile
multipartFile
)
{
@PostMapping
(
"/
ts/salary
"
)
public
AjaxResult
tsS
ave
(
@RequestParam
(
"multipartFile"
)
MultipartFile
multipartFile
)
{
return
salarySaveService
.
save
(
multipartFile
);
}
/**
* 林西矿
*
* @param multipartFile
* @return
*/
@PostMapping
(
"/lx/salary"
)
public
AjaxResult
lxSave
(
@RequestParam
(
"multipartFile"
)
MultipartFile
multipartFile
)
{
return
lxSalaryService
.
lxSave
(
multipartFile
);
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/LxSalaryService.java
0 → 100644
View file @
e225489b
package
com.ruoyi.system.service
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
org.springframework.web.multipart.MultipartFile
;
public
interface
LxSalaryService
{
AjaxResult
lxSave
(
MultipartFile
multipartFile
);
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/SalarySaveService.java
→
ruoyi-wages/src/main/java/com/ruoyi/system/service/
Ts
SalarySaveService.java
View file @
e225489b
...
...
@@ -3,7 +3,7 @@ package com.ruoyi.system.service;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
org.springframework.web.multipart.MultipartFile
;
public
interface
SalarySaveService
{
public
interface
Ts
SalarySaveService
{
AjaxResult
save
(
MultipartFile
multipartFile
);
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/LxSalaryServiceImpl.java
0 → 100644
View file @
e225489b
package
com.ruoyi.system.service.impl
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.system.service.LxSalaryService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.multipart.MultipartFile
;
@Service
public
class
LxSalaryServiceImpl
implements
LxSalaryService
{
@Override
public
AjaxResult
lxSave
(
MultipartFile
multipartFile
)
{
return
null
;
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/SalarySaveServiceImpl.java
→
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/
Ts
SalarySaveServiceImpl.java
View file @
e225489b
...
...
@@ -5,7 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import
com.ruoyi.system.listener.TsExcelListener
;
import
com.ruoyi.system.mapper.SalaryMapper
;
import
com.ruoyi.system.model.salary.SalaryExcelModel
;
import
com.ruoyi.system.service.SalarySaveService
;
import
com.ruoyi.system.service.
Ts
SalarySaveService
;
import
lombok.SneakyThrows
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
...
...
@@ -19,13 +19,13 @@ import java.util.stream.Stream;
@Service
public
class
SalarySaveServiceImpl
implements
SalarySaveService
{
public
class
TsSalarySaveServiceImpl
implements
Ts
SalarySaveService
{
private
final
static
Set
<
String
>
COST_CHANNEL_SET
=
Stream
.
of
(
"基本生产原煤"
,
"基本生产洗煤"
,
"制造费用原煤"
,
"制造费用洗煤"
,
"选混煤"
,
"其他业务成本"
,
"其他应付款"
,
"管理费用"
,
"销售费用"
,
"其他业务支出"
).
collect
(
Collectors
.
toSet
());
private
final
SalaryMapper
salaryMapper
;
public
SalarySaveServiceImpl
(
SalaryMapper
salaryMapper
)
{
public
Ts
SalarySaveServiceImpl
(
SalaryMapper
salaryMapper
)
{
this
.
salaryMapper
=
salaryMapper
;
}
...
...
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