刀具刃磨- 查询条件修改

Houjie

2025-05-26 feeeac20a0f28243ee3cf986e544051283ef6df9

刀具刃磨- 查询条件修改

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java

@@ -101,13 +101,18 @@
        return Result.OK(toolSharpening);
    }




    /**
     * 删除
     */
    @DeleteMapping("/{id}")
    @ApiOperation(value = "删除", notes = "删除")
    public Result<String> delete(@PathVariable String id) {

    @AutoLog(value = "tms_tool_sharpening-通过id删除")
    @ApiOperation(value="tms_tool_sharpening-通过id删除", notes="tms_tool_sharpening-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        toolSharpeningService.removeById(id);
        return Result.OK("删除成功");
        return Result.OK("删除成功!");
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java

@@ -32,13 +32,17 @@
        if (toolIds != null && toolIds.length > 0) {
            queryWrapper.like("t.tool_id", toolIds[0]);
        }
        String[] startTimes = parameterMap.get("startTime");
        if (startTimes != null && startTimes.length > 0) {
            queryWrapper.ge("t.create_time", startTimes[0]);
        String[] sharpeningResults = parameterMap.get("sharpeningResult");
        if (sharpeningResults != null && sharpeningResults.length > 0) {
            queryWrapper.like("t.sharpening_result", sharpeningResults[0]);
        }
        String[] endTimes = parameterMap.get("endTime");
        String[] startTimes = parameterMap.get("sharpeningTimeBegin ");
        if (startTimes != null && startTimes.length > 0) {
            queryWrapper.ge("t.sharpening_time", startTimes[0]);
        }
        String[] endTimes = parameterMap.get("sharpeningTimeEnd");
        if (endTimes != null && endTimes.length > 0) {
            queryWrapper.le("t.create_time", endTimes[0]);
            queryWrapper.le("t.sharpening_time", endTimes[0]);
        }
        queryWrapper.orderByDesc("t.create_time");
        return this.baseMapper.queryPageList(page, queryWrapper);