bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增供应商优化

This commit is contained in:
sxu 2024-10-29 11:31:01 +08:00
parent 3d09568e6c
commit 225f2b56ef
2 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java
View File

@ -93,7 +93,11 @@ public class SupplierInfoController extends BaseController {
@SysLog(title = "物资厂家管理", businessType = OperaType.INSERT, module = "物资管理->新增物资厂家管理") @SysLog(title = "物资厂家管理", businessType = OperaType.INSERT, module = "物资管理->新增物资厂家管理")
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SupplierInfo supplierInfo) { public AjaxResult add(@RequestBody SupplierInfo supplierInfo) {
return supplierInfoService.insertSupplierInfo(supplierInfo); try {
return supplierInfoService.insertSupplierInfo(supplierInfo);
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
} }
/** /**
@ -105,7 +109,11 @@ public class SupplierInfoController extends BaseController {
@SysLog(title = "物资厂家管理", businessType = OperaType.UPDATE, module = "物资管理->修改物资厂家管理") @SysLog(title = "物资厂家管理", businessType = OperaType.UPDATE, module = "物资管理->修改物资厂家管理")
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody SupplierInfo supplierInfo) { public AjaxResult edit(@RequestBody SupplierInfo supplierInfo) {
return toAjax(supplierInfoService.updateSupplierInfo(supplierInfo)); try {
return toAjax(supplierInfoService.updateSupplierInfo(supplierInfo));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
} }
/** /**

52
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.bonus.material.ma.service.impl;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.material.basic.domain.BmFileInfo; import com.bonus.material.basic.domain.BmFileInfo;
@ -64,31 +65,32 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService {
*/ */
@Override @Override
public AjaxResult insertSupplierInfo(SupplierInfo supplierInfo) { public AjaxResult insertSupplierInfo(SupplierInfo supplierInfo) {
supplierInfo.setCreateTime(DateUtils.getNowDate()); try {
int insertedSupplierInfoResult = supplierInfoMapper.insertSupplierInfo(supplierInfo); supplierInfo.setCreateTime(DateUtils.getNowDate());
if (insertedSupplierInfoResult > 0) { int insertedSupplierInfoResult = supplierInfoMapper.insertSupplierInfo(supplierInfo);
if (CollectionUtils.isEmpty(supplierInfo.getBusinessLicenseFileList())) { if (insertedSupplierInfoResult > 0) {
return AjaxResult.success("新增任务成功,无营业执照附件"); if (CollectionUtils.isEmpty(supplierInfo.getBusinessLicenseFileList())) {
} return AjaxResult.success("新增任务成功,无营业执照附件");
AtomicBoolean addFileInfoResult = new AtomicBoolean(false);
supplierInfo.getBusinessLicenseFileList().forEach(file -> {
BmFileInfo bmFileInfo = new BmFileInfo();
if (file.getName() != null) {
bmFileInfo.setFileName(file.getName());
} }
bmFileInfo.setFileUrl(file.getUrl()); AtomicBoolean addFileInfoResult = new AtomicBoolean(false);
// TODO: 此处需要修改为字典表中定义的Model模块id supplierInfo.getBusinessLicenseFileList().forEach(file -> {
bmFileInfo.setModelId(MODEL_ID); BmFileInfo bmFileInfo = new BmFileInfo();
addFileInfoResult.set(bmFileInfoMapper.insertBmFileInfo(bmFileInfo) > 0); if (file.getName() != null) {
}); bmFileInfo.setFileName(file.getName());
return addFileInfoResult.get() ? AjaxResult.success("新增任务成功") : AjaxResult.error("新增任务失败,附件表插入0条"); }
} else { bmFileInfo.setFileUrl(file.getUrl());
return AjaxResult.error("新增任务失败,info表插入0条"); // TODO: 此处需要修改为字典表中定义的Model模块id
bmFileInfo.setModelId(MODEL_ID);
addFileInfoResult.set(bmFileInfoMapper.insertBmFileInfo(bmFileInfo) > 0);
});
return addFileInfoResult.get() ? AjaxResult.success("新增任务成功") : AjaxResult.error("新增任务失败,附件表插入0条");
} else {
return AjaxResult.error("新增任务失败,info表插入0条");
}
} catch (Exception e) {
throw new ServiceException("数据库错误或供应商名称重复");
} }
// if (insertedSupplierInfoResult > 0 && ArrayUtil.isNotEmpty(supplierInfo.getFiles())) { // if (insertedSupplierInfoResult > 0 && ArrayUtil.isNotEmpty(supplierInfo.getFiles())) {
// AjaxResult uploadedFilesResult = remoteFileService.uploadFile(supplierInfo.getFiles()); // AjaxResult uploadedFilesResult = remoteFileService.uploadFile(supplierInfo.getFiles());
// if (uploadedFilesResult.isSuccess()) { // if (uploadedFilesResult.isSuccess()) {
@ -113,7 +115,11 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService {
@Override @Override
public int updateSupplierInfo(SupplierInfo supplierInfo) { public int updateSupplierInfo(SupplierInfo supplierInfo) {
supplierInfo.setUpdateTime(DateUtils.getNowDate()); supplierInfo.setUpdateTime(DateUtils.getNowDate());
return supplierInfoMapper.updateSupplierInfo(supplierInfo); try {
return supplierInfoMapper.updateSupplierInfo(supplierInfo);
} catch (Exception e) {
throw new ServiceException("数据库错误或供应商名称重复");
}
} }
/** /**