From 8d6e049697dc422e104c0dba1c2a28056e7063d5 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 29 Oct 2024 10:33:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/basic/domain/BmUnitType.java | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java index 90ac268a..764bc863 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java @@ -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; +// +//} From 3d09568e6cbc4a3eadd5230141ae807262856077 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 29 Oct 2024 11:19:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/ma/service/impl/SupplierInfoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java index e5dd6512..c58265bf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java @@ -12,6 +12,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; @@ -66,7 +67,7 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService { supplierInfo.setCreateTime(DateUtils.getNowDate()); int insertedSupplierInfoResult = supplierInfoMapper.insertSupplierInfo(supplierInfo); if (insertedSupplierInfoResult > 0) { - if (supplierInfo.getBusinessLicenseFileList() == null) { + if (CollectionUtils.isEmpty(supplierInfo.getBusinessLicenseFileList())) { return AjaxResult.success("新增任务成功,无营业执照附件"); } AtomicBoolean addFileInfoResult = new AtomicBoolean(false); From 225f2b56efd81fd53ee5275eb57f98c9147acf99 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 29 Oct 2024 11:31:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ma/controller/SupplierInfoController.java | 12 ++++- .../service/impl/SupplierInfoServiceImpl.java | 52 +++++++++++-------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java index af358571..8d65c331 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java @@ -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()); + } } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java index c58265bf..bbd656cd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java @@ -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; @@ -64,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 (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()); + 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(file -> { + BmFileInfo bmFileInfo = new BmFileInfo(); + if (file.getName() != null) { + bmFileInfo.setFileName(file.getName()); + } + 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条"); + } + } catch (Exception e) { + throw new ServiceException("数据库错误或供应商名称重复"); } - - - // if (insertedSupplierInfoResult > 0 && ArrayUtil.isNotEmpty(supplierInfo.getFiles())) { // AjaxResult uploadedFilesResult = remoteFileService.uploadFile(supplierInfo.getFiles()); // if (uploadedFilesResult.isSuccess()) { @@ -113,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("数据库错误或供应商名称重复"); + } } /** From e91fa001dbf69d4a6299de681b33f3e6c4f0295f Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 29 Oct 2024 13:48:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=89=A7=E7=85=A7?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/ma/domain/SupplierInfo.java | 6 ++---- .../ma/service/impl/SupplierInfoServiceImpl.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java index 9252b4ce..16554335 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java @@ -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 businessLicenseFileList; + List businessLicenseFileList; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java index bbd656cd..c7a93402 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java @@ -73,14 +73,14 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService { 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()); - // TODO: 此处需要修改为字典表中定义的Model模块id - bmFileInfo.setModelId(MODEL_ID); + 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条");