From b3caac689cb2627cd00bc696d37a624ead3c8048 Mon Sep 17 00:00:00 2001 From: "LAPTOP-0SF788NU\\admin" <3306174053@qq.com> Date: Fri, 3 Nov 2023 14:35:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=A1=E8=B4=A6=E7=B0=BF=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=B4=A6=E7=B0=BF=E6=9D=A5=E6=BA=90=E5=AD=97=E6=AE=B5?= =?UTF-8?q?,=E7=94=B5=E5=AD=90=E6=A1=A3=E6=A1=88=E4=B8=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccountingBookController.java | 5 +-- .../ElectronicAssetsServiceImpl.java | 33 ++----------------- .../ElectronicContractsServiceImpl.java | 10 ------ ...lectronicCustomerComplaintServiceImpl.java | 10 ------ .../ElectronicEmployeeServiceImpl.java | 9 ----- .../ElectronicOtherServiceImpl.java | 10 ------ 6 files changed, 5 insertions(+), 72 deletions(-) diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingbook/AccountingBookController.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingbook/AccountingBookController.java index 34de87b6..333a88f4 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingbook/AccountingBookController.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingbook/AccountingBookController.java @@ -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){ diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicassets/ElectronicAssetsServiceImpl.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicassets/ElectronicAssetsServiceImpl.java index ee24cc8b..e1af8706 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicassets/ElectronicAssetsServiceImpl.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicassets/ElectronicAssetsServiceImpl.java @@ -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 listId = new ArrayList(Arrays.asList(id)) ; - electronicAssetsMapper.deleteBatchIds(listId); + electronicAssetsMapper.deleteBatchIds(Arrays.asList(id)); } private void validateElectronicAssetsExists(Long id) { diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electroniccontracts/ElectronicContractsServiceImpl.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electroniccontracts/ElectronicContractsServiceImpl.java index cb7df1c5..cd2e8a30 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electroniccontracts/ElectronicContractsServiceImpl.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electroniccontracts/ElectronicContractsServiceImpl.java @@ -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) { diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electroniccustomercomplaint/ElectronicCustomerComplaintServiceImpl.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electroniccustomercomplaint/ElectronicCustomerComplaintServiceImpl.java index ae7cebd8..879c8b9a 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electroniccustomercomplaint/ElectronicCustomerComplaintServiceImpl.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electroniccustomercomplaint/ElectronicCustomerComplaintServiceImpl.java @@ -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(); diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicemployee/ElectronicEmployeeServiceImpl.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicemployee/ElectronicEmployeeServiceImpl.java index 38a11d65..7f2ef73a 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicemployee/ElectronicEmployeeServiceImpl.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicemployee/ElectronicEmployeeServiceImpl.java @@ -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) { diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicother/ElectronicOtherServiceImpl.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicother/ElectronicOtherServiceImpl.java index 83d04cdc..ae791b95 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicother/ElectronicOtherServiceImpl.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicother/ElectronicOtherServiceImpl.java @@ -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();