From 329bc170c290cdc257ce74efbb8fa038080d5354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 27 Jun 2023 16:43:45 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=95=B0=E6=8D=AE=E6=93=8D=E4=BD=9C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=A3=80=E6=9F=A5=E5=88=9B=E5=BB=BA=E4=BA=BA=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationDirectoryEOServiceImpl.java | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java index f30894f6b..515c52d2c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java @@ -203,7 +203,6 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getId,id); - LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getCreateBy,currentUser.getUsername()); - Integer integer = this.baseMapper.selectCount(queryWrapper); - if(integer > 0){ - result = true; - }else { - String message = ""; - if(StringUtils.equals(cut, CutEnum.CN.getValue())){ - message = "用户只能对自己创建的数据进行操作。"; - }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ - message = "Users can only operate data created by themselves."; - } - throw new JeroBootException(message); - } - }else { - result = true; - } - }catch (Exception ex){ - log.error("验证项目库-认证目录数据异常：" + ex.getMessage()); - throw new JeroBootException("验证项目库-认证目录数据异常！"); - } - return result; +// try{ +// if(StringUtils.isNotEmpty(id)){ +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getId,id); +// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getCreateBy,currentUser.getUsername()); +// Integer integer = this.baseMapper.selectCount(queryWrapper); +// if(integer > 0){ +// result = true; +// }else { +// String message = ""; +// if(StringUtils.equals(cut, CutEnum.CN.getValue())){ +// message = "用户只能对自己创建的数据进行操作。"; +// }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ +// message = "Users can only operate data created by themselves."; +// } +// throw new JeroBootException(message); +// } +// }else { +// result = true; +// } +// }catch (Exception ex){ +// log.error("验证项目库-认证目录数据异常：" + ex.getMessage()); +// throw new JeroBootException("验证项目库-认证目录数据异常！"); +// } + return true; } } From a0fa792ed35833a8e34043f50853c33d5bb32a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 27 Jun 2023 17:59:16 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0studio=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index c02eec2f8..04429394c 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -247,7 +247,7 @@ {{$t('Assignedby')}} -
+
{{$t('dataExport')}}
From daf17a71d238d07add2619f67dd21a616f7860f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 27 Jun 2023 19:29:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9C=8B=E6=9D=BF=20=E9=A6=96=E5=85=88?= =?UTF-8?q?=E6=8E=92=E5=BA=8F-=E8=AE=A4=E8=AF=81=E6=89=B9=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectStatusBoardServiceImpl.java | 66 ++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index 34514e2a4..792951058 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -15,6 +15,7 @@ import com.jero.modules.cert.collect.entity.ParamsManifestEO; import com.jero.modules.cert.collect.enums.CollectManifestStatisticsStateEnum; import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; import com.jero.modules.cert.collect.service.IParamsManifestEOService; +import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.*; @@ -50,6 +51,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.text.DecimalFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CountDownLatch; @@ -171,7 +173,8 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp); } } - Collections.sort(projectLibraryBaseList); + //Collections.sort(projectLibraryBaseList); + List dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region"); for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { @@ -194,6 +197,67 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService } } } + Collections.sort(result, new Comparator>() { + @Override + public int compare(Map o1, Map o2) { + ProjectLibraryBase p1 = (ProjectLibraryBase) o1.get("projectInfo"); + ProjectLibraryBase p2 = (ProjectLibraryBase) o2.get("projectInfo"); + Date defaultTime = null; + try { + defaultTime = sdf.parse("2099-01-01"); + } catch (ParseException e) { + e.printStackTrace(); + } + Date HomoKoTime1 = defaultTime; + List> tnvList1 = (List>) o1.get("data"); + if (CollectionUtils.isNotEmpty(tnvList1)) { + List tnList1 = tnvList1.get(0); + if (CollectionUtils.isNotEmpty(tnList1)) { + for (TimeNodeVO tnv1 : tnList1) { + if (tnv1.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName()) + || tnv1.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getValue())) { + HomoKoTime1 = tnv1.getTime(); + } + } + } + } + Date HomoKoTime2 = defaultTime; + List> tnvList2 = (List>) o2.get("data"); + if (CollectionUtils.isNotEmpty(tnvList2)) { + List tnList2 = tnvList2.get(0); + if (CollectionUtils.isNotEmpty(tnList2)) { + for (TimeNodeVO tnv2 : tnList2) { + if (tnv2.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName()) + || tnv2.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getValue())) { + HomoKoTime2 = tnv2.getTime(); + } + } + } + } + + //首先排序-认证批准 + if(!HomoKoTime1.equals(HomoKoTime2)){ + return HomoKoTime1.compareTo(HomoKoTime2);//升序 + } + if (!p1.getProjectName().equals(p2.getProjectName())) { + return p1.getProjectName().compareTo(p2.getProjectName());//升序 + } + if (!p1.getYearName().equals(p2.getYearName())) { + if (p1.getYearName().length() != p2.getYearName().length()) { + return p1.getYearName().length() - p2.getYearName().length(); + } else { + return p1.getYearName().compareTo(p2.getYearName());//升序 + } + } + if (!p1.getTargetMarket().equals(p2.getTargetMarket())) { + return p1.getTargetMarket().compareTo(p2.getTargetMarket());//升序 + } + if (!p1.getProjectVersion().equals(p2.getProjectVersion())) { + return Integer.valueOf(p1.getProjectVersion()) - Integer.valueOf(p2.getProjectVersion());//升序 + } + return 0; + } + }); return result; } From f67f41ee3eb644ddc01ed4cf2a142bde86c42151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 27 Jun 2023 19:52:12 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT,=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=8C=89=E6=95=B0=E9=87=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 5513b6a31..0ba3101b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -2055,7 +2055,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> dataList,Map params) { String orderByField = (String) params.get("orderByField"); String orderBy = (String) params.get("orderBy"); - if(CollectionUtils.isNotEmpty(dataList) && StringUtils.isNotEmpty(orderByField) && StringUtils.isNotEmpty(orderBy)){ + if(CollectionUtils.isNotEmpty(dataList)){ Collator comparator = Collator.getInstance(Locale.CHINESE); Collections.sort(dataList,(data1,data2)->{ String param1 = ""; @@ -2071,10 +2071,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl Date: Tue, 27 Jun 2023 20:33:21 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=20=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=20=E5=AF=B9/=E7=AC=A6=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchcenter/service/impl/DocumentSearchServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 4d6a50463..023295ef0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -413,6 +413,8 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } if(StringUtils.isBlank(searchVO.getSelectValue())){ searchVO.setSelectValue(SEARCH_FLAG); + }else{ + searchVO.setSelectValue(searchVO.getSelectValue().replaceAll("/", "\\\\/")); } //判断索引是否存在 @@ -428,6 +430,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } String selectValue = searchVO.getSelectValue(); String selectValueTwo = searchVO.getSelectValueTwo(); + selectValueTwo = selectValueTwo.replaceAll("/", "\\\\/"); //1. 需要查询的字段 List fieldList = new ArrayList<>(); fieldList.add("serial_number");//权重6 From 301a0209c79eb27a22ba106ab76594daf3d82c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 27 Jun 2023 20:44:03 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=20=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=20=E5=AF=B9/=E7=AC=A6=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DocumentSearchServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 023295ef0..83914450d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -44,6 +44,7 @@ import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import javax.swing.*; import java.util.*; import java.util.stream.Collectors; @@ -430,7 +431,9 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } String selectValue = searchVO.getSelectValue(); String selectValueTwo = searchVO.getSelectValueTwo(); - selectValueTwo = selectValueTwo.replaceAll("/", "\\\\/"); + if(StringUtils.isNotEmpty(selectValueTwo)){ + selectValueTwo = selectValueTwo.replaceAll("/", "\\\\/"); + } //1. 需要查询的字段 List fieldList = new ArrayList<>(); fieldList.add("serial_number");//权重6 @@ -535,7 +538,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { if(StringUtils.isEmpty(selectValue) || StringUtils.equals(selectValue,SEARCH_FLAG)){ Map createTime = new HashMap<>(); Map createTime1 = new HashMap<>(); - createTime.put("order","desc"); + createTime.put("order", "desc"); createTime1.put("create_time",createTime); sort.putAll(createTime1); }else { From f4259a34a527054585474261614d3f38d67d538f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 28 Jun 2023 09:45:24 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=20=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83-=E4=BB=BB=E5=8A=A1=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E2=80=98=E6=B8=85=E5=8D=95=E6=A0=A1=E6=A0=B8?= =?UTF-8?q?=E2=80=99=E6=94=B9=E4=B8=BA=E2=80=98=E4=BB=BB=E5=8A=A1=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/phone/service/impl/ToDoCenterServiceImpl.java | 6 +++--- .../modules/project/enums/CertificationFlowNodeEnum.java | 2 +- .../todoCenter/service/impl/ProcessInfoEOServiceImpl.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java index dbe384066..6d2a0c2da 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java @@ -415,11 +415,11 @@ public class ToDoCenterServiceImpl implements IToDoCenterService { data.setTaskDefinitionKeyName(taskDefinitionKeyName); } } - // 如果是清单确认流程，将任务节点设置为 清单校核：Checklist verification + // 如果是清单确认流程，将任务节点设置为 任务发起：Task initiation if (StringUtils.equals(data.getFlowType(), FlowTypeEnum.QDQR.getValue())) { - String taskDefinitionKeyName = "清单校核"; + String taskDefinitionKeyName = "任务发起"; if (StringUtils.equals(cut, CutEnum.EN.getValue())) { - taskDefinitionKeyName = "Checklist verification"; + taskDefinitionKeyName = "Task initiation"; } data.setTaskDefinitionKeyName(taskDefinitionKeyName); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java index 34609c13c..09adf3b2d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java @@ -25,7 +25,7 @@ public enum CertificationFlowNodeEnum { * 任务办理 -> 责任人接受之后，等待提交交付物 * 任务审查 -> 责任人提交交付物之后，认证工程师审查。 */ - CHECKLIST_VERIFICATION ("Checklist verification","清单校核","Checklist verification"), + CHECKLIST_VERIFICATION ("Task initiation","任务发起","Task initiation"), TASK_RESPONSIBILITY_CONFIRMATION ("Task responsibility confirmation","任务责任确认","Task responsibility confirmation"), TASK_HANDLING ("Task handling","任务办理","Task handling"), TASK_REVIEW ("Task Review","任务审查","Task Review"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index 1a4c5a5aa..d7a52229f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -778,11 +778,11 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl