!83 fix(dq): 台账查询增加bpmStatus过滤条件,并修复completedStage/measureCount默认值污染
Merge pull request !83 from wsm/feature/bpm_status_query
This commit is contained in:
+2
@@ -97,6 +97,8 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
public Result<IPage<DqInspectTaskLedgerVo>> queryLedgerList(DqInspectTask dqInspectTask,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
|
||||
dqInspectTask.setCompletedStage(null);
|
||||
dqInspectTask.setMeasureCount(null);
|
||||
Page<DqInspectTaskLedgerVo> page = new Page<DqInspectTaskLedgerVo>(pageNo, pageSize);
|
||||
IPage<DqInspectTaskLedgerVo> pageList = service.queryLedgerPage(page, dqInspectTask);
|
||||
return Result.OK(pageList);
|
||||
|
||||
+3
@@ -61,6 +61,9 @@
|
||||
<if test="task.completedStage != null and task.completedStage != ''">
|
||||
and t.completed_stage = #{task.completedStage}
|
||||
</if>
|
||||
<if test="task.bpmStatus != null and task.bpmStatus != ''">
|
||||
and t.bpm_status = #{task.bpmStatus}
|
||||
</if>
|
||||
</if>
|
||||
order by
|
||||
p_category.sort_no asc,
|
||||
|
||||
Reference in New Issue
Block a user