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
284e533f
Commit
284e533f
authored
Aug 01, 2024
by
Fuzy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正
parent
2e36213b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
23 deletions
+4
-23
ruoyi-wages/src/main/java/com/ruoyi/system/controller/AsiccSuppliesController.java
.../com/ruoyi/system/controller/AsiccSuppliesController.java
+0
-15
ruoyi-wages/src/main/java/com/ruoyi/system/model/power/dto/LinXiInquireAboutSubjectAssistance.java
...m/model/power/dto/LinXiInquireAboutSubjectAssistance.java
+1
-1
ruoyi-wages/src/main/java/com/ruoyi/system/service/AsiccSuppliesService.java
...n/java/com/ruoyi/system/service/AsiccSuppliesService.java
+0
-2
ruoyi-wages/src/main/java/com/ruoyi/system/service/PowerVoucherConversionService.java
...m/ruoyi/system/service/PowerVoucherConversionService.java
+1
-1
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/AsiccSuppliesServiceImpl.java
...m/ruoyi/system/service/impl/AsiccSuppliesServiceImpl.java
+0
-3
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerVoucherConversionServiceImpl.java
...ystem/service/impl/PowerVoucherConversionServiceImpl.java
+2
-1
No files found.
ruoyi-wages/src/main/java/com/ruoyi/system/controller/AsiccSuppliesController.java
View file @
284e533f
package
com.ruoyi.system.controller
;
import
com.alibaba.excel.EasyExcelFactory
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.system.listener.ExcelListener
;
import
com.ruoyi.system.model.wages.dao.AsiccDAO
;
import
com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance
;
import
com.ruoyi.system.model.wages.dao.WagesDetailsExcelDAO
;
import
com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelSheet1DAO
;
import
com.ruoyi.system.service.AsiccSuppliesService
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.fileupload.FileItem
;
import
org.apache.commons.fileupload.disk.DiskFileItemFactory
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.commons.CommonsMultipartFile
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.InputStream
;
import
java.io.OutputStream
;
import
java.nio.file.Files
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
ruoyi-wages/src/main/java/com/ruoyi/system/model/
wages/da
o/LinXiInquireAboutSubjectAssistance.java
→
ruoyi-wages/src/main/java/com/ruoyi/system/model/
power/dt
o/LinXiInquireAboutSubjectAssistance.java
View file @
284e533f
package
com.ruoyi.system.model.
wages.da
o
;
package
com.ruoyi.system.model.
power.dt
o
;
import
lombok.Data
;
...
...
ruoyi-wages/src/main/java/com/ruoyi/system/service/AsiccSuppliesService.java
View file @
284e533f
package
com.ruoyi.system.service
;
import
com.ruoyi.system.model.wages.dao.AsiccDAO
;
import
com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
ruoyi-wages/src/main/java/com/ruoyi/system/service/PowerVoucherConversionService.java
View file @
284e533f
package
com.ruoyi.system.service
;
import
com.ruoyi.system.model.
wages.da
o.LinXiInquireAboutSubjectAssistance
;
import
com.ruoyi.system.model.
power.dt
o.LinXiInquireAboutSubjectAssistance
;
import
java.util.List
;
...
...
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/AsiccSuppliesServiceImpl.java
View file @
284e533f
...
...
@@ -6,15 +6,12 @@ import com.ruoyi.system.domain.ActSuppliesDetails;
import
com.ruoyi.system.domain.ActSuppliesMaterialCode
;
import
com.ruoyi.system.mapper.AsiccSuppliesMapper
;
import
com.ruoyi.system.model.wages.dao.AsiccDAO
;
import
com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance
;
import
com.ruoyi.system.service.AsiccSuppliesService
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.lang3.Range
;
import
org.springframework.stereotype.Service
;
import
java.math.BigDecimal
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
* @author haiwe
...
...
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerVoucherConversionServiceImpl.java
View file @
284e533f
package
com.ruoyi.system.service.impl
;
import
com.ruoyi.system.model.
wages.da
o.LinXiInquireAboutSubjectAssistance
;
import
com.ruoyi.system.model.
power.dt
o.LinXiInquireAboutSubjectAssistance
;
import
com.ruoyi.system.service.PowerVoucherConversionService
;
import
java.math.BigDecimal
;
...
...
@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
/**
* 2024/8/1
* 凭证转换---电力
*/
public
class
PowerVoucherConversionServiceImpl
implements
PowerVoucherConversionService
{
@Override
...
...
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