From 89352b24e870b1e7b6ee0c26357cceeab06d5256 Mon Sep 17 00:00:00 2001
From: wxj334 <2241669945@qq.com>
Date: Wed, 14 Dec 2022 08:59:26 +0800
Subject: [PATCH 1/2] 111
---
.../config/GeneralConstantConfig.java | 19 ++++++++++++++++
.../controller/BaseInfoController.java | 22 +++++++++----------
2 files changed, 29 insertions(+), 12 deletions(-)
create mode 100644 ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/config/GeneralConstantConfig.java
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/config/GeneralConstantConfig.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/config/GeneralConstantConfig.java
new file mode 100644
index 000000000..281832631
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/config/GeneralConstantConfig.java
@@ -0,0 +1,19 @@
+package com.seasky.projectplan.infrastructure.config;
+
+/**
+ * @author wangxingjun
+ * @since 2022/12/13 9:44
+ */
+public class GeneralConstantConfig {
+ /*--------------------娴佺▼--------------------*/
+ public static final String XIANGMUKUTIJIAOLIUCHENG = "椤圭洰搴撴彁浜ゆ祦绋�";
+ public static final String KUOZHANLEIXING = "鎵╁睍绫诲瀷";
+ public static final String SHENBAOLEIXING = "鐢虫姤绫诲瀷";
+ public static final String YUSUANBIANZHITIANJIA = "棰勭畻缂栧埗娣诲姞";
+ public static final String SHENBAOSHULEIXING = "鐢虫姤涔︾被鍨�";
+ public static final String SHENBAOJIEDUAN = "鐢虫姤闃舵";
+ public static final String SHENBAOXIANGMUSUOSHULEIXING = "鐢虫姤椤圭洰鎵€灞炵被鍨�";
+ public static final String ZHENGBAILEIXING = "鏀块噰绫诲瀷";
+ public static final String XUESHENGXUEFEI = "瀛︾敓瀛﹁垂";
+
+}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java
index a214b03dc..e28d1740b 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java
@@ -18,6 +18,7 @@ import com.seasky.projectplan.application.query.notice.NoticeQueryService;
import com.seasky.projectplan.domain.aggregate.common.*;
import com.seasky.projectplan.dto.baseconfig.*;
import com.seasky.projectplan.dto.notice.NoticeAttachmentOut;
+import com.seasky.projectplan.infrastructure.config.GeneralConstantConfig;
import com.seasky.projectplan.infrastructure.rpc.api.UserRPC;
import com.seasky.projectplan.infrastructure.util.BaseDataUtil;
import io.swagger.annotations.Api;
@@ -238,34 +239,31 @@ public class BaseInfoController extends BaseController implements IBaseInfoContr
public Result<StateOut> queryStateOut(@RequestParam String programName) {
List<StateOut> stateOuts = null;
switch (programName) {
- case "椤圭洰搴撴彁浜ゆ祦绋�":
+ case GeneralConstantConfig.XIANGMUKUTIJIAOLIUCHENG:
stateOuts = AuditEnum.auditEnum();
break;
- case "鎵╁睍绫诲瀷":
+ case GeneralConstantConfig.KUOZHANLEIXING:
stateOuts = ExtendEnum.extendEnum();
break;
- case "鐢虫姤绫诲瀷":
+ case GeneralConstantConfig.SHENBAOLEIXING:
stateOuts = flowTypeEnum.flowTypeEnum();
break;
- case "棰勭畻缂栧埗娣诲姞":
+ case GeneralConstantConfig.YUSUANBIANZHITIANJIA:
stateOuts = InComePlanEnum.inComePlanEnum();
break;
- case "鐢虫姤涔︾被鍨�":
+ case GeneralConstantConfig.SHENBAOSHULEIXING:
stateOuts = PlanBookTypeEnum.planBookTypeEnum();
break;
- case "鐢虫姤闃舵":
+ case GeneralConstantConfig.SHENBAOJIEDUAN:
stateOuts = PlanTypeEnum.planTypeEnum();
break;
- /*case "棰勬嫧鎺у埗":
- stateOuts = PredialSettingsEnum.predialSettingsEnum();
- break;?????*/
- case "鐢虫姤椤圭洰鎵€灞炵被鍨�":
+ case GeneralConstantConfig.SHENBAOXIANGMUSUOSHULEIXING:
stateOuts = ProjectPlanTypeEnum.projectPlanTypeEnum();
break;
- case "鏀块噰绫诲瀷":
+ case GeneralConstantConfig.ZHENGBAILEIXING:
stateOuts = PurchaseTypeEnum.purchaseTypeEnum();
break;
- case "瀛︾敓瀛﹁垂":
+ case GeneralConstantConfig.XUESHENGXUEFEI:
stateOuts = StudentEnum.studentEnum();
break;
default:
--
GitLab
From 70319546adf377ca61cbd6dab6591823a97bdaa7 Mon Sep 17 00:00:00 2001
From: zhouquanseaskyshcom <zhouquan@seaskysh.com>
Date: Mon, 26 Dec 2022 17:03:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8D=95=E4=BB=B7?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dto/baseconfig/devicetype/ImportDeviceTypeCmd.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/devicetype/ImportDeviceTypeCmd.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/devicetype/ImportDeviceTypeCmd.java
index 70733aeb2..f752d6611 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/devicetype/ImportDeviceTypeCmd.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/devicetype/ImportDeviceTypeCmd.java
@@ -8,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.Size;
import java.math.BigDecimal;
@@ -37,6 +38,7 @@ public class ImportDeviceTypeCmd extends BaseDto {
@ExcelProperty(value = "鏀块噰绫诲瀷(鍙～:鏀垮簻閲囪喘,闆嗗競閲囪喘,闆嗕腑閲囪喘,鍚�)",index = 1)
private String purchaseType;
+ @DecimalMin(value = "0",message = "鍗曚环涓嶈兘涓鸿礋鏁�")
@ApiModelProperty("鍗曚环")
@ExcelProperty(value = "鍗曚环",index = 2)
private BigDecimal price;
--
GitLab