1. 小程序 查询工单列表
This commit is contained in:
parent
267dd281ea
commit
eb1e3bc2ba
|
|
@ -105,4 +105,5 @@ public class WrkAppQuery extends CommonParam {
|
|||
@Null(message = "内部流转参数")
|
||||
private List<Integer> wrkStatusList;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,42 +86,42 @@ public class WrkInfoController {
|
|||
}
|
||||
|
||||
/**
|
||||
* app查询
|
||||
* app查询 工单列表
|
||||
*
|
||||
* @param query 条件
|
||||
*/
|
||||
@SysLog(value = "app", businessType = BusinessType.QUERY)
|
||||
@GetMapping("/app/page")
|
||||
@RequiresPermissions("wrk:app:page")
|
||||
public AjaxResult queryAppPage(@Validated WrkAppQuery query) {
|
||||
boolean isRecheck = TaskConfigUtils.reviewMethod(query.getTaskId()) == 3;
|
||||
public AjaxResult queryAppPage(@Validated WrkAppQuery query)
|
||||
{
|
||||
Integer wrkStatus = query.getWrkStatus();
|
||||
List<Integer> wrkStatusList = new ArrayList<>();
|
||||
wrkStatusList.add(wrkStatus);
|
||||
if (wrkStatus.equals(3) && isRecheck) {
|
||||
wrkStatusList.add(4);
|
||||
} else if (wrkStatus.equals(5) && isRecheck) {
|
||||
wrkStatusList.add(6);
|
||||
List<Integer> status = new ArrayList<>();
|
||||
// 待初审 -->
|
||||
if (2 == wrkStatus){
|
||||
status.add(2);
|
||||
status.add(3);
|
||||
}
|
||||
query.setWrkStatusList(wrkStatusList);
|
||||
query.setWrkStatus(isRecheck ? 4 : 3);
|
||||
// 待复审, 应当查询审核方式为复审, 同时审核通过人员
|
||||
else if (3 == wrkStatus){
|
||||
status.add(3);
|
||||
status.add(2);
|
||||
}
|
||||
// 归档, 审核通过, 应当查询 审核方式为初审, 审核通过, 审核方式为复审, 审核通过
|
||||
else if (4 == wrkStatus){
|
||||
status.add(4);
|
||||
status.add(7);
|
||||
status.add(8);
|
||||
}
|
||||
// 驳回
|
||||
else if (5 == wrkStatus){
|
||||
status.add(5);
|
||||
status.add(6);
|
||||
}
|
||||
query.setWrkStatusList(status);
|
||||
return AjaxResult.success(wrkInfoService.queryAppPage(query));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 工单归档信息查询
|
||||
* todo
|
||||
*/
|
||||
@SysLog(value = "工单归档信息", businessType = BusinessType.QUERY)
|
||||
@GetMapping("/archive/page")
|
||||
@RequiresPermissions("wrk:archive:page")
|
||||
public AjaxResult queryArchivePage(@Validated ReviewedQuery query) {
|
||||
Integer reviewMethod = TaskConfigUtils.reviewMethod(query.getTaskId());
|
||||
query.setStates(reviewMethod == 3 ? Lists.newArrayList(4) : Lists.newArrayList(3));
|
||||
return AjaxResult.success(wrkInfoService.queryArchivePage(query));
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出工单 word
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -126,13 +126,12 @@ public class WrkInfoServiceImpl extends ServiceImpl<WrkInfoMapper, WrkInfo> impl
|
|||
}
|
||||
|
||||
/**
|
||||
* app查询
|
||||
* app查询 工单列表
|
||||
*/
|
||||
@Override
|
||||
|
||||
public PageResult queryAppPage(WrkAppQuery query) {
|
||||
CommonParam commonParam = CommonParam.buildPageRequest();
|
||||
WrapperUtils.buildSql(query);
|
||||
CommonParam commonParam = CommonParam.buildPageRequest();
|
||||
Page<WrkListAppVO> page = new Page<>(commonParam.getPage(), commonParam.getLimit());
|
||||
List<WrkListAppVO> records = baseMapper.queryAppPage(query, page);
|
||||
return new PageResult(records, page);
|
||||
|
|
|
|||
Loading…
Reference in New Issue