From 4870e782a80473f9d3e2dc137410066741d5b0bb Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 30 Dec 2022 16:16:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8A=A0=E4=B8=8A@transactional=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectUserPermissionServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java index e780f242b..75979797f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java @@ -34,6 +34,7 @@ import java.util.Date; import java.util.Set; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 项目权限表 @@ -42,6 +43,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@Transactional public class ProjectUserPermissionServiceImpl extends ServiceImpl implements IProjectUserPermissionService { @Autowired From eed32438fdde7a3e124752e3eb90a81d540f79e4 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 30 Dec 2022 16:32:25 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=A0log=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/ProjectUserPermissionController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java index 496b90f3f..cffeeb7a4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java @@ -48,7 +48,9 @@ public class ProjectUserPermissionController extends JeroController Date: Fri, 30 Dec 2022 17:47:03 +0800 Subject: [PATCH 3/6] =?UTF-8?q?64616=20=E8=AE=A4=E8=AF=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=94=B6=E9=9B=86--=E8=AE=A4=E8=AF=81=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E3=80=81=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BA=BA--=E5=AF=BC=E5=87=BA=20=E5=8F=82=E8=80=83=E5=88=97?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=84=E9=99=84=E4=BB=B6=E6=9C=AA=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index a2d5830ce..2c473c02e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3931,6 +3931,31 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl #a# # + String references_col = record1.get("references_col").toString(); + String[] references_colArr = references_col.split("#"); + if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue()) + ||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue()) + ||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + } + + record1.put("references_col",references_col); + // 处理负责领域 record1.put("duty_territory", dutyTerritoryMap.get(dutyTerritory)); From de33009941e8a183bae73761fc3e8959ffd0a0b6 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 30 Dec 2022 18:10:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/report/util/WordUtil.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 4f07c88f9..ae1d10b2e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -1304,11 +1304,11 @@ public class WordUtil { return text; } if (text.equals("New Car Model")) { - text = "New Type "; + text = "New Type"; return text; } if (text.equals("Models In Production")) { - text = "New Vehicle "; + text = "New Vehicle"; return text; } return text; @@ -1348,7 +1348,7 @@ public class WordUtil { blank = "\r\n"; break; case "New Car Model": - blank = " "; + blank = " "; break; case "Models In Production": blank = ""; @@ -1366,7 +1366,7 @@ public class WordUtil { blank = " "; break; case "Public Notice": - blank = " "; + blank = " "; break; case "Release": blank = ""; @@ -1389,6 +1389,9 @@ public class WordUtil { case "if fitted": blank = ""; break; + case "Publicity": + blank = " "; + break; default: break; } From 5437d55fab8c3a55717090a0b75f35aa26dd9c52 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 30 Dec 2022 18:18:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?64614=20=E5=8F=82=E6=95=B0=E9=A1=B9?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95--=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E5=8F=82=E8=80=83=E5=88=97=E6=9C=AA=E6=AD=A3=E5=B8=B8=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 56efb0b76..93fb62838 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3954,6 +3954,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Fri, 30 Dec 2022 18:32:12 +0800 Subject: [PATCH 6/6] update --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 93fb62838..e41696c0e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3961,7 +3961,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl