Commit e225489b authored by 位宇华's avatar 位宇华

唐山矿代码提交

parent 3f27dd66
package com.ruoyi.system.controller; package com.ruoyi.system.controller;
import com.ruoyi.common.core.domain.AjaxResult; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -9,11 +10,13 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -9,11 +10,13 @@ import org.springframework.web.multipart.MultipartFile;
@RestController @RestController
public class SalaryController { public class SalaryController {
private final LxSalaryService lxSalaryService;
private final SalarySaveService salarySaveService; private final TsSalarySaveService salarySaveService;
public SalaryController(SalarySaveService salarySaveService) { public SalaryController(TsSalarySaveService salarySaveService, LxSalaryService lxSalaryService) {
this.salarySaveService = salarySaveService; this.salarySaveService = salarySaveService;
this.lxSalaryService = lxSalaryService;
} }
/** /**
...@@ -22,10 +25,19 @@ public class SalaryController { ...@@ -22,10 +25,19 @@ public class SalaryController {
* @param multipartFile * @param multipartFile
* @return * @return
*/ */
@PostMapping("/salary/save") @PostMapping("/ts/salary")
public AjaxResult save(@RequestParam("multipartFile") MultipartFile multipartFile) { public AjaxResult tsSave(@RequestParam("multipartFile") MultipartFile multipartFile) {
return salarySaveService.save(multipartFile); return salarySaveService.save(multipartFile);
} }
/**
* 林西矿
*
* @param multipartFile
* @return
*/
@PostMapping("/lx/salary")
public AjaxResult lxSave(@RequestParam("multipartFile") MultipartFile multipartFile) {
return lxSalaryService.lxSave(multipartFile);
}
} }
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);
}
...@@ -3,7 +3,7 @@ package com.ruoyi.system.service; ...@@ -3,7 +3,7 @@ package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
public interface SalarySaveService { public interface TsSalarySaveService {
AjaxResult save(MultipartFile multipartFile); AjaxResult save(MultipartFile multipartFile);
} }
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;
}
}
...@@ -5,7 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult; ...@@ -5,7 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.listener.TsExcelListener; import com.ruoyi.system.listener.TsExcelListener;
import com.ruoyi.system.mapper.SalaryMapper; import com.ruoyi.system.mapper.SalaryMapper;
import com.ruoyi.system.model.salary.SalaryExcelModel; import com.ruoyi.system.model.salary.SalaryExcelModel;
import com.ruoyi.system.service.SalarySaveService; import com.ruoyi.system.service.TsSalarySaveService;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -19,13 +19,13 @@ import java.util.stream.Stream; ...@@ -19,13 +19,13 @@ import java.util.stream.Stream;
@Service @Service
public class SalarySaveServiceImpl implements SalarySaveService { public class TsSalarySaveServiceImpl implements TsSalarySaveService {
private final static Set<String> COST_CHANNEL_SET = Stream.of("基本生产原煤", "基本生产洗煤", "制造费用原煤", "制造费用洗煤", "选混煤", "其他业务成本", "其他应付款", "管理费用", "销售费用", "其他业务支出").collect(Collectors.toSet()); private final static Set<String> COST_CHANNEL_SET = Stream.of("基本生产原煤", "基本生产洗煤", "制造费用原煤", "制造费用洗煤", "选混煤", "其他业务成本", "其他应付款", "管理费用", "销售费用", "其他业务支出").collect(Collectors.toSet());
private final SalaryMapper salaryMapper; private final SalaryMapper salaryMapper;
public SalarySaveServiceImpl(SalaryMapper salaryMapper) { public TsSalarySaveServiceImpl(SalaryMapper salaryMapper) {
this.salaryMapper = salaryMapper; this.salaryMapper = salaryMapper;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment