Commit de42bf14 by “zcwang”

add: 新增需求,查询列表添加工单条件查询

parent f6fd64f6
......@@ -77,6 +77,11 @@ public class ChangeFlowListQueryReq {
*/
private String createSupplier;
/**
* 工单id
*/
private Long flowId;
private Long limit;
private Long offset;
......
......@@ -81,6 +81,9 @@
<if test="createSupplier != null">
and create_supplier = #{createSupplier}
</if>
<if test="flowId != null">
and flow_id = #{flowId}
</if>
</where>
order by create_time desc
</select>
......
......@@ -91,7 +91,8 @@ public class ChangeFlowController {
@RequestParam(name = "changeDepartment", required = false) String changeDepartment,
@RequestParam(name = "changeExecDepartment", required = false) String changeExecDepartment,
@RequestParam(name = "startTime", required = false) Long startTime,
@RequestParam(name = "endTime", required = false) Long endTime) {
@RequestParam(name = "endTime", required = false) Long endTime,
@RequestParam(name = "flowId") Long flowId) {
ChangeFlowListQueryReq changeFlowListQueryReq = new ChangeFlowListQueryReq();
changeFlowListQueryReq.setItemId(itemId);
changeFlowListQueryReq.setSupplier(supplier);
......@@ -103,6 +104,7 @@ public class ChangeFlowController {
changeFlowListQueryReq.setChangeExecDepartment(changeExecDepartment);
changeFlowListQueryReq.setStartTime(startTime);
changeFlowListQueryReq.setEndTime(endTime);
changeFlowListQueryReq.setFlowId(flowId);
// QC端可以查看所有,不加入过滤条件
if (!CreateSourceEnum.QC.getType().equals(createSource)) {
changeFlowListQueryReq.setCreateSource(createSource);
......
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