QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(88091): 跳转校验顺序

Browse Source
This commit is contained in:
yjz
2024-08-06 09:49:26 +08:00
parent 2b28b038ee
commit 2b2c74aa72
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standard/util/StandardUtil.java
+16 -16
View File
@@ -67,6 +67,22 @@ public class StandardUtil {
}
}
// 查询标准解读流程
List<ProcessStandardInterpret> list1 = processStandardInterpretService.list(
new LambdaQueryWrapper<ProcessStandardInterpret>()
.in(ProcessStandardInterpret::getStandardId, needDelStandardIdList));
if (CollectionUtils.isNotEmpty(list1)){
List<String> projectIdList = list1.stream()
.map(ProcessStandardInterpret::getProjectId)
.collect(Collectors.toList());
int count1 = processAllService.count(new LambdaQueryWrapper<ProcessAll>()
.in(ProcessAll::getProjectId, projectIdList)
.ne(ProcessAll::getPrcStatus, ProcessStatusEnum.WITHDRAWN.getValue()));
if (count1 > 0) {
throw new JeroBootException(ResultCommon.SCC_DELETE_STANDARD_ERROR3);
}
}
List<LawsDomesticStandard> list = lawsDomesticStandardService.list(
new LambdaQueryWrapper<LawsDomesticStandard>()
.select(LawsDomesticStandard::getStandardNumber)
@@ -83,22 +99,6 @@ public class StandardUtil {
if (count > 0) {
throw new JeroBootException(ResultCommon.SCC_DELETE_STANDARD_ERROR2);
}
// 查询标准解读流程
List<ProcessStandardInterpret> list1 = processStandardInterpretService.list(
new LambdaQueryWrapper<ProcessStandardInterpret>()
.in(ProcessStandardInterpret::getStandardId, needDelStandardIdList));
if (CollectionUtils.isNotEmpty(list1)){
List<String> projectIdList = list1.stream()
.map(ProcessStandardInterpret::getProjectId)
.collect(Collectors.toList());
int count1 = processAllService.count(new LambdaQueryWrapper<ProcessAll>()
.in(ProcessAll::getProjectId, projectIdList)
.ne(ProcessAll::getPrcStatus, ProcessStatusEnum.WITHDRAWN.getValue()));
if (count1 > 0) {
throw new JeroBootException(ResultCommon.SCC_DELETE_STANDARD_ERROR3);
}
}
}
}
laws-single-startup/src/main/resources/i18n/messages.properties
+1 -1
View File
@@ -79,7 +79,7 @@ zip_root_one_excel=\u538B\u7F29\u5305\u6839\u76EE\u5F55\u4E0B\u4EC5\u80FD\u5B58\
message.no.exists.standard=\u6807\u51C6\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
scc.delete.standard.error=\u6CD5\u89C4\u7B26\u5408\u6027\u6392\u67E5\u6D41\u7A0B\u6709\u6B63\u5728\u8FDB\u884C\u4E2D\u7684\u6D41\u7A0B\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664
scc.delete.standard.error2=\u6807\u51C6\u6709\u88AB\u62C6\u5206\u7684\u6570\u636E\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664
scc.delete.standard.error3=\u6807\u51C6\u89E3\u8BFB\u6D41\u7A0B\u6709\u6B63\u5728\u8FDB\u884C\u4E2D\u7684\u6D41\u7A0B\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664
scc.delete.standard.error3=\u6807\u51C6\u6B63\u5728\u89E3\u8BFB\u6D41\u7A0B\u4E2D\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664
split.import.template.error=\u5206\u89E3\u5355\u4E0A\u4F20\u6A21\u677F\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
model.import.template.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6A21\u677F\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
model.import.data.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6570\u636E\u9519\u8BEF\u3002{0}
laws-single-startup/src/main/resources/i18n/messages_en.properties
+2 -2
View File
@@ -95,8 +95,8 @@ data.does.not.exist={0} does not exist
row.n.import=Row {0}
scc.delete.standard.error=The standard has been used by the Standard Compliance Check Process, can not delete
scc.delete.standard.error2=Standards have split data, can not delete
scc.delete.standard.error3=The standard interpretation process has ongoing processes, can not delete
scc.delete.standard.error3=The standard is being interpreted, can not delete
split.import.template.error=Split import template error
model.import.template.error=Model import template error
model.import.data.error=Model import data error.{0}
file.empty.import.error=The file is empty, please upload again
file.empty.import.error=The file is empty, please upload again
laws-single-startup/src/main/resources/i18n/messages_zh.properties
+2 -2
View File
@@ -94,8 +94,8 @@ data.does.not.exist={0}\u6570\u636E\u4E0D\u5B58\u5728
row.n.import=\u7B2C{0}\u884C
scc.delete.standard.error=\u6709\u6B63\u5728\u8FDB\u884C\u4E2D\u7684\u6CD5\u89C4\u7B26\u5408\u6027\u6392\u67E5\u6D41\u7A0B\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664
scc.delete.standard.error2=\u6807\u51C6\u6709\u88AB\u62C6\u5206\u7684\u6570\u636E\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664
scc.delete.standard.error3=\u6807\u51C6\u89E3\u8BFB\u6D41\u7A0B\u6709\u6B63\u5728\u8FDB\u884C\u4E2D\u7684\u6D41\u7A0B\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664
scc.delete.standard.error3=\u6807\u51C6\u6B63\u5728\u89E3\u8BFB\u6D41\u7A0B\u4E2D\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664
split.import.template.error=\u5206\u89E3\u5355\u4E0A\u4F20\u6A21\u677F\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
model.import.template.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6A21\u677F\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
model.import.data.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6570\u636E\u9519\u8BEF\u3002{0}
file.empty.import.error=\u6587\u4EF6\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
file.empty.import.error=\u6587\u4EF6\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5