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

fix: 系统中关于企标标准状态字典Key误用Bug的修复

Browse Source
This commit is contained in:
mzaxd
2023-12-29 17:47:11 +08:00
parent 8a3c84cdee
commit 8d4944cbd1
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class ManyStandardSelectionBox {
@Dict(dicCode = "standard_state") @Dict(dicCode = "standard_state")
private java.lang.String standardState; private java.lang.String standardState;
@ApiModelProperty(value = "企标标准状态") @ApiModelProperty(value = "企标标准状态")
@Dict(dicCode = "es_status") @Dict(dicCode = "enterprise_standard_state")
private java.lang.String esStandardState; private java.lang.String esStandardState;
public void setStandardState(String standardState) { public void setStandardState(String standardState) {
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java
+1 -1
View File
@@ -152,7 +152,7 @@ public class LawsEnterpriseStandard implements Serializable {
/** /**
* 标准状态 * 标准状态
*/ */
@Dict(dicCode = "es_status") @Dict(dicCode = "enterprise_standard_state")
@ApiModelProperty(value = "标准状态") @ApiModelProperty(value = "标准状态")
private String standardState; private String standardState;
laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardCollection.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class LawsStandardCollection implements Serializable {
private String onTheProductionDate; private String onTheProductionDate;
/**标准状态*/ /**标准状态*/
@Dict(dicCode = "es_status") @Dict(dicCode = "enterprise_standard_state")
// @Dict(dicCode = "standard_state") // @Dict(dicCode = "standard_state")
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "标准状态") @ApiModelProperty(value = "标准状态")
laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(standardId); LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(standardId);
if (standard != null){ if (standard != null){
collection.setReleaseDate(standard.getReleaseDate()); collection.setReleaseDate(standard.getReleaseDate());
String standard_state = sysDictService.queryDictTextByKey("es_status", standard.getStandardState()); String standard_state = sysDictService.queryDictTextByKey("enterprise_standard_state", standard.getStandardState());
collection.setStandardState(standard_state); collection.setStandardState(standard_state);
} }
} }