资料维护调整

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java

@@ -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",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<PayDataFile, IPayDataF
 	 *
 	 */
 	@AutoLog(value = "资料维护（会议列表）-根据文件夹id分页列表查询")
-	@ApiOperation(value="资料维护（会议列表）-根据文件夹id分页列表查询", notes="资料维护（会议列表）-根据文件夹id分页列表查询")
+	@ApiOperation(value="资料维护（会议列表）-根据文件夹id分页列表查询", notes="资料维护（会议列表）-根据文件夹id分页列表查询",response = QueryFileList.class)
 	@GetMapping(value = "/listMeeting")
 	@ApiImplicitParam(name = "id", value = "目录id，查询该目录下文件", dataType = "String", required = true)
 	public Result<?> queryPageListMeeting(
@@ -141,15 +141,15 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 	@AutoLog(value = "资料维护(资料和会议)-上传")
 	@ApiOperation(value="资料维护(资料和会议)-上传", notes="资料维护(资料和会议)-上传")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "dataId", value = "目录id"),
-			@ApiImplicitParam(name = "fileIds", value = "资料id,多个以逗号隔开"),
-			@ApiImplicitParam(name = "dataType", value = "文件类型，资料1或者会议2")
+			@ApiImplicitParam(name = "dataId", value = "目录id",required = true),
+			@ApiImplicitParam(name = "fileIds", value = "资料id,多个以逗号隔开",required = true),
+			@ApiImplicitParam(name = "dataType", value = "文件类型，资料1或者会议2",required = true)
 	})
 	@PostMapping(value = "/add")
 	@Transactional
-	public Result<?> 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<String> fileIdList = new ArrayList<>(Arrays.asList(fileIds.split(",")));
 		ArrayList<PayDataFile> list = new ArrayList<>();
 		stringBuffer = new StringBuffer();
@@ -190,13 +190,13 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 	@PostMapping(value = "/edit")
 	@Transactional
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id",value = "主键id"),
-			@ApiImplicitParam(name = "fileId", value = "资料id"),
-			@ApiImplicitParam(name = "oldFileId", value = "原来资料id")
+			@ApiImplicitParam(name = "id",value = "主键id",required = true),
+			@ApiImplicitParam(name = "fileId", value = "资料id",required = true),
+			@ApiImplicitParam(name = "oldFileId", value = "原来资料id",required = true)
 	})
-	public Result<?> 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<PayDataFile, IPayDataF
 	@AutoLog(value = "资料维护(资料和会议)-通过id删除")
 	@ApiOperation(value="资料维护(资料和会议)-通过id删除", notes="资料维护(资料和会议)-通过id删除")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "ids",value = "主键id"),
-			@ApiImplicitParam(name = "dataIds", value = "资料id")
+			@ApiImplicitParam(name = "id",value = "主键id",required = true),
+			@ApiImplicitParam(name = "dataId", value = "资料id",required = true)
 	})
 	@GetMapping(value = "/delete")
 	@Transactional
-	@ApiImplicitParam(name = "id", value = "目录主键", dataType = "String", required = true)
-	public Result<?> 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<PayDataFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(PayDataFile::getFileId,id);
+		lambdaQueryWrapper.eq(PayDataFile::getId,id);
 		payDataFileService.remove(lambdaQueryWrapper);
-		iossFileService.removeById(id);
+		iossFileService.removeById(dataId);
 		LambdaQueryWrapper<PayFileDownloadRecord> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper2.eq(PayFileDownloadRecord::getFileId,dataId);
 		payFileDownloadRecordService.remove(lambdaQueryWrapper2);
@@ -242,7 +241,8 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 			@ApiImplicitParam(name = "ids",value = "主键id,多个以逗号隔开"),
 			@ApiImplicitParam(name = "dataIds", value = "资料id，多个以逗号隔开")
 	})
-	public Result<?> 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<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
 		payDataFileService.removeByIds(strings);
 		ArrayList<String> strings2 = new ArrayList<>(Arrays.asList(dataIds.split(",")));

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;
 

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

@@ -78,7 +78,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 */
 	@ApiOperation(value="邮寄票据-编辑（邮寄和修改按钮统一接口）", notes="邮寄票据-编辑（邮寄和修改按钮统一接口）")
 	@Transactional
-	@PutMapping(value = "/edit")
+	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestParam(name="id") String id,
 						  @RequestParam(name="sendMethod") Integer sendMethod,
 						  @RequestParam(name="postNo") String postNo,

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<PayMailContract, I
 	  *
 	  */
 	 @ApiOperation(value="邮寄合同-编辑（邮寄和修改按钮统一接口）", notes="邮寄合同-编辑（邮寄和修改按钮统一接口）")
-	 @PutMapping(value = "/edit")
+	 @PostMapping(value = "/edit")
 	 public Result<?> edit(@RequestParam(name="id") String id,
 						   @RequestParam(name="sendMethod") Integer sendMethod,
 						   @RequestParam(name="postNo") String postNo,