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

zhanghl

2025-04-27 3880de9f96b068dfa8b1f35fcac0060f3d4ad604

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

@@ -71,7 +71,16 @@
    @PostMapping
    public AjaxResult add(@RequestBody ApsWorkCalendar apsWorkCalendar)
    {
        return toAjax(apsWorkCalendarService.insertApsWorkCalendar(apsWorkCalendar));
        ApsWorkCalendar tempCheck = new ApsWorkCalendar();
        tempCheck.setEffectiveDate(apsWorkCalendar.getEffectiveDate());
        tempCheck.setExpiringDate(apsWorkCalendar.getExpiringDate());
        tempCheck.setApplicableFactory(apsWorkCalendar.getApplicableFactory());
        List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(tempCheck);
        if(!list.isEmpty()){
            return AjaxResult.error("该时间段日历已存在",  list);
        }else{
            return toAjax(apsWorkCalendarService.insertApsWorkCalendar(apsWorkCalendar));
        }
    }

    /**
@@ -82,7 +91,16 @@
    @PutMapping
    public AjaxResult edit(@RequestBody ApsWorkCalendar apsWorkCalendar)
    {
        return toAjax(apsWorkCalendarService.updateApsWorkCalendar(apsWorkCalendar));
        ApsWorkCalendar tempCheck = new ApsWorkCalendar();
        tempCheck.setEffectiveDate(apsWorkCalendar.getEffectiveDate());
        tempCheck.setExpiringDate(apsWorkCalendar.getExpiringDate());
        tempCheck.setApplicableFactory(apsWorkCalendar.getApplicableFactory());
        List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(tempCheck);
        if(!list.isEmpty()){
            return AjaxResult.error("该时间段日历已存在",  list);
        }else{
            return toAjax(apsWorkCalendarService.updateApsWorkCalendar(apsWorkCalendar));
        }
    }

    /**
@@ -106,4 +124,11 @@
        List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(apsWorkCalendar);
        return AjaxResult.success(list);
    }

    @Log(title = "查询日历视图数据", businessType = BusinessType.INSERT)
    @PostMapping("/selectCalendarView")
    public AjaxResult selectCalendarView(@RequestBody ApsWorkCalendar apsWorkCalendar)
    {
        return AjaxResult.success(apsWorkCalendarService.selectCalendarView(apsWorkCalendar));
    }
}