LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

资料维护调整

Browse Source
This commit is contained in:
zhangqinlin
2021-09-08 15:59:07 +08:00
parent 39d245a30c
commit 4c20b082e1
6 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
+1 -1
View File
@@ -139,7 +139,7 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
@AutoLog(value = "分标委表-通过id删除")
@ApiOperation(value="分标委表-通过id删除", notes="分标委表-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id") String id) {
public Result<?> delete(@RequestParam(name="id",required = true) String id) {
LambdaQueryWrapper<PayCaseCommitteeSubitem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayCaseCommitteeSubitem::getCommitteeId,id);
List<PayCaseCommitteeSubitem> payCaseCommitteeSubitems = payCaseCommitteeSubitemService.selectList(queryWrapper);
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+4 -4
View File
@@ -97,7 +97,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
@AutoLog(value = "分标委成员表-列表查询")
@ApiOperation(value="分标委成员表-列表查询", notes="分标委成员表-列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(@RequestParam(name="id") String id) {
public Result<?> queryPageList(@RequestParam(name="id",required = true) String id) {
QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query();
queryWrapper.eq("pm.committee_id", id);
List<payCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemService.list2(queryWrapper);
@@ -124,7 +124,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
@ApiOperation(value="分标委成员表-新增时校验重复", notes="分标委成员表-新增时校验重复")
@ApiImplicitParam(name = "id", value = "联系人主键", dataType = "String", required = true)
@GetMapping(value = "/voiled")
public Result<?> voiled(@RequestParam(name="id") String id) {
public Result<?> voiled(@RequestParam(name="id",required = true) String id) {
LambdaQueryWrapper<PayCaseCommitteeSubitem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PayCaseCommitteeSubitem::getContactsId, id);
List<PayCaseCommitteeSubitem> list = payCaseCommitteeSubitemService.list(lambdaQueryWrapper);
@@ -156,7 +156,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
@AutoLog(value = "分标委成员表-通过id删除")
@ApiOperation(value="分标委成员表-通过id删除", notes="分标委成员表-通过id删除")
@GetMapping(value = "/delete")
public Result<?> 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<PayCaseCom
@AutoLog(value = "分标委成员表-批量删除")
@ApiOperation(value="分标委成员表-批量删除", notes="分标委成员表-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> 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("批量删除成功!");
}
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java
+1 -1
View File
@@ -294,7 +294,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
@AutoLog(value = "资料目录管理-通过id查询")
@ApiOperation(value="资料目录管理-通过id查询", notes="资料目录管理-通过id查询")
@GetMapping(value = "/getOne")
public Result<?> 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);
}
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
+28 -28
View File
@@ -70,7 +70,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
private IPayMeetingSituationService payMeetingSituationService;
@Value("${jero.path.upload}")
public static String upLoadPath;
private String upLoadPath;
//拼接目录结构
StringBuffer stringBuffer;
@@ -88,7 +88,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@GetMapping(value = "/list")
@ApiImplicitParam(name = "id", value = "目录id，查询该目录下文件", dataType = "String", required = true)
public Result<?> 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<PayDataFile, IPayDataF
@GetMapping(value = "/listMeeting")
@ApiImplicitParam(name = "id", value = "目录id，查询该目录下文件", dataType = "String", required = true)
public Result<?> 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<PayDataFile, IPayDataF
}
/**
* 资料列表添加
* 资料列表上传
*
*/
@AutoLog(value = "资料维护(资料和会议)-添加")
@ApiOperation(value="资料维护(资料和会议)-添加", notes="资料维护(资料和会议)-添加")
@AutoLog(value = "资料维护(资料和会议)-上传")
@ApiOperation(value="资料维护(资料和会议)-上传", notes="资料维护(资料和会议)-上传")
@ApiImplicitParams({
@ApiImplicitParam(name = "dataId", value = "目录id"),
@ApiImplicitParam(name = "fileIds", value = "资料id,多个以逗号隔开"),
@@ -147,9 +147,9 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
})
@PostMapping(value = "/add")
@Transactional
public Result<?> 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<String> fileIdList = new ArrayList<>(Arrays.asList(fileIds.split(",")));
ArrayList<PayDataFile> list = new ArrayList<>();
stringBuffer = new StringBuffer();
@@ -194,9 +194,9 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@ApiImplicitParam(name = "fileId", value = "资料id"),
@ApiImplicitParam(name = "oldFileId", value = "原来资料id")
})
public Result<?> 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<PayDataFile, IPayDataF
@GetMapping(value = "/delete")
@Transactional
@ApiImplicitParam(name = "id", value = "目录主键", dataType = "String", required = true)
public Result<?> 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<PayDataFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PayDataFile::getFileId,id);
payDataFileService.remove(lambdaQueryWrapper);
@@ -242,7 +242,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@ApiImplicitParam(name = "ids",value = "主键id,多个以逗号隔开"),
@ApiImplicitParam(name = "dataIds", value = "资料id，多个以逗号隔开")
})
public Result<?> 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<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
payDataFileService.removeByIds(strings);
ArrayList<String> strings2 = new ArrayList<>(Arrays.asList(dataIds.split(",")));
@@ -264,7 +264,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@ApiOperation(value="根据会议id查询参会企业列表", notes="根据会议id查询参会企业列表")
@GetMapping(value = "/queryListByMeetingId")
public Result<List<PayMeetingSituation>> queryCompanyByMeetingId(
@RequestParam(name="meetingId") String meetingId
@RequestParam(name="meetingId",required = true) String meetingId
) {
LambdaQueryWrapper<PayMeetingSituation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PayMeetingSituation::getMeetingId, meetingId);
@@ -287,8 +287,8 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
})
@GetMapping(value = "/queryListByCompanyId")
public Result<List<queryPeopleByCompanyIdAndMeetingId>> 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<queryPeopleByCompanyIdAndMeetingId> QueryWrapper = new QueryWrapper<>();
QueryWrapper.eq("ps.company_id", companyId);
@@ -322,8 +322,8 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
})
@GetMapping(value = "/distribute")
public Result<?> 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<PayDataFile, IPayDataF
})
@GetMapping(value = "/distributes")
public Result<?> 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<PayDataFile, IPayDataF
@AutoLog(value = "资料维护-通过id查询")
@ApiOperation(value="资料维护-通过id查询", notes="资料维护-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> 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<PayDataFile, IPayDataF
})
@PostMapping(value = "/addMeetingFile")
@Transactional
public Result<?> 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<String> fileIdList = new ArrayList<>(Arrays.asList(fileIds.split(",")));
ArrayList<PayDataFile> list = new ArrayList<>();
stringBuffer = new StringBuffer();
@@ -409,7 +409,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@ApiOperation(value="导出下载", notes="导出下载")
@ApiImplicitParam(name = "fileNames", value = "文件名称，多个以逗号隔开")
@GetMapping(value = "/importFile")
public void importFile(@RequestParam(name="fileNames") String fileNames) {
public void importFile(@RequestParam(name="fileNames",required = true) String fileNames) {
ArrayList<String> fileIdList = new ArrayList<>(Arrays.asList(fileNames.split(",")));
zipFileDownload(fileIdList);
@@ -419,7 +419,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
* 打包下载
* @param paths 目前处理是文件绝对路径.
*/
public static void zipFileDownload(List<String> paths){
public void zipFileDownload(List<String> paths){
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
//循环将文件写入压缩流
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java
+4 -3
View File
@@ -45,7 +45,8 @@ import io.swagger.annotations.ApiOperation;
@Slf4j
public class PayFileDownloadRecordController extends JeroController<PayFileDownloadRecord, IPayFileDownloadRecordService> {
@Value("${jero.path.upload}")
public static String upLoadPath;
private String upLoadPath;
@Autowired
private IPayFileDownloadRecordService payFileDownloadRecordService;
@@ -76,7 +77,7 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
@ApiOperation(value="资料下载", notes="资料下载")
@GetMapping(value = "download")
public void download(
@RequestParam("fileName") String filename
@RequestParam(name = "fileName",required = true) String filename
) throws IOException {
ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletResponse response = requestAttributes.getResponse();
@@ -92,7 +93,7 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
}
public static void download(String filename, HttpServletResponse res) throws IOException {
public void download(String filename, HttpServletResponse res) throws IOException {
// 发送给客户端的数据
OutputStream outputStream = res.getOutputStream();
byte[] buff = new byte[1024];
jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java
+3 -4
View File
@@ -1,6 +1,5 @@
package com.jero.util;
import org.apache.poi.ss.formula.functions.T;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -18,7 +17,7 @@ import java.util.List;
public class AmountUtil {
@Value("${jero.path.upload}")
public static String upLoadPath;
private static String upLoadPath;
/**
* 计算到账状态
*
@@ -49,7 +48,7 @@ public class AmountUtil {
*传入 对象的list集合 对象的class对象 excel名称
* @param
*/
public static ModelAndView exportListXls(List<?> 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;
}
}