refactor(cms): 修改了CuttingScrapDetailMapper中的sql已满足前端的需要。

lixiangyu

3 天以前 0736d5caa01efc9e7db504af0589941652d34055

 src/main/java/org/jeecg/modules/cms/controller/CuttingScrapDetailController.java

@@ -9,6 +9,7 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
@@ -36,125 +37,125 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
/**
 * @Description: 刀具报废明细
 * @Author: jeecg-boot
 * @Date:   2025-07-28
 * @Date: 2025-07-28
 * @Version: V1.0
 */
@Api(tags="刀具报废明细")
@Api(tags = "刀具报废明细")
@RestController
@RequestMapping("/cms/cuttingScrapDetail")
@Slf4j
public class CuttingScrapDetailController extends JeecgController<CuttingScrapDetail, ICuttingScrapDetailService> {
   @Autowired
   private ICuttingScrapDetailService cuttingScrapDetailService;
	
   /**
    * 分页列表查询
    *
    * @param cuttingScrapDetail
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   //@AutoLog(value = "刀具报废明细-分页列表查询")
   @ApiOperation(value="刀具报废明细-分页列表查询", notes="刀具报废明细-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<CuttingScrapDetail>> queryPageList(CuttingScrapDetail cuttingScrapDetail,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
      QueryWrapper<CuttingScrapDetail> queryWrapper = QueryGenerator.initQueryWrapper(cuttingScrapDetail, req.getParameterMap());
      Page<CuttingScrapDetail> page = new Page<CuttingScrapDetail>(pageNo, pageSize);
      IPage<CuttingScrapDetail> pageList = cuttingScrapDetailService.page(page, queryWrapper);
      return Result.OK(pageList);
   }
	
   /**
    *   添加
    *
    * @param cuttingScrapDetail
    * @return
    */
   @AutoLog(value = "刀具报废明细-添加")
   @ApiOperation(value="刀具报废明细-添加", notes="刀具报废明细-添加")
   //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
      cuttingScrapDetailService.save(cuttingScrapDetail);
      return Result.OK("添加成功！");
   }
	
   /**
    *  编辑
    *
    * @param cuttingScrapDetail
    * @return
    */
   @AutoLog(value = "刀具报废明细-编辑")
   @ApiOperation(value="刀具报废明细-编辑", notes="刀具报废明细-编辑")
   //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
      cuttingScrapDetailService.updateById(cuttingScrapDetail);
      return Result.OK("编辑成功!");
   }
	
   /**
    *   通过id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "刀具报废明细-通过id删除")
   @ApiOperation(value="刀具报废明细-通过id删除", notes="刀具报废明细-通过id删除")
   //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
      cuttingScrapDetailService.removeById(id);
      return Result.OK("删除成功!");
   }
	
   /**
    *  批量删除
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "刀具报废明细-批量删除")
   @ApiOperation(value="刀具报废明细-批量删除", notes="刀具报废明细-批量删除")
   //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
      this.cuttingScrapDetailService.removeByIds(Arrays.asList(ids.split(",")));
      return Result.OK("批量删除成功!");
   }
	
   /**
    * 通过id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "刀具报废明细-通过id查询")
   @ApiOperation(value="刀具报废明细-通过id查询", notes="刀具报废明细-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<CuttingScrapDetail> queryById(@RequestParam(name="id",required=true) String id) {
      CuttingScrapDetail cuttingScrapDetail = cuttingScrapDetailService.getById(id);
      if(cuttingScrapDetail==null) {
         return Result.error("未找到对应数据");
      }
      return Result.OK(cuttingScrapDetail);
   }
    @Autowired
    private ICuttingScrapDetailService cuttingScrapDetailService;

    /**
    * 导出excel
    *
    * @param request
    * @param cuttingScrapDetail
    */
     * 分页列表查询
     *
     * @param cuttingScrapDetail
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "刀具报废明细-分页列表查询")
    @ApiOperation(value = "刀具报废明细-分页列表查询", notes = "刀具报废明细-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CuttingScrapDetail>> queryPageList(CuttingScrapDetail cuttingScrapDetail,
                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                           HttpServletRequest req) {
        QueryWrapper<CuttingScrapDetail> queryWrapper = QueryGenerator.initQueryWrapper(cuttingScrapDetail, req.getParameterMap());
        Page<CuttingScrapDetail> page = new Page<CuttingScrapDetail>(pageNo, pageSize);
        IPage<CuttingScrapDetail> pageList = cuttingScrapDetailService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * 添加
     *
     * @param cuttingScrapDetail
     * @return
     */
    @AutoLog(value = "刀具报废明细-添加")
    @ApiOperation(value = "刀具报废明细-添加", notes = "刀具报废明细-添加")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
        cuttingScrapDetailService.save(cuttingScrapDetail);
        return Result.OK("添加成功！");
    }

    /**
     * 编辑
     *
     * @param cuttingScrapDetail
     * @return
     */
    @AutoLog(value = "刀具报废明细-编辑")
    @ApiOperation(value = "刀具报废明细-编辑", notes = "刀具报废明细-编辑")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
        cuttingScrapDetailService.updateById(cuttingScrapDetail);
        return Result.OK("编辑成功!");
    }

    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "刀具报废明细-通过id删除")
    @ApiOperation(value = "刀具报废明细-通过id删除", notes = "刀具报废明细-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        cuttingScrapDetailService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "刀具报废明细-批量删除")
    @ApiOperation(value = "刀具报废明细-批量删除", notes = "刀具报废明细-批量删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.cuttingScrapDetailService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "刀具报废明细-通过id查询")
    @ApiOperation(value = "刀具报废明细-通过id查询", notes = "刀具报废明细-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<CuttingScrapDetail> queryById(@RequestParam(name = "id", required = true) String id) {
        CuttingScrapDetail cuttingScrapDetail = cuttingScrapDetailService.getById(id);
        if (cuttingScrapDetail == null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(cuttingScrapDetail);
    }

    /**
     * 导出excel
     *
     * @param request
     * @param cuttingScrapDetail
     */
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, CuttingScrapDetail cuttingScrapDetail) {
@@ -162,12 +163,12 @@
    }

    /**
      * 通过excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
     * 通过excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("cms_cutting_scrap_detail:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {