|
|
@@ -1,27 +1,27 @@
|
|
|
package org.jeecg.modules.itdmGongDan.controller;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
-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.modules.itdmGongDan.entity.ItdmGongdanDetail;
|
|
|
-import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
|
|
|
-
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import io.swagger.annotations.Api;
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-
|
|
|
+import org.jeecg.common.api.vo.Result;
|
|
|
+import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
|
+import org.jeecg.common.system.query.QueryGenerator;
|
|
|
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
|
|
|
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
|
|
|
+import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
-import io.swagger.annotations.Api;
|
|
|
-import io.swagger.annotations.ApiOperation;
|
|
|
-import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
|
|
|
- /**
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.util.Arrays;
|
|
|
+
|
|
|
+/**
|
|
|
* @Description: 工单detail
|
|
|
* @Author: jeecg-boot
|
|
|
* @Date: 2023-05-21
|
|
|
@@ -47,15 +47,49 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
|
|
|
//@AutoLog(value = "工单detail-分页列表查询")
|
|
|
@ApiOperation(value="工单detail-分页列表查询", notes="工单detail-分页列表查询")
|
|
|
@GetMapping(value = "/list")
|
|
|
- public Result<IPage<ItdmGongdanDetail>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
|
|
|
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
- HttpServletRequest req) {
|
|
|
- QueryWrapper<ItdmGongdanDetail> queryWrapper = QueryGenerator.initQueryWrapper(itdmGongdanDetail, req.getParameterMap());
|
|
|
- Page<ItdmGongdanDetail> page = new Page<ItdmGongdanDetail>(pageNo, pageSize);
|
|
|
- IPage<ItdmGongdanDetail> pageList = itdmGongdanDetailService.page(page, queryWrapper);
|
|
|
- return Result.OK(pageList);
|
|
|
+ public Result<Page<ItdmGongdanDetailListVO>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
|
|
|
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
+ HttpServletRequest req) {
|
|
|
+ Result<Page<ItdmGongdanDetailListVO>> result = new Result<Page<ItdmGongdanDetailListVO>>();
|
|
|
+ Page<ItdmGongdanDetailListVO> pageList = new Page<>(pageNo,pageSize);
|
|
|
+ pageList = itdmGongdanDetailService.getDetailList(pageList,"");//通知公告消息
|
|
|
+ result.setSuccess(true);
|
|
|
+ result.setResult(pageList);
|
|
|
+ return result;
|
|
|
}
|
|
|
+// public Result<Page<ItdmGongdanDetail>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
|
|
|
+// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
+// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
+// HttpServletRequest req) {
|
|
|
+// Result<Page<ItdmGongdanDetail>> result = new Result<Page<ItdmGongdanDetail>>();
|
|
|
+// Page<ItdmGongdanDetail> pageList = new Page<>(pageNo,pageSize);
|
|
|
+// pageList = itdmGongdanDetailService.getDetailList(pageList,"");//通知公告消息
|
|
|
+// result.setSuccess(true);
|
|
|
+// result.setResult(pageList);
|
|
|
+// return result;
|
|
|
+// }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+// @ApiOperation(value="工单detail-分页列表查询", notes="工单detail-分页列表查询")
|
|
|
+// @GetMapping(value = "/list")
|
|
|
+// public Result<IPage<ItdmGongdanDetail>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
|
|
|
+// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
+// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
+// HttpServletRequest req) {
|
|
|
+// QueryWrapper<ItdmGongdanDetail> queryWrapper = QueryGenerator.initQueryWrapper(itdmGongdanDetail, req.getParameterMap());
|
|
|
+//// queryWrapper.select().orderByAsc("work_date");
|
|
|
+// Page<ItdmGongdanDetail> page = new Page<ItdmGongdanDetail>(pageNo, pageSize);
|
|
|
+// IPage<ItdmGongdanDetail> pageList = itdmGongdanDetailService.page(page, queryWrapper);
|
|
|
+// return Result.OK(pageList);
|
|
|
+//// IPage<ItdmGongdanDetailListVO> pageVOList = pageList.convert(result -> {
|
|
|
+//// ItdmGongdanDetailListVO vo = new ItdmGongdanDetailListVO();
|
|
|
+//// BeanUtil.copyProperties(result, vo);
|
|
|
+//// return vo;
|
|
|
+//// });
|
|
|
+//// return Result.OK(pageVOList);
|
|
|
+// }
|
|
|
|
|
|
/**
|
|
|
* 添加
|
110