时间搜索bug

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<PayFileDownl
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<PayFileDownloadRecord> 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())){

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<PayMailBill, IPayMailB
 	 */
 	@ApiOperation(value="邮寄票据-分页列表查询", notes="邮寄票据-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<?> queryPageList(PayMailBillSearch payMailBillSearch,
+	public Result<?> queryPageList( PayMailBillSearch payMailBillSearch,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
 								  ) {
 		QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
 		Page<PayMailBill> 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<PayMailBill, IPayMailB
 	 *  编辑
 	 *
 	 */
-	@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
+	@ApiOperation(value="邮寄票据-邮寄和修改", notes="邮寄票据-邮寄和修改")
 	@Transactional
-	@PostMapping(value = "/edit")
-	public Result<?> edit(@RequestBody PayMailBill payMailBill)  {
+	@PostMapping(value = "/edit2")
+	public Result<?> edit2(@RequestBody PayMailBill payMailBill)  {
 		 payMailBill.setPostStatus(1);
 		 payMailBillService.updateById(payMailBill);
 		//变更5种项目的邮寄状态
 
 		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
-		queryPayMailBillProject.eq(PayMailBillProject::getId,payMailBill.getId());
+		queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId());
 		PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject);
 
 		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject2 = new LambdaQueryWrapper<>();
-		queryPayMailBillProject.eq(PayMailBillProject::getProjectId,one.getId());
+		queryPayMailBillProject2.eq(PayMailBillProject::getProjectId,one.getProjectId());
 		List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject2);
 
 		// 开票金额
@@ -195,11 +203,11 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 			y = listPayMailBill.size();
 		}
 		//获取项目应收金额
-		BigDecimal receivableAmount = null;
+		BigDecimal receivableAmount = new BigDecimal("0.00");
 		if(GlobalConstants.ONE.equals(one.getProjectType())){
 			receivableAmount= payCommonProjectService.getById(one.getProjectId()).getReceivableAmount();}
 		PayCommonProject payCommonProject = new PayCommonProject();
-			if(receivableAmount==invoice && c==y){
+			if(receivableAmount.compareTo(invoice)==0 && c==y){
 				payCommonProject.setId(one.getProjectId());
 				payCommonProject.setMail(1);
 				payCommonProjectService.updateById(payCommonProject);
@@ -211,7 +219,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		else if(GlobalConstants.TWO.equals(one.getProjectType())) {
 			receivableAmount=	payWorkingGroupSubItemService.getById(one.getProjectId()).getReceivableAmount();
 				PayWorkingGroupSubItem payWorkingGroupSubItem = new PayWorkingGroupSubItem();
-				if(receivableAmount==invoice && c==y){
+				if(receivableAmount.compareTo(invoice)==0 && c==y){
 					payWorkingGroupSubItem.setId(one.getProjectId());
 					payWorkingGroupSubItem.setMail(1);
 					payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
@@ -223,7 +231,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		}else if (GlobalConstants.THERE.equals(one.getProjectType())) {
 			receivableAmount= payMeetingSituationService.getById(one.getProjectId()).getAmountReceivable();
 				PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
-				if(receivableAmount==invoice && c==y){
+				if(receivableAmount.compareTo(invoice)==0 && c==y){
 					payMeetingSituation.setId(one.getProjectId());
 					payMeetingSituation.setMail(1);
 					payMeetingSituationService.updateById(payMeetingSituation);
@@ -235,7 +243,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		}else if (GlobalConstants.FORE.equals(one.getProjectType())) {
 			receivableAmount= payMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
 				PayMemberProjectSubitem payMemberProjectSubitem = new PayMemberProjectSubitem();
-				if(receivableAmount==invoice && c==y){
+				if(receivableAmount.compareTo(invoice)==0 && c==y){
 					payMemberProjectSubitem.setId(one.getProjectId());
 					payMemberProjectSubitem.setMail(1);
 					payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
@@ -248,7 +256,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		}else if (GlobalConstants.FIVE.equals(one.getProjectType())){
 			receivableAmount=tbMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
 				TbMemberProjectSubitem tbMemberProjectSubitem = new TbMemberProjectSubitem();
-				if(receivableAmount==invoice && c==y){
+				if(receivableAmount.compareTo(invoice)==0 && c==y){
 					tbMemberProjectSubitem.setId(one.getProjectId());
 					tbMemberProjectSubitem.setMail(1);
 					tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
@@ -260,20 +268,20 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		}
 		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("编辑成功!");
-	 }
+//
+//	 /**
+//	  *  编辑
+//	  *
+//	  */
+//	 @ApiOperation(value="邮寄票据-修改", notes="邮寄票据-修改")
+//	 @Transactional
+//	 @PostMapping(value = "/edit2")
+//	 public Result<?> edit2(@RequestBody PayMailBill payMailBill
+//	 )  {
+//		 payMailBill.setPostStatus(1);
+//		 payMailBillService.updateById(payMailBill);
+//		 return Result.OK("编辑成功!");
+//	 }
 
 //
 //	/**

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java

@@ -44,7 +44,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 	@AutoLog(value = "邮寄合同-分页列表查询")
 	@ApiOperation(value="邮寄合同-分页列表查询", notes="邮寄合同-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<?> queryPageList(PayMailBillList payMailBillList,
+	public Result<?> queryPageList( PayMailBillList payMailBillList,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {

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);
                         }
                     }