合同材料

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/ContractMaterialController.java

@@ -16,9 +16,7 @@
  */
 package org.springblade.meter.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
@@ -48,15 +46,15 @@ public class ContractMaterialController extends BladeController {
 
 	private final IContractMaterialService contractMaterialService;
 
+
 	/**
-	 * 详情
+	 * 新增或修改 合同材料表
 	 */
-	@GetMapping("/detail")
+	@PostMapping("/submit")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入contractMaterial")
-	public R<ContractMaterial> detail(ContractMaterial contractMaterial) {
-		ContractMaterial detail = contractMaterialService.getOne(Condition.getQueryWrapper(contractMaterial));
-		return R.data(detail);
+	@ApiOperation(value = "新增或修改", notes = "传入contractMaterial")
+	public R submit(@Valid @RequestBody ContractMaterial contractMaterial) {
+		return R.status(contractMaterialService.saveOrUpdate(contractMaterial));
 	}
 
 	/**
@@ -64,51 +62,36 @@ public class ContractMaterialController extends BladeController {
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入contractMaterial")
+	@ApiOperation(value = "分页", notes = "传入项目id合同段id和分页信息")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "projectId", value = "项目id", required = true),
+			@ApiImplicitParam(name = "contractId", value = "合同id", required = true),
+			@ApiImplicitParam(name = "current", value = "当前页", required = true),
+			@ApiImplicitParam(name = "size", value = "每页数量", required = true)
+	})
 	public R<IPage<ContractMaterial>> list(ContractMaterial contractMaterial, Query query) {
 		IPage<ContractMaterial> pages = contractMaterialService.page(Condition.getPage(query), Condition.getQueryWrapper(contractMaterial));
 		return R.data(pages);
 	}
 
-
-
-	/**
-	 * 新增 合同材料表
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入contractMaterial")
-	public R save(@Valid @RequestBody ContractMaterial contractMaterial) {
-		return R.status(contractMaterialService.save(contractMaterial));
-	}
-
-	/**
-	 * 修改 合同材料表
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入contractMaterial")
-	public R update(@Valid @RequestBody ContractMaterial contractMaterial) {
-		return R.status(contractMaterialService.updateById(contractMaterial));
-	}
-
-	/**
-	 * 新增或修改 合同材料表
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入contractMaterial")
-	public R submit(@Valid @RequestBody ContractMaterial contractMaterial) {
-		return R.status(contractMaterialService.saveOrUpdate(contractMaterial));
-	}
+//	/**
+//	 * 详情
+//	 */
+//	@GetMapping("/detail")
+//	@ApiOperationSupport(order = 3)
+//	@ApiOperation(value = "详情", notes = "传入contractMaterial")
+//	public R<ContractMaterial> detail(ContractMaterial contractMaterial) {
+//		ContractMaterial detail = contractMaterialService.getOne(Condition.getQueryWrapper(contractMaterial));
+//		return R.data(detail);
+//	}
 
 	
 	/**
 	 * 删除 合同材料表
 	 */
 	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(contractMaterialService.deleteLogic(Func.toLongList(ids)));
 	}