diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java index 7a5df16..b171c3b 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java @@ -201,7 +201,11 @@ public class CreditUserController extends BaseController { if (creditUserService.save(item)) { successCount++; } else { - errorMessages.add("第" + excelRowNumber + "行:保存失败"); + CreditUser update = creditUserService.getByName(item.getName()); + if (creditUserService.updateById(update)) { + errorMessages.add("第" + excelRowNumber + "行:更新成功"); + } + errorMessages.add("第" + excelRowNumber + "行:保存失败"); } } catch (Exception e) { int excelRowNumber = i + 1 + usedTitleRows + usedHeadRows; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java b/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java index f55547a..2d2b71b 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java @@ -68,6 +68,9 @@ public class CreditUser implements Serializable { @Schema(description = "中标金额") private String winningPrice; + @Schema(description = "发布日期") + private String releaseDate; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditUserImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditUserImportParam.java index a466d0c..ff7fba0 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditUserImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditUserImportParam.java @@ -1,6 +1,7 @@ package com.gxwebsoft.credit.param; import cn.afterturn.easypoi.excel.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -18,6 +19,9 @@ public class CreditUserImportParam implements Serializable { @Excel(name = "项目名称") private String name; + @Excel(name = "发布日期") + private String releaseDate; + @Excel(name = "序号") private String code; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditUserParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditUserParam.java index b5c5383..2468f0d 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditUserParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditUserParam.java @@ -70,6 +70,9 @@ public class CreditUserParam extends BaseParam { @Schema(description = "中标单位名称") private String winningPrice; + @Schema(description = "发布日期") + private String releaseDate; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/service/CreditUserService.java b/src/main/java/com/gxwebsoft/credit/service/CreditUserService.java index f7a382e..5fe708d 100644 --- a/src/main/java/com/gxwebsoft/credit/service/CreditUserService.java +++ b/src/main/java/com/gxwebsoft/credit/service/CreditUserService.java @@ -39,4 +39,5 @@ public interface CreditUserService extends IService { */ CreditUser getByIdRel(Integer id); + CreditUser getByName(String name); } diff --git a/src/main/java/com/gxwebsoft/credit/service/impl/CreditUserServiceImpl.java b/src/main/java/com/gxwebsoft/credit/service/impl/CreditUserServiceImpl.java index 3f7ad37..8578ea1 100644 --- a/src/main/java/com/gxwebsoft/credit/service/impl/CreditUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/credit/service/impl/CreditUserServiceImpl.java @@ -44,4 +44,11 @@ public class CreditUserServiceImpl extends ServiceImpl