Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

sfd

2025-05-23 50cf972c100b28e368590b07c33e5f78c20475d0

 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,95 @@
    /**
     * 新增日历管理
     */
    @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));
        try {
            ApsWorkCalendar tempCheck = new ApsWorkCalendar();
            tempCheck.setEffectiveDate(apsWorkCalendar.getEffectiveDate());
            tempCheck.setExpiringDate(apsWorkCalendar.getExpiringDate());
            tempCheck.setApplicableFactory(apsWorkCalendar.getApplicableFactory());
            tempCheck.setType(apsWorkCalendar.getType());
            List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(tempCheck);
            if(!list.isEmpty()){
                return AjaxResult.error("该时间段日历已存在",  list);
            }else{
                apsWorkCalendarService.insertApsWorkCalendar(apsWorkCalendar);
                return success();
            }
        } catch (Exception e) {
            e.printStackTrace();
            return error();
        }
    }

    /**
     * 修改日历管理
     */
    @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));
        try {
//            ApsWorkCalendar tempCheck = new ApsWorkCalendar();
//            tempCheck.setEffectiveDate(apsWorkCalendar.getEffectiveDate());
//            tempCheck.setExpiringDate(apsWorkCalendar.getExpiringDate());
//            tempCheck.setApplicableFactory(apsWorkCalendar.getApplicableFactory());
//            tempCheck.setType(apsWorkCalendar.getType());
//            List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(tempCheck);
//            if(!list.isEmpty()){
//                return AjaxResult.error("该时间段日历已存在",  list);
//            }else{
            apsWorkCalendarService.updateApsWorkCalendar(apsWorkCalendar);
            return success();
//            }
        } catch (Exception e) {
            e.printStackTrace();
            return error();
        }
    }

    /**
     * 删除日历管理
     */
    @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:delete")
    @Log(title = "删除日历管理", businessType = BusinessType.DELETE)
    @PostMapping("/deleteApsWorkCalendar")
    public AjaxResult deleteApsWorkCalendar(@RequestBody ApsWorkCalendar apsWorkCalendar)
    {
        return toAjax(apsWorkCalendarService.deleteApsWorkCalendar(apsWorkCalendar));
    }

    /**
     * 查询日历管理列表
     */
    @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));
    }
}