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("修改成功"); 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; } 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 39848a3..e2c9cd5 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 @@ -192,7 +192,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); @@ -258,9 +258,9 @@ public class OrderController extends BaseController { MultipartFile file = new MockMultipartFile("contract", "contract.docx", MediaType.APPLICATION_OCTET_STREAM_VALUE, wordBytes); return sysFileService.upload(file); - }*/ + } - /* @ApiOperation(value = "购物车协议(查看)") + @ApiOperation(value = "购物车协议(查看)-word方式") @GetMapping("/bookCarAgreement") public AjaxResult bookCarAgreement(OrderInfoDto orderInfoDto, Map replacements) throws ParseException, IOException { if (orderInfoDto != null) { @@ -320,10 +320,10 @@ public class OrderController extends BaseController { } else { return AjaxResult.error("参数错误"); } - }*/ + } - @ApiOperation(value = "租赁协议(查看)") + /* @ApiOperation(value = "租赁协议(查看)-富文本方式") @GetMapping("/leaseAgreement") public AjaxResult getleaseAgreement(String orderId, Map replacements) throws ParseException { OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); @@ -364,9 +364,9 @@ public class OrderController extends BaseController { StrSubstitutor sub = new StrSubstitutor(replacements); String result = sub.replace(bmContract.getContent()); return AjaxResult.success(result); - } + }*/ - @ApiOperation(value = "购物车协议(查看)") + /* @ApiOperation(value = "购物车协议(查看)-富文本方式") @PostMapping("/bookCarAgreement") public AjaxResult getbookCarAgreement(@RequestBody OrderInfoDto orderInfoDto) throws ParseException { if (orderInfoDto != null) { @@ -406,5 +406,5 @@ public class OrderController extends BaseController { } else { return AjaxResult.error("参数错误"); } - } + }*/ }