Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-20 fa1a70790ff7fd4df4ab114f56bee9476128152e

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java

@@ -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("确认成功！");
    }
}