Js
/
lyr-one-test
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
new
JiilingLee 1 year ago
parent 7d95e66240 b3caac689c
commit 4b7407b8a1
6 changed files with 5 additions and 72 deletions
Show Stats Download Patch File Download Diff File

5
yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingbook/AccountingBookController.java
Unescape Escape View File

@ -80,11 +80,12 @@ public class AccountingBookController {
@RequestParam("companyId") Long companyId,
@RequestParam("company") String company,
@RequestParam("year") String year,
@RequestParam("period") String period) {
@RequestParam("period") String period,
@RequestParam("source") String source) {
try {
String uri = fileService.createFile(multipartFile.getOriginalFilename(), null, IoUtil.readBytes(multipartFile.getInputStream()));
AccountingBookCreateReqVO vo = new AccountingBookCreateReqVO();
vo.setCompany(company).setCompanyId(companyId).setType(type).setYear(year).setPeriod(period).setUri(uri).setName(multipartFile.getOriginalFilename());
vo.setCompany(company).setCompanyId(companyId).setType(type).setYear(year).setPeriod(period).setUri(uri).setName(multipartFile.getOriginalFilename()).setSource(source);
this.createAccountingBook(vo);
return uri;
} catch (Exception e){

33
yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicassets/ElectronicAssetsServiceImpl.java
Unescape Escape View File

@ -51,37 +51,9 @@ public class ElectronicAssetsServiceImpl implements ElectronicAssetsService {
createReqVO.setPosition(positionDo.getPosition())
.setCreateBy(positionDo.getCreateBy()).setDeptName(positionDo.getDeptName());
// if (ObjectUtil.isNotNull(createReqVO.getDeptId())){
// GetElectronicDept getElectronicDept = new GetElectronicDept();
// createReqVO.setDeptName(getElectronicDept.getDeptName(createReqVO.getDeptId()));
// }
// 插入
ElectronicAssetsDO electronicAssets = ElectronicAssetsConvert.INSTANCE.convert(createReqVO);
// Long organizationId = createReqVO.getOrganizationId();
// Long depotId = createReqVO.getDepotId();
// Long cabinetId = createReqVO.getCabinetId();
// OrganizationDO organizationDO = organizationMapper.selectById(organizationId);
// DepotDO depotDO = depotMapper.selectById(depotId);
// DepotCabinetDO depotCabinetDO = depotCabinetMapper.selectById(cabinetId);
// String position="";
// if (organizationDO != null){
// position=position+organizationDO.getOrganizationName();
// if (depotDO != null){
// position=position+"/"+depotDO.getName();
// if (depotCabinetDO != null){
// position= position+"/"+depotCabinetDO.getName();
// }else {
// position= position+"/默认档案柜";
// }
// }else {
// position=position+"/默认库房/默认档案柜";
// }
// }
// electronicAssets.setPosition(position);
//
// LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
// AdminUserDO adminUserDO = userMapper.selectById(loginUser.getId());
// electronicAssets.setCreateBy(adminUserDO.getUsername());
electronicAssetsMapper.insert(electronicAssets);
// 返回
return electronicAssets.getId();
@ -99,8 +71,7 @@ public class ElectronicAssetsServiceImpl implements ElectronicAssetsService {
@Override
public void deleteElectronicAssets(Long[] id) {
// 删除
ArrayList<Long> listId = new ArrayList(Arrays.asList(id)) ;
electronicAssetsMapper.deleteBatchIds(listId);
electronicAssetsMapper.deleteBatchIds(Arrays.asList(id));
}
private void validateElectronicAssetsExists(Long id) {

10
yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electroniccontracts/ElectronicContractsServiceImpl.java
Unescape Escape View File

@ -41,16 +41,6 @@ public class ElectronicContractsServiceImpl implements ElectronicContractsServic
@Resource
private ElectronicContractsMapper electronicContractsMapper;
@Resource
private OrganizationMapper organizationMapper;
@Resource
private DepotMapper depotMapper;
@Resource
private DepotCabinetMapper depotCabinetMapper;
@Resource
private AdminUserMapper userMapper;
@Override
public Long createElectronicContracts(ElectronicContractsCreateReqVO createReqVO) {

10
yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electroniccustomercomplaint/ElectronicCustomerComplaintServiceImpl.java
Unescape Escape View File

@ -41,16 +41,6 @@ public class ElectronicCustomerComplaintServiceImpl implements ElectronicCustome
@Resource
private ElectronicCustomerComplaintMapper electronicCustomerComplaintMapper;
@Resource
private OrganizationMapper organizationMapper;
@Resource
private DepotMapper depotMapper;
@Resource
private DepotCabinetMapper depotCabinetMapper;
@Resource
private AdminUserMapper userMapper;
@Override
public Long createElectronicCustomerComplaint(ElectronicCustomerComplaintCreateReqVO createReqVO) {
GetPositionUtils getPositionUtils = new GetPositionUtils();

9
yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicemployee/ElectronicEmployeeServiceImpl.java
Unescape Escape View File

@ -40,15 +40,6 @@ public class ElectronicEmployeeServiceImpl implements ElectronicEmployeeService
@Resource
private ElectronicEmployeeMapper electronicEmployeeMapper;
@Resource
private OrganizationMapper organizationMapper;
@Resource
private DepotMapper depotMapper;
@Resource
private DepotCabinetMapper depotCabinetMapper;
@Resource
private AdminUserMapper userMapper;
@Override
public Long createElectronicEmployee(ElectronicEmployeeCreateReqVO createReqVO) {

10
yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicother/ElectronicOtherServiceImpl.java
Unescape Escape View File

@ -41,16 +41,6 @@ public class ElectronicOtherServiceImpl implements ElectronicOtherService {
@Resource
private ElectronicOtherMapper electronicOtherMapper;
@Resource
private OrganizationMapper organizationMapper;
@Resource
private DepotMapper depotMapper;
@Resource
private DepotCabinetMapper depotCabinetMapper;
@Resource
private AdminUserMapper userMapper;
@Override
public Long createElectronicOther(ElectronicOtherCreateReqVO createReqVO) {
GetPositionUtils getPositionUtils = new GetPositionUtils();

Write Preview
Loading…
Cancel
Save