apsbackend.git - Gitblit

			@@ -132,9 +132,9 @@
			@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:confirmData")
			@PostMapping("/confirmData")
			public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {
			// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			// LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
			apsResourceGroupService.confirmData(temp.getBatchNumber(),temp.getRequestDate());
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
			apsResourceGroupService.confirmData(temp.getBatchNumber(),localDateTime);
			return AjaxResult.success("确认成功！");
			}
			}

			@@ -112,11 +112,25 @@
			ids[i]= apsProcessRouteTemps.get(i).getId();
			ApsProcessRoute apsProcessRoute =new ApsProcessRoute();
			BeanUtils.copyProperties(apsProcessRouteTemps.get(i), apsProcessRoute);
			apsProcessRoute.setId(IdUtils.fastUUID());
			//插入正式表，并记录
			apsProcessRoute.setCreateTime(DateUtils.getNowDate());
			apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
			apsProcessRouteMapper.insertApsProcessRoute(apsProcessRoute);
			ApsProcessRoute apsProcessRoutetmp =new ApsProcessRoute();
			apsProcessRoutetmp.setWorkOrderNo(apsProcessRoute.getWorkOrderNo());
			apsProcessRoutetmp.setProcessNumber(apsProcessRoute.getProcessNumber());
			List<ApsProcessRoute> apsProcessRoutes =apsProcessRouteMapper.selectApsProcessRouteList(apsProcessRoutetmp);
			if(apsProcessRoutes.size()>0){
			apsProcessRoute.setId(apsProcessRoutes.get(0).getId());
			//插入正式表，并记录
			apsProcessRoute.setCreateTime(DateUtils.getNowDate());
			apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
			apsProcessRouteMapper.updateApsProcessRoute(apsProcessRoute);
			}else {
			apsProcessRoute.setId(IdUtils.fastUUID());
			//插入正式表，并记录
			apsProcessRoute.setCreateTime(DateUtils.getNowDate());
			apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
			apsProcessRouteMapper.insertApsProcessRoute(apsProcessRoute);
			}


			count++;
			}
			//插入数量与临时表查询一直则删除临时表数据

	aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史