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

fix 78182 企业标准-标准状态 封存状态排序错误

Browse Source
This commit is contained in:
liao
2023-11-07 09:21:32 +08:00
parent 73ed203721
commit d23bee3843
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+1 -1
View File
@@ -2030,7 +2030,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
lawsOverseasStandardService.update(fbUpdateWrapper); lawsOverseasStandardService.update(fbUpdateWrapper);
// 企标 // 企标
LambdaUpdateWrapper<LawsEnterpriseStandard> qbUpdateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<LawsEnterpriseStandard> qbUpdateWrapper = new LambdaUpdateWrapper<>();
qbUpdateWrapper.set(LawsEnterpriseStandard::getStandardState, 9); qbUpdateWrapper.set(LawsEnterpriseStandard::getStandardState, "9");
qbUpdateWrapper.in(LawsEnterpriseStandard::getStandardNumber, standardNumbers); qbUpdateWrapper.in(LawsEnterpriseStandard::getStandardNumber, standardNumbers);
lawsEnterpriseStandardService.update(qbUpdateWrapper); lawsEnterpriseStandardService.update(qbUpdateWrapper);
} }
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java
+1 -1
View File
@@ -154,7 +154,7 @@ public class LawsEnterpriseStandard implements Serializable {
*/ */
@Dict(dicCode = "es_status") @Dict(dicCode = "es_status")
@ApiModelProperty(value = "标准状态") @ApiModelProperty(value = "标准状态")
private Integer standardState; private String standardState;
/** /**
* 企标体系 * 企标体系
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+1 -1
View File
@@ -278,7 +278,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
es.setReleaseDate(dto.getFbrq()); es.setReleaseDate(dto.getFbrq());
es.setImplementationDate(dto.getSsrq()); es.setImplementationDate(dto.getSsrq());
String standardState = dto.getBzzt(); String standardState = dto.getBzzt();
es.setStandardState(standardState.equals("现行有效") ? 8 : 9); es.setStandardState(standardState.equals("现行有效") ? "8" : "9");
// 代替被代替特殊逻辑 // 代替被代替特殊逻辑
es.setSubstituteStandardNumber(dto.getTdbzh()); es.setSubstituteStandardNumber(dto.getTdbzh());
es.setReplacedByStandardNumber(dto.getBtdbzh()); es.setReplacedByStandardNumber(dto.getBtdbzh());
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", String.valueOf(standard.getStandardState())); String standard_state = sysDictService.queryDictTextByKey("es_status", standard.getStandardState());
collection.setStandardState(standard_state); collection.setStandardState(standard_state);
} }
} }
laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class LawsEnterpriseStandardTest {
lawsEnterpriseStandard.setEnglishName(faker.commerce().productName()); lawsEnterpriseStandard.setEnglishName(faker.commerce().productName());
lawsEnterpriseStandard.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS)); lawsEnterpriseStandard.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS));
lawsEnterpriseStandard.setImplementationDate(faker.date().past(1, TimeUnit.SECONDS)); lawsEnterpriseStandard.setImplementationDate(faker.date().past(1, TimeUnit.SECONDS));
lawsEnterpriseStandard.setStandardState(faker.random().nextInt(5)); lawsEnterpriseStandard.setStandardState(faker.random().nextInt(5) + "");
return lawsEnterpriseStandard; return lawsEnterpriseStandard;
} }