~admin/ERP_override.git

			@@ -13,21 +13,24 @@
			import org.springframework.web.bind.annotation.*;

			import java.sql.Date;
			import java.util.List;
			import java.util.Map;

			@RestController
			@Api(value="生产报表controller",tags={"生产报表操作接口"})
			@RequestMapping("/report")
			public class ReportController {
			@Autowired
			ReportService reportService;
			private final ReportService reportService;

			public ReportController(ReportService reportService) {
			this.reportService = reportService;
			}

			//流程卡进度
			@ApiOperation("流程卡进度")
			@PostMapping ("/processCardProgress/{orderId}")
			public Result processCardProgress(
			@PathVariable String orderId,
			@RequestBody FlowCard flowCard){
			return Result.seccess(reportService.processCardProgressSv(orderId,flowCard));
			public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns){
			return Result.seccess(reportService.processCardProgressSv(orderId,columns));
			}

			}