|
@@ -8,8 +8,10 @@ import com.steerinfo.dil.util.DataChange;
|
|
|
import com.steerinfo.dil.util.PageListAdd;
|
|
|
import com.steerinfo.framework.controller.RESTfulResult;
|
|
|
import com.steerinfo.framework.service.pagehelper.PageHelper;
|
|
|
+import com.zaxxer.hikari.util.FastList;
|
|
|
import io.swagger.annotations.*;
|
|
|
import io.swagger.models.auth.In;
|
|
|
+import javassist.expr.NewArray;
|
|
|
import oracle.jdbc.proxy.annotation.Post;
|
|
|
import org.apache.commons.lang.time.FastDateFormat;
|
|
|
import org.apache.ibatis.annotations.Param;
|
|
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -928,8 +931,14 @@ public class UniversalController extends BaseRESTfulController {
|
|
|
|
|
|
@ApiOperation("删除计量实绩")
|
|
|
@PostMapping("/linkageDeleteTransportOrder")
|
|
|
- public int linkageDeleteTransportOrder(@RequestBody(required = false)List<Map<String,Object>>mapList ){
|
|
|
+ public int linkageDeleteTransportOrder(@RequestBody(required = false)List<Map<String,Object>>mapList,
|
|
|
+ @RequestBody(required = false)Map<String,Object> map){
|
|
|
try {
|
|
|
+ if(mapList == null && map != null) {
|
|
|
+ List<Map<String,Object>> list = new ArrayList<>();
|
|
|
+ list.add(map);
|
|
|
+ return universalService.linkageDeleteTransportOrder(list);
|
|
|
+ }
|
|
|
return universalService.linkageDeleteTransportOrder(mapList);
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
@@ -937,6 +946,22 @@ public class UniversalController extends BaseRESTfulController {
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation("删除计量实绩")
|
|
|
+ @PostMapping("/linkageDeleteTransportOrder1")
|
|
|
+ public int linkageDeleteTransportOrder(
|
|
|
+ @RequestBody(required = false)Map<String,Object> map){
|
|
|
+ try {
|
|
|
+ if( map != null) {
|
|
|
+ List<Map<String,Object>> list = new ArrayList<>();
|
|
|
+ list.add(map);
|
|
|
+ return universalService.linkageDeleteTransportOrder(list);
|
|
|
+ }
|
|
|
+ //return universalService.linkageDeleteTransportOrder(mapList);
|
|
|
+ } catch (IOException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
|
|
|
@ApiModelProperty(value = "获取仓库月台")
|
|
|
@GetMapping("/getSteelWarehouse")
|