From e5da1a51c0931b0d5159eec7a60cf726521b1599 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 19 Aug 2022 09:57:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=8A=E8=A3=85?= =?UTF-8?q?=E8=B0=83=E4=BB=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../othermenu/shangzhuangtiaojia/shangzhuangtiaojiaAdd.vue | 4 ++-- .../othermenu/shangzhuangtiaojia/shangzhuangtiaojiaInfo.vue | 4 ++-- .../shangzhuangtiaojiaguanli/shangzhuangtiaojiaDaiBanInfo.vue | 4 ++-- .../shangzhuangtiaojiaguanli/shangzhuangtiaojiaEdit.vue | 4 ++-- .../shangzhuangtiaojiaguanli/shangzhuangtiaojiaYiBanInfo.vue | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaAdd.vue b/anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaAdd.vue index be33ba11ce..d7df951aea 100644 --- a/anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaAdd.vue @@ -71,7 +71,7 @@ {{ scope.row.jacketName }} - + @@ -106,7 +106,7 @@ {{ adjustVehGuidedPrice(scope.row) }} - + diff --git a/anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaInfo.vue b/anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaInfo.vue index 359a9c8a9f..bc2b2b6189 100644 --- a/anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaInfo.vue @@ -68,7 +68,7 @@ {{ scope.row.jacketName }} - + @@ -103,7 +103,7 @@ {{ scope.row.adjustVehGuidedPrice }} - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaDaiBanInfo.vue index 2cbdf3f8d1..cac1c8436e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaDaiBanInfo.vue @@ -66,7 +66,7 @@ {{ scope.row.jacketName }} - + @@ -101,7 +101,7 @@ {{ scope.row.adjustVehGuidedPrice }} - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaEdit.vue index a368e77a40..d32445eca5 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaEdit.vue @@ -70,7 +70,7 @@ {{ scope.row.jacketName }} - + @@ -105,7 +105,7 @@ {{ adjustVehGuidedPrice(scope.row) }} - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaYiBanInfo.vue index 4ad90f2b7b..194f84de38 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaYiBanInfo.vue @@ -64,7 +64,7 @@ {{ scope.row.jacketName }} - + @@ -99,7 +99,7 @@ {{ scope.row.adjustVehGuidedPrice }} - + From 77d6f48054a31881ef4c88be1934bc9aa5396847 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Fri, 19 Aug 2022 10:04:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cmVehiclePatrolinspectionsheetService.java | 54 +++++++++---------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java index bd4e12668b..b586f171bb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java @@ -174,22 +174,37 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService images = dto.getImages(); + for (String s : images) { + if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile1 = new ScmFile(); + scmFile1.setAttachType(type1); + scmFile1.setFileName("巡检相关照片"); + scmFile1.setFilePath(s1); + scmFile1.setLinkSid(scmVehiclePatrolinspectionsheet.getSid()); + scmFileService.save(scmFile1); + } + return rb.success(); + } else { dto.setCreateOrgSid(useOrgSid); + dto.setSid(pcInspection.getSid()); int i = updateBySid(dto, pcInspection.getSid()); if (i == 0) { return rb.setMsg("操作失败"); } //更新待巡检中的为已暂存 - scmVehicleStayPatrolinspectionService.updateByState(dto.getPatrolInspectionSid(),2); + scmVehicleStayPatrolinspectionService.updateByState(dto.getPatrolInspectionSid(), 2); scmFileService.deleteByLinkSidAndType(dto.getSid(), type1); List images = dto.getImages(); for (String s : images) { @@ -203,25 +218,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService images = dto.getImages(); - for (String s : images) { - if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); - } - ScmFile scmFile1 = new ScmFile(); - scmFile1.setAttachType(type1); - scmFile1.setFileName("巡检相关照片"); - scmFile1.setFilePath(s1); - scmFile1.setLinkSid(scmVehiclePatrolinspectionsheet.getSid()); - scmFileService.save(scmFile1); - } - save(scmVehiclePatrolinspectionsheet); - scmVehicleStayPatrolinspectionService.updateState(dto.getPatrolInspectionSid()); - return rb.success(); } /** @@ -236,7 +234,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService images = dto.getImages();