lims-ruoyi-after.git

			@@ -1,4 +1,4 @@
			package com.ruoyi.basic.controller;
			package com.ruoyi.inspect.controller;

			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONArray;
			@@ -75,23 +75,17 @@
			return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
			}

			//todo: 下单需要修改
			@ApiOperation(value = "添加检验下单数据")
			@PostMapping("/addInsOrder")
			public Result<?> addInsOrder(String str) {
			Map<String, Object> map = JSON.parseObject(str, Map.class);
			JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
			List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
			InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
			List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
			return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
			public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
			return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
			}

			@ApiOperation(value = "查询订单最长预计时间")
			@GetMapping("/selectOrderManDay")
			public Result<?> selectOrderManDay(Integer id) {
			int day = insProductService.selectOrderManDay(id);
			return Result.success("成功", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			return Result.success(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			}

			@ApiOperation(value = "查询检验下单内容详情")
			@@ -105,7 +99,6 @@
			@ApiImplicitParam(name = "id", value = "检验单id", dataTypeClass = Integer.class),
			@ApiImplicitParam(name = "state", value = "审核结果 1:通过 2：不通过", dataTypeClass = Integer.class)
			})

			@PostMapping("/upInsOrderOfState")
			public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
			return Result.success(insOrderService.upInsOrderOfState(insOrder));
			@@ -126,7 +119,7 @@
			@ApiOperation(value = "通过检验单模板id获取检验单模板内容")
			@GetMapping("/selectInsOrderTemplateById")
			public Result<?> selectInsOrderTemplateById(Integer id) {
			return Result.success("成功", insOrderTemplateService.selectInsOrderTemplateById(id));
			return Result.success(insOrderTemplateService.selectInsOrderTemplateById(id));
			}

			@ApiOperation(value = "删除检验单模板")
			@@ -139,25 +132,6 @@
			@GetMapping("/selectSampleAndProductByOrderId")
			public Result<?> selectSampleAndProductByOrderId(Page page, SampleProductDto2 sampleProductDto){
			return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
			}

			@ApiOperation(value = "费用统计")
			@GetMapping("/costStatistics")
			public Result<?> costStatistics(Page page, CostStatisticsDto costStatisticsDto){
			return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
			}

			@ApiOperation(value = "费用统计获取总价")
			@GetMapping("/costStatistics2")
			public Result<?> costStatistics2(CostStatisticsDto costStatisticsDto){
			return Result.success(insOrderService.costStatistics2(costStatisticsDto));
			}


			@ApiOperation(value = "样品缺陷指数")
			@GetMapping("/selectSampleDefects")
			public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
			return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
			}


			@@ -203,23 +177,11 @@
			}


			@ApiOperation(value = "费用统计导出")
			@GetMapping("/export")
			public void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response) throws ServletException, IOException {
			insOrderService.export(costStatisticsDto,response);
			}


			@ApiOperation(value = "获取ifs订单")
			@GetMapping("/getIfsOrder")
			public Result<?> getIfsOrder() {
			insOrderService.getIfsOrder();
			return Result.success();
			}

			@Scheduled(fixedDelay = 1200000)
			public void getIfsOrderTiming() {
			insOrderService.getIfsOrder();
			}


			@@ -236,19 +198,6 @@
			return Result.success(insOrderService.getRetestResult(insProductId));
			}



			@ApiOperation(value = "铜单丝下单")
			@PostMapping("/addRawCopperOrder")
			public Result<?> addRawCopperOrder(String str) {
			Map<String, Object> map = JSON.parseObject(str, Map.class);
			JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
			List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
			CopperInsOrderDto CopperInsOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), CopperInsOrderDto.class);
			return Result.success(insOrderService.addRawCopperOrder(list, CopperInsOrder));
			}


			@ApiOperation(value = "修改委托编号")
			@PostMapping("/updateOrderEntrustCode")
			public Result<?> updateOrderEntrustCode(@RequestBody InsOrder insOrder) {
			@@ -263,7 +212,7 @@
			}

			@ApiOperation(value = "删除退回订单")
			@GetMapping("/delInsOrder")
			@DeleteMapping("/delInsOrder")
			public Result<?> delInsOrder(Integer insOrderId) {
			// 查询订单
			InsOrder order = insOrderService.getById(insOrderId);