fix: 87529 外来标准法规文本库--代替被代替规则未生效
This commit is contained in:
+2
-1
@@ -91,6 +91,7 @@ public class UpdateStandardStatusJob implements Job {
|
|||||||
.map(LawsReplacedStandard::getReplaced).collect(Collectors.toList());
|
.map(LawsReplacedStandard::getReplaced).collect(Collectors.toList());
|
||||||
|
|
||||||
for (String s : replacedStandardNumberList) {
|
for (String s : replacedStandardNumberList) {
|
||||||
|
s = s.split("《")[0];
|
||||||
LawsEnterpriseStandard es = esMap.get(s);
|
LawsEnterpriseStandard es = esMap.get(s);
|
||||||
if (es != null) {
|
if (es != null) {
|
||||||
needAbolishStandardIdList.add(es.getId());
|
needAbolishStandardIdList.add(es.getId());
|
||||||
@@ -132,7 +133,6 @@ public class UpdateStandardStatusJob implements Job {
|
|||||||
for (String dateStr : dateStrList) {
|
for (String dateStr : dateStrList) {
|
||||||
if (sdf.parse(dateStr).getTime() <= System.currentTimeMillis()) {
|
if (sdf.parse(dateStr).getTime() <= System.currentTimeMillis()) {
|
||||||
allExpireStandardNumberList.add(gb.getStandardNumber());
|
allExpireStandardNumberList.add(gb.getStandardNumber());
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -160,6 +160,7 @@ public class UpdateStandardStatusJob implements Job {
|
|||||||
.map(LawsReplacedStandard::getReplaced).collect(Collectors.toList());
|
.map(LawsReplacedStandard::getReplaced).collect(Collectors.toList());
|
||||||
|
|
||||||
for (String s : replacedStandardNumberList) {
|
for (String s : replacedStandardNumberList) {
|
||||||
|
s = s.split("《")[0];
|
||||||
LawsDomesticStandard lawsDomesticStandard = dbMap.get(s);
|
LawsDomesticStandard lawsDomesticStandard = dbMap.get(s);
|
||||||
if (lawsDomesticStandard != null) {
|
if (lawsDomesticStandard != null) {
|
||||||
if (YesOrNoEnum.YES.getValue().equals(lawsDomesticStandard.getAutoUpdateStateFlag())) {
|
if (YesOrNoEnum.YES.getValue().equals(lawsDomesticStandard.getAutoUpdateStateFlag())) {
|
||||||
|
|||||||
Reference in New Issue
Block a user