Merge remote-tracking branch 'origin/master'

Administrator

2023-08-11 2e05d59e2820b879ead4efd30be2b8cda399e485

 ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java

@@ -1,5 +1,6 @@
package com.ruoyi.app.patrolplan.controller;

import java.text.ParseException;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
@@ -13,6 +14,7 @@
import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord;
import com.ruoyi.app.patrolplan.domain.param.ArdAppPatrolpointRecordParam;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointRecordService;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
@@ -206,11 +208,20 @@
     * 巡检打卡
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:record')")
    @Log(title = "app巡检计划", businessType = BusinessType.UPDATE)
    @ApiOperation("巡检打卡")
    @PostMapping("record")
    public Results edit(@RequestBody ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
        return recordService.record(ardAppPatrolpointRecord);
    }

    /**
     * 巡检日历
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
    @ApiOperation("巡检日历")
    @PostMapping("recordMonth")
    public Results recordMonth(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
        return recordService.recordMonth(ardAppPatrolpointRecordParam);
    }

}