From 1403a9e2a19a286c23603e8a5e2a2eca5cbc7d86 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 8 Sep 2021 17:18:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BB=B4=E6=8A=A4=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayDataFileController.java | 42 +++++++++---------- .../com/jero/data/entity/QueryFileList.java | 1 + .../controller/PayMailBillController.java | 2 +- .../controller/PayMailContractController.java | 6 +-- 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java index 0fa5b029..2884fcc6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java @@ -88,7 +88,7 @@ public class PayDataFileController extends JeroController queryPageList( - @RequestParam(name="id",required = true) String id, + @RequestParam(name="id") String id, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, QueryFileList2 queryFileList2,HttpServletRequest req @@ -109,7 +109,7 @@ public class PayDataFileController extends JeroController queryPageListMeeting( @@ -141,15 +141,15 @@ public class PayDataFileController extends JeroController add(@RequestParam(name="dataId",required = true) String dataId, - @RequestParam(name="fileIds",required = true) String fileIds, - @RequestParam(name="dataType",required = true) int dataType) { + public Result add(@RequestParam(name="dataId") String dataId, + @RequestParam(name="fileIds") String fileIds, + @RequestParam(name="dataType") int dataType) { ArrayList fileIdList = new ArrayList<>(Arrays.asList(fileIds.split(","))); ArrayList list = new ArrayList<>(); stringBuffer = new StringBuffer(); @@ -190,13 +190,13 @@ public class PayDataFileController extends JeroController edit(@RequestParam(name="id",required = true) String id, - @RequestParam(name="fileId",required = true) String fileId, - @RequestParam(name="oldFileId",required = true) String oldFileId) { + public Result edit(@RequestParam(name="id") String id, + @RequestParam(name="fileId") String fileId, + @RequestParam(name="oldFileId") String oldFileId) { iossFileService.removeById(oldFileId); PayDataFile payDataFile = new PayDataFile(); payDataFile.setFileId(fileId); @@ -213,17 +213,16 @@ public class PayDataFileController extends JeroController delete(@RequestParam(name="id",required = true) String id,@RequestParam(name="dataId",required = true) String dataId) { + public Result delete(@RequestParam(name="id") String id,@RequestParam(name="dataId") String dataId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(PayDataFile::getFileId,id); + lambdaQueryWrapper.eq(PayDataFile::getId,id); payDataFileService.remove(lambdaQueryWrapper); - iossFileService.removeById(id); + iossFileService.removeById(dataId); LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); lambdaQueryWrapper2.eq(PayFileDownloadRecord::getFileId,dataId); payFileDownloadRecordService.remove(lambdaQueryWrapper2); @@ -242,7 +241,8 @@ public class PayDataFileController extends JeroController deleteBatch(@RequestParam(name="ids",required = true) String ids,@RequestParam(name="dataIds",required = true) String dataIds) { + public Result deleteBatch(@RequestParam(name="ids",required = true) String ids, + @RequestParam(name="dataIds",required = true) String dataIds) { ArrayList strings = new ArrayList<>(Arrays.asList(ids.split(","))); payDataFileService.removeByIds(strings); ArrayList strings2 = new ArrayList<>(Arrays.asList(dataIds.split(","))); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java index a1cf6096..d96fd418 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java @@ -7,6 +7,7 @@ import lombok.Data; @Data @ApiModel(value = "资料（会议）列表") public class QueryFileList { + @ApiModelProperty(value = "主键id") private java.lang.String id; 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 f871893a..90a7b9df 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 @@ -78,7 +78,7 @@ public class PayMailBillController extends JeroController edit(@RequestParam(name="id") String id, @RequestParam(name="sendMethod") Integer sendMethod, @RequestParam(name="postNo") String postNo, 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 a5ce370e..856ccb2d 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 @@ -1,16 +1,12 @@ package com.jero.mail.controller; -import java.util.Arrays; import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillList; import com.jero.mail.entity.PayMailContract; import com.jero.mail.service.IPayMailContractService; @@ -75,7 +71,7 @@ public class PayMailContractController extends JeroController edit(@RequestParam(name="id") String id, @RequestParam(name="sendMethod") Integer sendMethod, @RequestParam(name="postNo") String postNo,