zhanghl
2025-04-29 9d37d8f7c79949c5894d662a4131e4d8d652ddde
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java
@@ -43,7 +43,7 @@
    /**
     * 导出日历管理列表
     */
    @RequiresPermissions("core:calendar:export")
    @RequiresPermissions("aps:calendar:export")
    @Log(title = "日历管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsWorkCalendar apsWorkCalendar)
@@ -56,7 +56,7 @@
    /**
     * 获取日历管理详细信息
     */
    @RequiresPermissions("core:calendar:query")
    @RequiresPermissions("aps:calendar:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@@ -66,33 +66,70 @@
    /**
     * 新增日历管理
     */
    @RequiresPermissions("core:calendar:add")
    @RequiresPermissions("aps:calendar:add")
    @Log(title = "日历管理", businessType = BusinessType.INSERT)
    @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));
        }
    }
    /**
     * 修改日历管理
     */
    @RequiresPermissions("core:calendar:edit")
    @RequiresPermissions("aps:calendar:edit")
    @Log(title = "日历管理", businessType = BusinessType.UPDATE)
    @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));
        }
    }
    /**
     * 删除日历管理
     */
    @RequiresPermissions("core:calendar:remove")
    @RequiresPermissions("aps:calendar:remove")
    @Log(title = "日历管理", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(apsWorkCalendarService.deleteApsWorkCalendarByIds(ids));
    }
    /**
     * 查询日历管理列表
     */
    @RequiresPermissions("aps:calendar:list")
    @GetMapping("/listAll")
    public AjaxResult listAll(ApsWorkCalendar apsWorkCalendar)
    {
        List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(apsWorkCalendar);
        return AjaxResult.success(list);
    }
    @Log(title = "查询日历视图数据", businessType = BusinessType.INSERT)
    @RequiresPermissions("aps:calendar:selectCalendarView")
    @PostMapping("/selectCalendarView")
    public AjaxResult selectCalendarView(@RequestBody ApsWorkCalendar apsWorkCalendar)
    {
        return AjaxResult.success(apsWorkCalendarService.selectCalendarView(apsWorkCalendar));
    }
}