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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
jjLv 2024-10-29 13:58:49 +08:00
parent 2410c20a0c e91fa001db
commit 42b03bca30
4 changed files with 72 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java
View File

@ -1,30 +1,30 @@
package com.bonus.material.basic.domain;
import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author ma_sh
* @create 2024/10/14 15:29
*/
@Data
public class BmUnitType extends BaseEntity {
private Integer isAll;
@ApiModelProperty(value = "主键id")
private Long typeId;
@ApiModelProperty(value = "单位类型名称")
@Excel(name = "单位类型")
private String typeName;
@ApiModelProperty(value = "单位类型")
private String dictType;
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
}
//package com.bonus.material.basic.domain;
//
//import com.bonus.common.core.annotation.Excel;
//import com.bonus.common.core.web.domain.BaseEntity;
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
///**
// * @Author ma_sh
// * @create 2024/10/14 15:29
// */
//@Data
//public class BmUnitType extends BaseEntity {
//
// private Integer isAll;
//
// @ApiModelProperty(value = "主键id")
// private Long typeId;
//
// @ApiModelProperty(value = "单位类型名称")
// @Excel(name = "单位类型")
// private String typeName;
//
// @ApiModelProperty(value = "单位类型")
// private String dictType;
//
// /** 删除标志（0代表存在 2代表删除） */
// private String delFlag;
//
//}

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 = "物资管理->新增物资厂家管理")
@PostMapping
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 = "物资管理->修改物资厂家管理")
@PutMapping
public AjaxResult edit(@RequestBody SupplierInfo supplierInfo) {
return toAjax(supplierInfoService.updateSupplierInfo(supplierInfo));
try {
return toAjax(supplierInfoService.updateSupplierInfo(supplierInfo));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java
View File

@ -1,14 +1,12 @@
package com.bonus.material.ma.domain;
import com.bonus.common.core.annotation.Excel;
import com.bonus.system.api.domain.SysFile;
import com.bonus.material.basic.domain.BmFileInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import com.bonus.common.core.web.domain.BaseEntity;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
@ -79,6 +77,6 @@ public class SupplierInfo extends BaseEntity {
* 营业执照文件列表
*/
@ApiModelProperty(value = "营业执照文件列表")
List<SysFile> businessLicenseFileList;
List<BmFileInfo> businessLicenseFileList;
}

53
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.concurrent.atomic.AtomicBoolean;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.material.basic.domain.BmFileInfo;
@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
import com.bonus.material.ma.mapper.SupplierInfoMapper;
import com.bonus.material.ma.domain.SupplierInfo;
import com.bonus.material.ma.service.ISupplierInfoService;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
@ -63,31 +65,32 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService {
*/
@Override
public AjaxResult insertSupplierInfo(SupplierInfo supplierInfo) {
supplierInfo.setCreateTime(DateUtils.getNowDate());
int insertedSupplierInfoResult = supplierInfoMapper.insertSupplierInfo(supplierInfo);
if (insertedSupplierInfoResult > 0) {
if (supplierInfo.getBusinessLicenseFileList() == null) {
return AjaxResult.success("新增任务成功,无营业执照附件");
}
AtomicBoolean addFileInfoResult = new AtomicBoolean(false);
supplierInfo.getBusinessLicenseFileList().forEach(file -> {
BmFileInfo bmFileInfo = new BmFileInfo();
if (file.getName() != null) {
bmFileInfo.setFileName(file.getName());
try {
supplierInfo.setCreateTime(DateUtils.getNowDate());
int insertedSupplierInfoResult = supplierInfoMapper.insertSupplierInfo(supplierInfo);
if (insertedSupplierInfoResult > 0) {
if (CollectionUtils.isEmpty(supplierInfo.getBusinessLicenseFileList())) {
return AjaxResult.success("新增任务成功,无营业执照附件");
}
bmFileInfo.setFileUrl(file.getUrl());
// 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条");
AtomicBoolean addFileInfoResult = new AtomicBoolean(false);
supplierInfo.getBusinessLicenseFileList().forEach(bmFileInfo -> {
// BmFileInfo bmFileInfo = new BmFileInfo();
// if (file.getName() != null) {
// bmFileInfo.setFileName(file.getName());
// }
// bmFileInfo.setFileUrl(file.getUrl());
// bmFileInfo.setModelId(MODEL_ID);
bmFileInfo.setModelId(supplierInfo.getSupplierId());
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())) {
// AjaxResult uploadedFilesResult = remoteFileService.uploadFile(supplierInfo.getFiles());
// if (uploadedFilesResult.isSuccess()) {
@ -112,7 +115,11 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService {
@Override
public int updateSupplierInfo(SupplierInfo supplierInfo) {
supplierInfo.setUpdateTime(DateUtils.getNowDate());
return supplierInfoMapper.updateSupplierInfo(supplierInfo);
try {
return supplierInfoMapper.updateSupplierInfo(supplierInfo);
} catch (Exception e) {
throw new ServiceException("数据库错误或供应商名称重复");
}
}
/**