sz-team/supervision-test-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ye1023
2026-07-15 09:49:25 +08:00
parent 09798a5755 148a50c3b3
commit 9ae0e8172c
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java
+2
View File
@@ -97,6 +97,8 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
public Result<IPage<DqInspectTaskLedgerVo>> queryLedgerList(DqInspectTask dqInspectTask, public Result<IPage<DqInspectTaskLedgerVo>> queryLedgerList(DqInspectTask dqInspectTask,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
dqInspectTask.setCompletedStage(null);
dqInspectTask.setMeasureCount(null);
Page<DqInspectTaskLedgerVo> page = new Page<DqInspectTaskLedgerVo>(pageNo, pageSize); Page<DqInspectTaskLedgerVo> page = new Page<DqInspectTaskLedgerVo>(pageNo, pageSize);
IPage<DqInspectTaskLedgerVo> pageList = service.queryLedgerPage(page, dqInspectTask); IPage<DqInspectTaskLedgerVo> pageList = service.queryLedgerPage(page, dqInspectTask);
return Result.OK(pageList); return Result.OK(pageList);
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml
+3
View File
@@ -61,6 +61,9 @@
<if test="task.completedStage != null and task.completedStage != ''"> <if test="task.completedStage != null and task.completedStage != ''">
and t.completed_stage = #{task.completedStage} and t.completed_stage = #{task.completedStage}
</if> </if>
<if test="task.bpmStatus != null and task.bpmStatus != ''">
and t.bpm_status = #{task.bpmStatus}
</if>
</if> </if>
order by order by
p_category.sort_no asc, p_category.sort_no asc,