From bff1966d94e743404ebdeb4bdd008d15e5040287 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 28 Mar 2023 21:58:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?67331=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 0142b904c..3c937134b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3785,8 +3785,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl citeDeliverable(JSONObject json) { - String resultMsg = "引用交付物成功！"; String cut = json.getString("cut"); + String resultMsg = ""; + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + resultMsg = "引用交付物成功！"; + }else { + resultMsg = "Successfully referenced deliverables!"; + } + String projectCertificationInventoryIds = json.getString("projectCertificationInventoryIds"); if(StringUtils.isEmpty(projectCertificationInventoryIds)){ From 81b35d8a07beb3c3f27227ab369fe8d48b5e1370 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 28 Mar 2023 22:14:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?67134=20=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E6=9C=89pre-Homo=E4=BB=BB=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E6=A0=87=E7=BA=A2=E8=8F=9C=E5=8D=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/controller/SysPermissionController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index fcb31c6e8..84956933d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -659,6 +659,7 @@ public class SysPermissionController { flowTypeList.add("3"); flowTypeList.add("4"); flowTypeList.add("10"); + flowTypeList.add("21"); params.put("flowTypeList",flowTypeList); //存在待办任务标识，true为有 boolean existTaskFlag = false; From 5f8fdd5f31546b657b33b9dc69916a1894be7602 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Tue, 28 Mar 2023 22:28:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B966991,67092,66900,6690?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/AuthDummyInventoryInfoEO.java | 10 +++---- .../entity/AuthDummyInventoryInfoEOEn.java | 10 +++---- .../AuthDummyInventoryInfoEOServiceImpl.java | 30 +++++++++---------- ...ctCertificationInventoryEOServiceImpl.java | 4 +-- 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index d01f5c487..fdda05dd9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -63,22 +63,22 @@ public class AuthDummyInventoryInfoEO implements Serializable { private java.lang.String sysOrgCode; /**类别*/ - @Excel(name = "类别", width = 15) + @Excel(name = "*类别", width = 15) @ApiModelProperty(value = "类别") private java.lang.String category; /**检验项目*/ - @Excel(name = "检验项目", width = 15) + @Excel(name = "*检验项目", width = 15) @ApiModelProperty(value = "检验项目") private java.lang.String inspectionItem; /**配置项*/ - @Excel(name = "配置项", width = 15) + @Excel(name = "*配置项", width = 15) @ApiModelProperty(value = "配置项") private java.lang.String configItem; /**WVTA ID*/ - @Excel(name = "WVTA ID", width = 15) + @Excel(name = "*WVTA ID", width = 15) @ApiModelProperty(value = "WVTA ID") private java.lang.String wvtaId; @@ -107,7 +107,7 @@ public class AuthDummyInventoryInfoEO implements Serializable { @ApiModelProperty(value = "交付物类型") private String deliverableType; @TableField(exist = false) - @Excel(name = "交付物类型", width = 15) + @Excel(name = "*交付物类型", width = 15) // 交付物类型名称 private String deliverableTypeName; // 交付物类型名称-英文 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java index 6b15de62c..e7f53d6c4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java @@ -60,22 +60,22 @@ public class AuthDummyInventoryInfoEOEn implements Serializable { private String sysOrgCode; /**类别*/ - @Excel(name = "Category", width = 15) + @Excel(name = "*Category", width = 15) @ApiModelProperty(value = "类别") private String category; /**检验项目*/ - @Excel(name = "Inspection Items", width = 15) + @Excel(name = "*Inspection Items", width = 15) @ApiModelProperty(value = "检验项目") private String inspectionItem; /**配置项*/ - @Excel(name = "Configuration Item", width = 15) + @Excel(name = "*Configuration Item", width = 15) @ApiModelProperty(value = "配置项") private String configItem; /**WVTA ID*/ - @Excel(name = "WVTA ID", width = 15) + @Excel(name = "*WVTA ID", width = 15) @ApiModelProperty(value = "WVTA ID") private String wvtaId; @@ -104,7 +104,7 @@ public class AuthDummyInventoryInfoEOEn implements Serializable { @ApiModelProperty(value = "交付物类型") private String deliverableType; @TableField(exist = false) - @Excel(name = "Deliverable Type", width = 15) + @Excel(name = "*Deliverable Type", width = 15) // 交付物类型名称 private String deliverableTypeName; // 交付物类型名称-英文 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 366b3c223..722c114cb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -859,18 +859,18 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl list = Arrays.asList(title.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ - index = list.indexOf("交付物类型") + 1; + index = list.indexOf("*交付物类型") + 1; }else{ - index = list.indexOf("Deliverable Type") + 1; + index = list.indexOf("*Deliverable Type") + 1; } //创建临时文件夹 @@ -897,18 +897,16 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl