Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -327,25 +327,25 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 	 /**
 	  * 提交
-	  * @param id
+	  * @param syShippingDetails
 	  * @return
 	  */
   @AutoLog(value = "发运明细提交")
   @ApiOperation(value = "发运明细提交", notes="发运明细提交")
   @PostMapping(value = "/syShippingDetailsSubmit")
-  public Result<SyShippingDetails> syShippingDetailsSubmit(@RequestParam(name="id",required=true) String id) {
+  public Result<SyShippingDetails> syShippingDetailsSubmit(@RequestBody SyShippingDetails syShippingDetails) {
 
 	  Result<SyShippingDetails> result = new Result<>();
 
 	  try {
 
-		  if(oConvertUtils.isEmpty(id)){
+		  if(oConvertUtils.isEmpty(syShippingDetails.getId())){
 			  result.setMessage("未拿到ID");
 			  result.setSuccess(false);
 			  return  result;
 		  }
 		  //判断是否有该数据
-		  SyShippingDetails shippingDetails = syShippingDetailsService.getById(id);
+		  SyShippingDetails shippingDetails = syShippingDetailsService.getById(syShippingDetails.getId());
 		  if(oConvertUtils.isEmpty(shippingDetails)){
 			  result.setMessage("未找到该数据！");
 			  result.setSuccess(false);
@@ -357,7 +357,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			  result.setSuccess(false);
 			  return  result;
 		  }
-		  int i = syShippingDetailsService.syShippingDetailsSubmit(id);
+		  int i = syShippingDetailsService.syShippingDetailsSubmit(syShippingDetails.getId());
 		  if(i>0){
 			  result.setMessage("提交成功！");
 			  result.setSuccess(true);
@@ -516,7 +516,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  */
 	 @AutoLog(value = "新增报关要素")
 	 @ApiOperation(value="新增报关要素", notes="新增报关要素")
-	 @GetMapping(value = "/syDeclarationElementsAdd")
+	 @PostMapping(value = "/syDeclarationElementsAdd")
 	 public Result<SyDeclarationElements> syDeclarationElementsAdd(@RequestBody  SyDeclarationElements syDeclarationElements){
 
 		 Result<SyDeclarationElements> result = new Result<SyDeclarationElements>();