From 880dc93af0de7c2aba3f79d3f05c58b28d0f6030 Mon Sep 17 00:00:00 2001
From: caozhen <18736171426@139.com>
Date: Tue, 19 Sep 2023 09:47:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=94=B9=E4=B8=BAstandardNumber?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personal/controller/LawsStandardSharingController.java | 6 +++---
 .../jero/modules/personal/entity/LawsBrowsingHistory.java  | 7 ++-----
 .../modules/personal/entity/LawsStandardQuestions.java     | 4 +---
 .../jero/modules/personal/entity/LawsStandardSharing.java  | 5 ++---
 .../service/impl/LawsStandardSharingServiceImpl.java       | 2 +-
 .../projectLibrary/entity/LawsEvaluationNotMet.java        | 2 +-
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
index bb237fc6..45a8b60a 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
@@ -111,7 +111,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
 			sharing.setStandardId(lawsStandardSharing.getStandardId());
 			LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardSharing.getStandardId());
 			sharing.setStandardName(standard.getStandardName());
-			sharing.setStandardNum(lawsStandardSharing.getStandardNum());
+			sharing.setStandardNumber(lawsStandardSharing.getStandardNumber());
 			sharing.setSharerId(sysUser.getId());
 			sharing.setSharerName(user.getNameWorkNo());
 			sharing.setRecipientId(recipientIdList.get(i));
@@ -146,7 +146,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
 			 sharing.setStandardId(lawsStandardSharing.getStandardId());
 			 LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardSharing.getStandardId());
 			 sharing.setStandardName(standard.getStandardName());
-			 sharing.setStandardNum(lawsStandardSharing.getStandardNum());
+			 sharing.setStandardNumber(lawsStandardSharing.getStandardNumber());
 			 sharing.setSharerId(sysUser.getId());
 			 sharing.setSharerName(user.getNameWorkNo());
 			 sharing.setRecipientId(recipientIdList.get(i));
@@ -181,7 +181,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
 			 sharing.setStandardId(lawsStandardSharing.getStandardId());
 			 LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId());
 			 sharing.setStandardName(standard.getStandardName());
-			 sharing.setStandardNum(lawsStandardSharing.getStandardNum());
+			 sharing.setStandardNumber(lawsStandardSharing.getStandardNumber());
 			 sharing.setSharerId(sysUser.getId());
 			 sharing.setSharerName(user.getNameWorkNo());
 			 sharing.setRecipientId(recipientIdList.get(i));
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsBrowsingHistory.java b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsBrowsingHistory.java
index 1116651b..6a45c1bb 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsBrowsingHistory.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsBrowsingHistory.java
@@ -37,22 +37,19 @@ public class LawsBrowsingHistory implements Serializable {
 
 	/**标准ID*/
     @ApiModelProperty(value = "标准ID")
-    @NotBlank(message = "standardId标准ID不能为空")
+    @NotBlank(message = "standardId not null")
     private String standardId;
 
 	/**标准状态(1-国内、2-海外、3-企标)*/
     @ApiModelProperty(value = "标准状态(1-国内、2-海外、3-企标)")
-    @NotBlank(message = "standardType标准状态(1-国内、2-海外、3-企标)")
     private String standardType;
 
 	/**标准编号*/
     @ApiModelProperty(value = "标准编号")
-    @NotBlank(message = "standardNum标准编号")
-    private String standardNum;
+    private String standardNumber;
 
 	/**标准名称*/
     @ApiModelProperty(value = "标准名称")
-    @NotBlank(message = "standardName标准名称")
     private String standardName;
 
     /**浏览人ID*/
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardQuestions.java b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardQuestions.java
index b115a588..7d52a40f 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardQuestions.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardQuestions.java
@@ -37,13 +37,11 @@ public class LawsStandardQuestions implements Serializable {
 
 	/**提问标题*/
     @ApiModelProperty(value = "提问标题")
-    @NotBlank(message = "title not null")
     private String title;
 
 	/**标准编号*/
     @ApiModelProperty(value = "标准编号")
-    @NotBlank(message = "standardNum not null")
-    private String standardNum;
+    private String standardNumber;
 
 	/**标准ID*/
     @ApiModelProperty(value = "标准ID")
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java
index 29418ded..2a4b58c3 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java
@@ -45,13 +45,12 @@ public class LawsStandardSharing implements Serializable {
 
 	/**标准ID*/
     @ApiModelProperty(value = "标准ID")
-    @NotBlank(message = "standardId标准ID不能为空")
+    @NotBlank(message = "standardId not null")
     private String standardId;
 
 	/**标准编号*/
     @ApiModelProperty(value = "标准编号")
-    @NotBlank(message = "standardNum标准编号不能为空")
-    private String standardNum;
+    private String standardNumber;
 
 	/**标准名称*/
     @ApiModelProperty(value = "标准名称")
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
index 52d85e55..7b314cea 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
@@ -56,7 +56,7 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
 
     private void assignment(List<LawsStandardSharing> records) {
         for (LawsStandardSharing record : records) {
-            String standardNum = record.getStandardNum();
+            String standardNum = record.getStandardNumber();
             String standardName = record.getStandardName();
             record.setTitle(standardName + "（" + standardNum + "）");
         }
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java
index f054f114..ea864ae0 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java
@@ -64,7 +64,7 @@ public class LawsEvaluationNotMet implements Serializable {
 	/**标准编号*/
 	@Excel(name = "标准编号", width = 15)
     @ApiModelProperty(value = "标准编号")
-    private java.lang.String standardNum;
+    private java.lang.String standardNumber;
 	/**项目ID*/
 	@Excel(name = "项目ID", width = 15)
     @ApiModelProperty(value = "项目ID")