From c79f31ed7d7e49193b6b0cf80487896c4901d6f7 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 18 Dec 2024 09:12:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/order/controller/OrderController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 2484b61..2c08da9 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -175,7 +175,7 @@ public class OrderController extends BaseController { } } - /* @ApiOperation(value = "租赁协议(查看)") + @ApiOperation(value = "租赁协议(查看)") @GetMapping("/leaseAgreement") public AjaxResult leaseAgreement(String orderId, Map replacements) throws IOException, ParseException { OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); @@ -241,7 +241,7 @@ public class OrderController extends BaseController { MultipartFile file = new MockMultipartFile("contract", "contract.docx", MediaType.APPLICATION_OCTET_STREAM_VALUE, wordBytes); return sysFileService.upload(file); - }*/ + } /* @ApiOperation(value = "购物车协议(查看)") @GetMapping("/bookCarAgreement") @@ -306,7 +306,7 @@ public class OrderController extends BaseController { }*/ - @ApiOperation(value = "租赁协议(查看)") + /* @ApiOperation(value = "租赁协议(查看)") @GetMapping("/leaseAgreement") public AjaxResult getleaseAgreement(String orderId, Map replacements) throws ParseException { OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); @@ -347,7 +347,7 @@ public class OrderController extends BaseController { StrSubstitutor sub = new StrSubstitutor(replacements); String result = sub.replace(bmContract.getContent()); return AjaxResult.success(result); - } + }*/ @ApiOperation(value = "购物车协议(查看)") @PostMapping("/bookCarAgreement") From 4cb93fa2457ed4cc299dc6d08b98a2c0e0a35711 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 18 Dec 2024 09:14:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/order/controller/OrderController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 2c08da9..7cce4dd 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -175,7 +175,7 @@ public class OrderController extends BaseController { } } - @ApiOperation(value = "租赁协议(查看)") + @ApiOperation(value = "租赁协议(查看)-word方式") @GetMapping("/leaseAgreement") public AjaxResult leaseAgreement(String orderId, Map replacements) throws IOException, ParseException { OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); @@ -243,7 +243,7 @@ public class OrderController extends BaseController { return sysFileService.upload(file); } - /* @ApiOperation(value = "购物车协议(查看)") + /* @ApiOperation(value = "购物车协议(查看)-word方式") @GetMapping("/bookCarAgreement") public AjaxResult bookCarAgreement(OrderInfoDto orderInfoDto, Map replacements) throws ParseException, IOException { if (orderInfoDto != null) { @@ -306,7 +306,7 @@ public class OrderController extends BaseController { }*/ - /* @ApiOperation(value = "租赁协议(查看)") + /* @ApiOperation(value = "租赁协议(查看)-富文本方式") @GetMapping("/leaseAgreement") public AjaxResult getleaseAgreement(String orderId, Map replacements) throws ParseException { OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); @@ -349,7 +349,7 @@ public class OrderController extends BaseController { return AjaxResult.success(result); }*/ - @ApiOperation(value = "购物车协议(查看)") + @ApiOperation(value = "购物车协议(查看)-富文本方式") @PostMapping("/bookCarAgreement") public AjaxResult getbookCarAgreement(@RequestBody OrderInfoDto orderInfoDto) throws ParseException { if (orderInfoDto != null) { From 001f2120928e59387b00ad400e783dbbb8fbca39 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 18 Dec 2024 09:39:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/controller/BmContractController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java index 1d30a9f..bcda7a4 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java @@ -38,9 +38,9 @@ public class BmContractController extends BaseController { @ApiOperation(value = "合同新增") @PostMapping("/add") public AjaxResult add(@RequestBody BmContract bmContract) { - String decode = URLDecoder.decode(bmContract.getContent()); + /* String decode = URLDecoder.decode(bmContract.getContent()); decode = decode.replace("$", "$"); - bmContract.setContent(decode); + bmContract.setContent(decode);*/ Integer i = bmContractService.add(bmContract); if (i > 0){ return AjaxResult.success("新增成功"); @@ -51,9 +51,9 @@ public class BmContractController extends BaseController { @ApiOperation(value = "合同修改") @PostMapping("/edit") public AjaxResult edit(@RequestBody BmContract bmContract) { - String decode = URLDecoder.decode(bmContract.getContent()); +/* String decode = URLDecoder.decode(bmContract.getContent()); decode = decode.replace("$", "$"); - bmContract.setContent(decode); + bmContract.setContent(decode);*/ Integer i = bmContractService.edit(bmContract); if (i > 0){ return AjaxResult.success("修改成功"); From e6700a09cca3e6908271bf6be440ab0934ffa700 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 18 Dec 2024 09:45:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/controller/BmContractController.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java index bcda7a4..f950354 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java @@ -75,12 +75,8 @@ public class BmContractController extends BaseController { @ApiOperation(value = "合同状态修改（开启/关闭）") @PostMapping("/updateStatus") public AjaxResult updateStatus(@RequestBody BmContract bmContract) { - Integer i = bmContractService.updateStatus(bmContract); - if (i > 0){ - return AjaxResult.success(); - }else { - return AjaxResult.error(); - } + bmContractService.updateStatus(bmContract); + return AjaxResult.success(); } @ApiOperation(value = "合同模板列表") From 3b0b0c331e823da634b4402f35bf1a9fd00c4f45 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 18 Dec 2024 09:47:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/controller/BmContractController.java | 8 ++++++-- .../contract/service/impl/BmContractServiceImpl.java | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java index f950354..bcda7a4 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java @@ -75,8 +75,12 @@ public class BmContractController extends BaseController { @ApiOperation(value = "合同状态修改（开启/关闭）") @PostMapping("/updateStatus") public AjaxResult updateStatus(@RequestBody BmContract bmContract) { - bmContractService.updateStatus(bmContract); - return AjaxResult.success(); + Integer i = bmContractService.updateStatus(bmContract); + if (i > 0){ + return AjaxResult.success(); + }else { + return AjaxResult.error(); + } } @ApiOperation(value = "合同模板列表") diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java index b2c83e6..24f506c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java @@ -108,7 +108,8 @@ public class BmContractServiceImpl implements BmContractService { if (i > 0) { // 其他的禁用 bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); - return bmContractMapper.updateStatusOther(bmContract); + bmContractMapper.updateStatusOther(bmContract); + return i; } else { return i; } From df8a7f32453bcb83ba830c8e27028170fa47db1f Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 18 Dec 2024 10:08:16 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/order/controller/OrderController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 7cce4dd..e29f938 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -243,7 +243,7 @@ public class OrderController extends BaseController { return sysFileService.upload(file); } - /* @ApiOperation(value = "购物车协议(查看)-word方式") + @ApiOperation(value = "购物车协议(查看)-word方式") @GetMapping("/bookCarAgreement") public AjaxResult bookCarAgreement(OrderInfoDto orderInfoDto, Map replacements) throws ParseException, IOException { if (orderInfoDto != null) { @@ -303,7 +303,7 @@ public class OrderController extends BaseController { } else { return AjaxResult.error("参数错误"); } - }*/ + } /* @ApiOperation(value = "租赁协议(查看)-富文本方式") @@ -349,7 +349,7 @@ public class OrderController extends BaseController { return AjaxResult.success(result); }*/ - @ApiOperation(value = "购物车协议(查看)-富文本方式") + /* @ApiOperation(value = "购物车协议(查看)-富文本方式") @PostMapping("/bookCarAgreement") public AjaxResult getbookCarAgreement(@RequestBody OrderInfoDto orderInfoDto) throws ParseException { if (orderInfoDto != null) { @@ -389,5 +389,5 @@ public class OrderController extends BaseController { } else { return AjaxResult.error("参数错误"); } - } + }*/ }