feat: 新增巡检记录通知功能及查询条件优化

yuan

9 小时以前 c0eabff28c4bd9212d2550162f28193daf9976fe

 src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -34,6 +36,11 @@
    @Log(title = "巡检记录 分页查询", businessType = BusinessType.OTHER)
    public AjaxResult page(ProductInspectionRecordDto productInspectionRecord, Page<ProductInspectionRecord> page) {
        LambdaQueryWrapper<ProductInspectionRecord> ew = Wrappers.<ProductInspectionRecord>lambdaQuery();
        ew.eq(StringUtils.isNotEmpty(productInspectionRecord.getProcess()), ProductInspectionRecord::getProcess, productInspectionRecord.getProcess())
                .eq(StringUtils.isNotEmpty(productInspectionRecord.getProcessId()), ProductInspectionRecord::getProcessId, productInspectionRecord.getProcessId())
                .between(Objects.nonNull(productInspectionRecord.getStartTime()) && Objects.nonNull(productInspectionRecord.getEndTime()),
                        ProductInspectionRecord::getInspectionTime, productInspectionRecord.getStartTime(),
                        productInspectionRecord.getEndTime());
        return AjaxResult.success(productInspectionRecordService.page(page, ew));
    }

@@ -61,4 +68,12 @@
        productInspectionRecordService.removeBatchByIds(ids);
        return AjaxResult.success();
    }

    @ApiOperation("巡检记录 通知")
    @PostMapping("/notify")
    @Log(title = "巡检记录 通知", businessType = BusinessType.OTHER)
    public AjaxResult notify(@RequestBody List<Long> ids) {
        productInspectionRecordService.notify(ids);
        return AjaxResult.success("发送通知成功");
    }
}