From 4c20b082e1ef0bbf7556c0f941b6b6c9e6f12513 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 8 Sep 2021 15:59:07 +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 --- .../PayCaseCommitteeController.java | 2 +- .../PayCaseCommitteeSubitemController.java | 8 +-- .../PayDataDirectoryController.java | 2 +- .../controller/PayDataFileController.java | 56 +++++++++---------- .../PayFileDownloadRecordController.java | 7 ++- .../main/java/com/jero/util/AmountUtil.java | 7 +-- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index 3b020afc..749a8c48 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -139,7 +139,7 @@ public class PayCaseCommitteeController extends JeroController delete(@RequestParam(name="id") String id) { + public Result delete(@RequestParam(name="id",required = true) String id) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayCaseCommitteeSubitem::getCommitteeId,id); List payCaseCommitteeSubitems = payCaseCommitteeSubitemService.selectList(queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index 0e9691ed..e0fd2683 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -97,7 +97,7 @@ public class PayCaseCommitteeSubitemController extends JeroController queryPageList(@RequestParam(name="id") String id) { + public Result queryPageList(@RequestParam(name="id",required = true) String id) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("pm.committee_id", id); List list = payCaseCommitteeSubitemService.list2(queryWrapper); @@ -124,7 +124,7 @@ public class PayCaseCommitteeSubitemController extends JeroController voiled(@RequestParam(name="id") String id) { + public Result voiled(@RequestParam(name="id",required = true) String id) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PayCaseCommitteeSubitem::getContactsId, id); List list = payCaseCommitteeSubitemService.list(lambdaQueryWrapper); @@ -156,7 +156,7 @@ public class PayCaseCommitteeSubitemController extends JeroController delete(@RequestParam(name="id") String id) { + public Result delete(@RequestParam(name="id",required = true) String id) { payCaseCommitteeSubitemService.removeById(id); return Result.OK("删除成功!"); } @@ -169,7 +169,7 @@ public class PayCaseCommitteeSubitemController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { + public Result deleteBatch(@RequestParam(name="ids",required = true) String ids) { this.payCaseCommitteeSubitemService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java index 6e5688e9..caf9693c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java @@ -294,7 +294,7 @@ public class PayDataDirectoryController extends JeroController getOne(@RequestParam(name="id") String id) { + public Result getOne(@RequestParam(name="id",required = true) String id) { PayDataDirectory payDataDirectory = payDataDirectoryService.getById(id); return Result.OK(payDataDirectory); } 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 33baf2b5..0fa5b029 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 @@ -70,7 +70,7 @@ public class PayDataFileController extends JeroController queryPageList( - @RequestParam(name="id") String id, + @RequestParam(name="id",required = true) String id, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, QueryFileList2 queryFileList2,HttpServletRequest req @@ -113,7 +113,7 @@ public class PayDataFileController extends JeroController queryPageListMeeting( - @RequestParam(name="id") String id, + @RequestParam(name="id",required = true) String id, QueryFileListBySearch queryFileListBySearch, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -135,11 +135,11 @@ public class PayDataFileController extends JeroController add(@RequestParam(name="dataId") String dataId, - @RequestParam(name="fileIds") String fileIds, - @RequestParam(name="dataType") int dataType) { + public Result add(@RequestParam(name="dataId",required = true) String dataId, + @RequestParam(name="fileIds",required = true) String fileIds, + @RequestParam(name="dataType",required = true) int dataType) { ArrayList fileIdList = new ArrayList<>(Arrays.asList(fileIds.split(","))); ArrayList list = new ArrayList<>(); stringBuffer = new StringBuffer(); @@ -194,9 +194,9 @@ public class PayDataFileController extends JeroController edit(@RequestParam(name="id") String id, - @RequestParam(name="fileId") String fileId, - @RequestParam(name="oldFileId") String oldFileId) { + public Result edit(@RequestParam(name="id",required = true) String id, + @RequestParam(name="fileId",required = true) String fileId, + @RequestParam(name="oldFileId",required = true) String oldFileId) { iossFileService.removeById(oldFileId); PayDataFile payDataFile = new PayDataFile(); payDataFile.setFileId(fileId); @@ -219,7 +219,7 @@ public class PayDataFileController extends JeroController delete(@RequestParam(name="id") String id,@RequestParam(name="dataId") String dataId) { + public Result delete(@RequestParam(name="id",required = true) String id,@RequestParam(name="dataId",required = true) String dataId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PayDataFile::getFileId,id); payDataFileService.remove(lambdaQueryWrapper); @@ -242,7 +242,7 @@ public class PayDataFileController extends JeroController deleteBatch(@RequestParam(name="ids") String ids,@RequestParam(name="dataIds") 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(","))); @@ -264,7 +264,7 @@ public class PayDataFileController extends JeroController> queryCompanyByMeetingId( - @RequestParam(name="meetingId") String meetingId + @RequestParam(name="meetingId",required = true) String meetingId ) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PayMeetingSituation::getMeetingId, meetingId); @@ -287,8 +287,8 @@ public class PayDataFileController extends JeroController> queryPeopleByCompanyIdAndMeetingId( - @RequestParam(name="meetingId") String meetingId, - @RequestParam(name="companyId") String companyId + @RequestParam(name="meetingId",required = true) String meetingId, + @RequestParam(name="companyId",required = true) String companyId ) { QueryWrapper QueryWrapper = new QueryWrapper<>(); QueryWrapper.eq("ps.company_id", companyId); @@ -322,8 +322,8 @@ public class PayDataFileController extends JeroController distribute( - @RequestParam(name="FileName") String FileName, - @RequestParam(name="mails") String mails + @RequestParam(name="FileName",required = true) String FileName, + @RequestParam(name="mails",required = true) String mails ) { StringBuilder stringBuilder = new StringBuilder("会议邮件注意查收"); EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(); @@ -345,13 +345,13 @@ public class PayDataFileController extends JeroController distributes( - @RequestParam(name="FileNameS") String FileNameS, - @RequestParam(name="mails") String mails + @RequestParam(name="FileNameS",required = true) String FileNameS, + @RequestParam(name="mails",required = true) String mails ) { StringBuilder stringBuilder = new StringBuilder("会议邮件注意查收"); EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(); emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), FileNameS); - return Result.OK("批量删除成功!"); + return Result.OK("分发成功!"); } /** @@ -361,7 +361,7 @@ public class PayDataFileController extends JeroController queryById(@RequestParam(name="id") String id) { + public Result queryById(@RequestParam(name="id",required = true) String id) { PayDataFile payDataFile = payDataFileService.getById(id); if(payDataFile==null) { return Result.error("未找到对应数据"); @@ -382,9 +382,9 @@ public class PayDataFileController extends JeroController addMeetingFile(@RequestParam(name="dataId") String dataId, - @RequestParam(name="fileIds") String fileIds, - @RequestParam(name="dataType") int dataType) { + public Result addMeetingFile(@RequestParam(name="dataId",required = true) String dataId, + @RequestParam(name="fileIds",required = true) String fileIds, + @RequestParam(name="dataType",required = true) int dataType) { ArrayList fileIdList = new ArrayList<>(Arrays.asList(fileIds.split(","))); ArrayList list = new ArrayList<>(); stringBuffer = new StringBuffer(); @@ -409,7 +409,7 @@ public class PayDataFileController extends JeroController fileIdList = new ArrayList<>(Arrays.asList(fileNames.split(","))); zipFileDownload(fileIdList); @@ -419,7 +419,7 @@ public class PayDataFileController extends JeroController paths){ + public void zipFileDownload(List paths){ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse(); //循环将文件写入压缩流 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 bb54c179..cf723620 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 @@ -45,7 +45,8 @@ import io.swagger.annotations.ApiOperation; @Slf4j public class PayFileDownloadRecordController extends JeroController { @Value("${jero.path.upload}") - public static String upLoadPath; + private String upLoadPath; + @Autowired private IPayFileDownloadRecordService payFileDownloadRecordService; @@ -76,7 +77,7 @@ public class PayFileDownloadRecordController extends JeroController objects, Class clazz, String title) { + public static ModelAndView exportListXls(List list, Class clazz, String title) { // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 @@ -59,7 +58,7 @@ public class AmountUtil { exportParams.setImageBasePath(upLoadPath); //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- mv.addObject(NormalExcelConstants.PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, objects); + mv.addObject(NormalExcelConstants.DATA_LIST, list); return mv; } }