标准编号字段改为standardNumber
This commit is contained in:
+3
-3
@@ -111,7 +111,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
|
|||||||
sharing.setStandardId(lawsStandardSharing.getStandardId());
|
sharing.setStandardId(lawsStandardSharing.getStandardId());
|
||||||
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardSharing.getStandardId());
|
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardSharing.getStandardId());
|
||||||
sharing.setStandardName(standard.getStandardName());
|
sharing.setStandardName(standard.getStandardName());
|
||||||
sharing.setStandardNum(lawsStandardSharing.getStandardNum());
|
sharing.setStandardNumber(lawsStandardSharing.getStandardNumber());
|
||||||
sharing.setSharerId(sysUser.getId());
|
sharing.setSharerId(sysUser.getId());
|
||||||
sharing.setSharerName(user.getNameWorkNo());
|
sharing.setSharerName(user.getNameWorkNo());
|
||||||
sharing.setRecipientId(recipientIdList.get(i));
|
sharing.setRecipientId(recipientIdList.get(i));
|
||||||
@@ -146,7 +146,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
|
|||||||
sharing.setStandardId(lawsStandardSharing.getStandardId());
|
sharing.setStandardId(lawsStandardSharing.getStandardId());
|
||||||
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardSharing.getStandardId());
|
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardSharing.getStandardId());
|
||||||
sharing.setStandardName(standard.getStandardName());
|
sharing.setStandardName(standard.getStandardName());
|
||||||
sharing.setStandardNum(lawsStandardSharing.getStandardNum());
|
sharing.setStandardNumber(lawsStandardSharing.getStandardNumber());
|
||||||
sharing.setSharerId(sysUser.getId());
|
sharing.setSharerId(sysUser.getId());
|
||||||
sharing.setSharerName(user.getNameWorkNo());
|
sharing.setSharerName(user.getNameWorkNo());
|
||||||
sharing.setRecipientId(recipientIdList.get(i));
|
sharing.setRecipientId(recipientIdList.get(i));
|
||||||
@@ -181,7 +181,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
|
|||||||
sharing.setStandardId(lawsStandardSharing.getStandardId());
|
sharing.setStandardId(lawsStandardSharing.getStandardId());
|
||||||
LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId());
|
LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId());
|
||||||
sharing.setStandardName(standard.getStandardName());
|
sharing.setStandardName(standard.getStandardName());
|
||||||
sharing.setStandardNum(lawsStandardSharing.getStandardNum());
|
sharing.setStandardNumber(lawsStandardSharing.getStandardNumber());
|
||||||
sharing.setSharerId(sysUser.getId());
|
sharing.setSharerId(sysUser.getId());
|
||||||
sharing.setSharerName(user.getNameWorkNo());
|
sharing.setSharerName(user.getNameWorkNo());
|
||||||
sharing.setRecipientId(recipientIdList.get(i));
|
sharing.setRecipientId(recipientIdList.get(i));
|
||||||
|
|||||||
+2
-5
@@ -37,22 +37,19 @@ public class LawsBrowsingHistory implements Serializable {
|
|||||||
|
|
||||||
/**标准ID*/
|
/**标准ID*/
|
||||||
@ApiModelProperty(value = "标准ID")
|
@ApiModelProperty(value = "标准ID")
|
||||||
@NotBlank(message = "standardId标准ID不能为空")
|
@NotBlank(message = "standardId not null")
|
||||||
private String standardId;
|
private String standardId;
|
||||||
|
|
||||||
/**标准状态(1-国内、2-海外、3-企标)*/
|
/**标准状态(1-国内、2-海外、3-企标)*/
|
||||||
@ApiModelProperty(value = "标准状态(1-国内、2-海外、3-企标)")
|
@ApiModelProperty(value = "标准状态(1-国内、2-海外、3-企标)")
|
||||||
@NotBlank(message = "standardType标准状态(1-国内、2-海外、3-企标)")
|
|
||||||
private String standardType;
|
private String standardType;
|
||||||
|
|
||||||
/**标准编号*/
|
/**标准编号*/
|
||||||
@ApiModelProperty(value = "标准编号")
|
@ApiModelProperty(value = "标准编号")
|
||||||
@NotBlank(message = "standardNum标准编号")
|
private String standardNumber;
|
||||||
private String standardNum;
|
|
||||||
|
|
||||||
/**标准名称*/
|
/**标准名称*/
|
||||||
@ApiModelProperty(value = "标准名称")
|
@ApiModelProperty(value = "标准名称")
|
||||||
@NotBlank(message = "standardName标准名称")
|
|
||||||
private String standardName;
|
private String standardName;
|
||||||
|
|
||||||
/**浏览人ID*/
|
/**浏览人ID*/
|
||||||
|
|||||||
+1
-3
@@ -37,13 +37,11 @@ public class LawsStandardQuestions implements Serializable {
|
|||||||
|
|
||||||
/**提问标题*/
|
/**提问标题*/
|
||||||
@ApiModelProperty(value = "提问标题")
|
@ApiModelProperty(value = "提问标题")
|
||||||
@NotBlank(message = "title not null")
|
|
||||||
private String title;
|
private String title;
|
||||||
|
|
||||||
/**标准编号*/
|
/**标准编号*/
|
||||||
@ApiModelProperty(value = "标准编号")
|
@ApiModelProperty(value = "标准编号")
|
||||||
@NotBlank(message = "standardNum not null")
|
private String standardNumber;
|
||||||
private String standardNum;
|
|
||||||
|
|
||||||
/**标准ID*/
|
/**标准ID*/
|
||||||
@ApiModelProperty(value = "标准ID")
|
@ApiModelProperty(value = "标准ID")
|
||||||
|
|||||||
+2
-3
@@ -45,13 +45,12 @@ public class LawsStandardSharing implements Serializable {
|
|||||||
|
|
||||||
/**标准ID*/
|
/**标准ID*/
|
||||||
@ApiModelProperty(value = "标准ID")
|
@ApiModelProperty(value = "标准ID")
|
||||||
@NotBlank(message = "standardId标准ID不能为空")
|
@NotBlank(message = "standardId not null")
|
||||||
private String standardId;
|
private String standardId;
|
||||||
|
|
||||||
/**标准编号*/
|
/**标准编号*/
|
||||||
@ApiModelProperty(value = "标准编号")
|
@ApiModelProperty(value = "标准编号")
|
||||||
@NotBlank(message = "standardNum标准编号不能为空")
|
private String standardNumber;
|
||||||
private String standardNum;
|
|
||||||
|
|
||||||
/**标准名称*/
|
/**标准名称*/
|
||||||
@ApiModelProperty(value = "标准名称")
|
@ApiModelProperty(value = "标准名称")
|
||||||
|
|||||||
+1
-1
@@ -56,7 +56,7 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
|
|||||||
|
|
||||||
private void assignment(List<LawsStandardSharing> records) {
|
private void assignment(List<LawsStandardSharing> records) {
|
||||||
for (LawsStandardSharing record : records) {
|
for (LawsStandardSharing record : records) {
|
||||||
String standardNum = record.getStandardNum();
|
String standardNum = record.getStandardNumber();
|
||||||
String standardName = record.getStandardName();
|
String standardName = record.getStandardName();
|
||||||
record.setTitle(standardName + "(" + standardNum + ")");
|
record.setTitle(standardName + "(" + standardNum + ")");
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -64,7 +64,7 @@ public class LawsEvaluationNotMet implements Serializable {
|
|||||||
/**标准编号*/
|
/**标准编号*/
|
||||||
@Excel(name = "标准编号", width = 15)
|
@Excel(name = "标准编号", width = 15)
|
||||||
@ApiModelProperty(value = "标准编号")
|
@ApiModelProperty(value = "标准编号")
|
||||||
private java.lang.String standardNum;
|
private java.lang.String standardNumber;
|
||||||
/**项目ID*/
|
/**项目ID*/
|
||||||
@Excel(name = "项目ID", width = 15)
|
@Excel(name = "项目ID", width = 15)
|
||||||
@ApiModelProperty(value = "项目ID")
|
@ApiModelProperty(value = "项目ID")
|
||||||
|
|||||||
Reference in New Issue
Block a user