姓名模糊

ZQN

2024-06-26 405efffde1a73706126171e2632c3e6a939c48cb

 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java

@@ -12,6 +12,7 @@
import com.project.common.utils.StringUtils;
import com.project.common.utils.poi.ExcelUtil;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.editBo.OrderComplaintBo;
import com.project.enforce.domain.bo.editBo.OrderResultBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
@@ -52,7 +53,7 @@
                .ne(SysUser::getUserType,"02")
                .ne(SysUser::getUserName,"admin")
                .ne(SysUser::getUserId, SecurityUtils.getUserId())
                .eq(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
                .like(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
                .eq(deptId!=null, SysUser::getDeptId,deptId)
        );
        list.forEach(user->{
@@ -61,6 +62,24 @@
            user.setDept(sysDept);
        });
        return AjaxResult.success(list);
    }

    @ApiOperation("列表——无特殊查询")
    @GetMapping("/commonList")
    public TableDataInfo commonList(EnforceOrderQueryBo bo)
    {
        startPage();
        List<EnforceOrderVo> list = iEnforceOrderService.queryCommonList(bo);
        return getDataTable(list);
    }

    @ApiOperation("列表——企业执法记录")
    @GetMapping("/companyList")
    public TableDataInfo companyList(EnforceOrderQueryBo bo)
    {
        startPage();
        List<EnforceOrderVo> list = iEnforceOrderService.queryCompanyList(bo);
        return getDataTable(list);
    }

    @ApiOperation("列表——执法申请单")
@@ -122,7 +141,7 @@
    @PostMapping("/doScanOrder/{orderId}")
    public AjaxResult doScanOrder(@PathVariable("orderId") Long orderId)
    {
        return AjaxResult.success(iEnforceOrderService.doScanOrder(orderId));
        return toAjax(iEnforceOrderService.doScanOrder(orderId));
    }

    @ApiOperation("上报结果")
@@ -133,6 +152,7 @@
        return AjaxResult.success(iEnforceOrderService.doResultOrder(resultBo));
    }


    @ApiOperation("执法单节点")
    @GetMapping("/orderNodeList")
    public AjaxResult orderNodeList(@RequestParam("orderId") Long orderId)
@@ -141,6 +161,21 @@
        return AjaxResult.success(list);
    }

    @ApiOperation("执法单投诉")
    @Log(title = "执法单投诉", businessType = BusinessType.UPDATE)
    @PostMapping("/orderComplaint")
    public AjaxResult orderComplaint(@RequestBody OrderComplaintBo bo)
    {
        return toAjax(iEnforceOrderService.orderComplaint(bo));
    }

    @ApiOperation("执法单投诉节点")
    @GetMapping("/orderComplaintNodeList")
    public AjaxResult orderComplaintNodeList(@RequestParam("orderId") Long orderId)
    {
        List<OrderNodeVo> list = iEnforceOrderService.orderComplaintNodeList(orderId);
        return AjaxResult.success(list);
    }

    @ApiOperation("导出执法单列表")
    //@PreAuthorize("@ss.hasPermi('enforce:order:export')")