From 8fc384afe9941fffee38e69ff0e6b0d6cb2e0487 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 18:46:25 +0800
Subject: [PATCH] # 联调接口
---
server/src/main/resources/application.yml | 2 +-
server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java | 1 -
server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java | 4 +++-
server/src/main/java/doumeemes/dao/system/model/SystemUser.java | 2 +-
server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java | 8 ++++++++
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java
index 2526f21..1f25463 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java
@@ -1,5 +1,6 @@
package doumeemes.dao.ext.dto;
+import cn.afterturn.easypoi.excel.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -40,4 +41,11 @@
@ApiModelProperty(value = "浼樺厛绾�")
private Integer urgent;
+ @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+
+ @ApiModelProperty(value = "閿�鍞崟鍙�" )
+ private String salesorder;
+
}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
index b826172..73661c3 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
@@ -74,7 +74,6 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "閿�鍞崟鍙�" )
- @Excel(name="閿�鍞崟鍙�",index = 16,width =15)
private String salesorder;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
@ExcelColumn(name="鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級")
diff --git a/server/src/main/java/doumeemes/dao/system/model/SystemUser.java b/server/src/main/java/doumeemes/dao/system/model/SystemUser.java
index 9a3a3ed..0a031e6 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemUser.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemUser.java
@@ -37,7 +37,7 @@
@NotBlank(message = "濮撳悕涓嶈兘涓虹┖", groups = {OperaType.Create.class/*, OperaType.Update.class*/})
private String realname;
- @NotBlank(message = "宸ュ彿涓嶈兘涓虹┖", groups = {OperaType.Create.class/*, OperaType.Update.class*/})
+// @NotBlank(message = "宸ュ彿涓嶈兘涓虹┖", groups = {OperaType.Create.class/*, OperaType.Update.class*/})
@ApiModelProperty(value = "鎬昏处鍙峰伐鍙�")
private String empNo;
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
index c99011c..f33817e 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
@@ -97,7 +97,9 @@
|| Objects.isNull(workPlansSaveDTO.getNum())
|| Objects.isNull(workPlansSaveDTO.getFactoryId())
|| Objects.isNull(workPlansSaveDTO.getUnitId())
- || Objects.isNull(workPlansSaveDTO.getMaterialId())){
+ || Objects.isNull(workPlansSaveDTO.getMaterialId())
+ || Objects.isNull(workPlansSaveDTO.getStartDate())
+ || workPlansSaveDTO.getStartDate().getTime() > workPlansSaveDTO.getPlanDate().getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
WorkPlans workPlans = new WorkPlans();
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index dd0fac5..72fcf23 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: standardPro
+ active: standard
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3