From 5521f3271c749c1d4c7ffb0feb14dbb3b48d9b5f Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Thu, 16 Sep 2021 17:51:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayFileDownloadRecordController.java | 10 ++- .../controller/PayMailBillController.java | 72 ++++++++++--------- .../controller/PayMailContractController.java | 2 +- .../handle/impl/EmailSendMsgHandle.java | 2 +- 4 files changed, 50 insertions(+), 36 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java index 50d5d701..7f598ca7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java @@ -3,6 +3,7 @@ package com.jero.data.controller; import java.io.*; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.List; import javax.activation.MimetypesFileTypeMap; import javax.annotation.Resource; @@ -75,15 +76,20 @@ public class PayFileDownloadRecordController extends JeroController queryWrapper = new QueryWrapper<>(); + Calendar calendar= Calendar.getInstance(); + calendar.setTime(payFileDownloadRecord.getEndTime()); + calendar.add(Calendar.HOUR,23);//时 + calendar.add(Calendar.MINUTE,59);//时 + calendar.add(Calendar.SECOND,59);//秒 if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getStartTime()) && ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())) { queryWrapper.ge("create_time", payFileDownloadRecord.getStartTime()); - queryWrapper.le("create_time", payFileDownloadRecord.getEndTime()); + queryWrapper.le("create_time", calendar.getTime()); }else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getStartTime())){ queryWrapper.ge("create_time", payFileDownloadRecord.getStartTime()); }else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())){ - queryWrapper.le("create_time", payFileDownloadRecord.getEndTime()); + queryWrapper.le("create_time", calendar.getTime()); } if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getFileName())){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index e4f31b9e..60e77d36 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -4,10 +4,7 @@ import java.math.BigDecimal; import java.security.PrivateKey; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -102,21 +99,32 @@ public class PayMailBillController extends JeroController queryPageList(PayMailBillSearch payMailBillSearch, + public Result queryPageList( PayMailBillSearch payMailBillSearch, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize ) { QueryWrapper queryWrapper = new QueryWrapper<>(); Page page = new Page<>(pageNo, pageSize); + if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) { + Calendar calendar= Calendar.getInstance(); + calendar.setTime(payMailBillSearch.getEndTime()); + calendar.add(Calendar.HOUR,23);//时 + calendar.add(Calendar.MINUTE,59);//时 + calendar.add(Calendar.SECOND,59);//秒 queryWrapper.ge("send_date", payMailBillSearch.getStartTime()); - queryWrapper.le("send_date", payMailBillSearch.getEndTime()); + queryWrapper.le("send_date", calendar.getTime()); }else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){ queryWrapper.ge("send_date", payMailBillSearch.getStartTime()); }else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){ - queryWrapper.le("send_date", payMailBillSearch.getEndTime()); + Calendar calendar= Calendar.getInstance(); + calendar.setTime(payMailBillSearch.getEndTime()); + calendar.add(Calendar.HOUR,23);//时 + calendar.add(Calendar.MINUTE,59);//时 + calendar.add(Calendar.SECOND,59);//秒 + queryWrapper.le("send_date", calendar.getTime()); } if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){ @@ -162,20 +170,20 @@ public class PayMailBillController extends JeroController edit(@RequestBody PayMailBill payMailBill) { + @PostMapping(value = "/edit2") + public Result edit2(@RequestBody PayMailBill payMailBill) { payMailBill.setPostStatus(1); payMailBillService.updateById(payMailBill); //变更5种项目的邮寄状态 LambdaQueryWrapper queryPayMailBillProject = new LambdaQueryWrapper<>(); - queryPayMailBillProject.eq(PayMailBillProject::getId,payMailBill.getId()); + queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId()); PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject); LambdaQueryWrapper queryPayMailBillProject2 = new LambdaQueryWrapper<>(); - queryPayMailBillProject.eq(PayMailBillProject::getProjectId,one.getId()); + queryPayMailBillProject2.eq(PayMailBillProject::getProjectId,one.getProjectId()); List listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject2); // 开票金额 @@ -195,11 +203,11 @@ public class PayMailBillController extends JeroController edit2(@RequestBody PayMailBill payMailBill - ) { - payMailBill.setPostStatus(1); - payMailBillService.updateById(payMailBill); - return Result.OK("编辑成功!"); - } +// +// /** +// * 编辑 +// * +// */ +// @ApiOperation(value="邮寄票据-修改", notes="邮寄票据-修改") +// @Transactional +// @PostMapping(value = "/edit2") +// public Result edit2(@RequestBody PayMailBill payMailBill +// ) { +// payMailBill.setPostStatus(1); +// payMailBillService.updateById(payMailBill); +// return Result.OK("编辑成功!"); +// } // // /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java index 79b4c14e..a397e031 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java @@ -44,7 +44,7 @@ public class PayMailContractController extends JeroController queryPageList(PayMailBillList payMailBillList, + public Result queryPageList( PayMailBillList payMailBillList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java b/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java index 53786264..a5f56a96 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java @@ -72,7 +72,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle { helper.setText(es_content, true); for(String file :fileList) { if(!StringUtils.isBlank(file)) { - FileSystemResource filePath = new FileSystemResource(new File("D:\\opt\\upFiles" + "\\" + file + ".pdf")); + FileSystemResource filePath = new FileSystemResource(new File("D:\\opt\\upFiles" + "\\" + file)); helper.addAttachment(file, filePath); } }