Commit 7faf0d4c by “zcwang”

add: 查询列表

parent 5c693a2d
Pipeline #42890 passed with stages
in 1 minute 17 seconds
...@@ -423,11 +423,10 @@ public class ChangeFlowBiz { ...@@ -423,11 +423,10 @@ public class ChangeFlowBiz {
return changeFlowVO; return changeFlowVO;
} }
public AjaxResult<PageInfo<ChangeConfigPo>> query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) { public PageInfo<ChangeRecord> query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
//进行分页 //进行分页
PageHelper.startPage(page,pageSize); PageHelper.startPage(page,pageSize);
changeRecordMapper.selectByCondition(changeFlowListQueryReq); List<ChangeRecord> changeRecords = changeRecordMapper.selectByCondition(changeFlowListQueryReq);
PageInfo<ChangeConfigPo> pageInfo = new PageInfo<>(changeConfigPos); return new PageInfo<>(changeRecords);
return AjaxResult.success(pageInfo);
} }
} }
...@@ -17,10 +17,12 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -17,10 +17,12 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo;
import com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz; import com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz;
import com.netease.mail.yanxuan.change.biz.config.TitleConfig; import com.netease.mail.yanxuan.change.biz.config.TitleConfig;
import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService; import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
import com.netease.mail.yanxuan.change.common.bean.AjaxResult; import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq; import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq; import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq; import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq;
...@@ -56,10 +58,11 @@ public class ChangeFlowController { ...@@ -56,10 +58,11 @@ public class ChangeFlowController {
/** /**
* 变更工单列表查询 * 变更工单列表查询
*
* @return * @return
*/ */
@GetMapping("/query") @GetMapping("/query")
public AjaxResult<Void> query(@RequestParam(name = "page", defaultValue = "1") Integer page, public AjaxResult<PageInfo<ChangeRecord>> query(@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "itemId", required = false) String itemId, @RequestParam(name = "itemId", required = false) String itemId,
@RequestParam(name = "supplier", required = false) String supplier, @RequestParam(name = "supplier", required = false) String supplier,
...@@ -82,8 +85,7 @@ public class ChangeFlowController { ...@@ -82,8 +85,7 @@ public class ChangeFlowController {
changeFlowListQueryReq.setChangeExecDepartment(changeExecDepartment); changeFlowListQueryReq.setChangeExecDepartment(changeExecDepartment);
changeFlowListQueryReq.setStartTime(startTime); changeFlowListQueryReq.setStartTime(startTime);
changeFlowListQueryReq.setEndTime(endTime); changeFlowListQueryReq.setEndTime(endTime);
return AjaxResult return AjaxResult.success(changeFlowBiz.query(page, pageSize, changeFlowListQueryReq));
.success(changeFlowBiz.query(page, pageSize, changeFlowListQueryReq);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment