ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标准编号字段改为standardNumber

Browse Source
This commit is contained in:
caozhen
2023-09-19 09:47:58 +08:00
parent 2c3ad5b32d
commit 880dc93af0
6 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+3 -3
View File
@@ -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));
laws-modules/src/main/java/com/jero/modules/personal/entity/LawsBrowsingHistory.java
+2 -5
View File
@@ -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*/
laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardQuestions.java
+1 -3
View File
@@ -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")
laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java
+2 -3
View File
@@ -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 = "标准名称")
laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
+1 -1
View File
@@ -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 + "）");
}
laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java
+1 -1
View File
@@ -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")