企业来访添加其他机构

ZQN

2024-07-23 3860e5be6992552f26e567fe4a073e3efad37ba8

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

@@ -53,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->{
@@ -62,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("列表——执法申请单")
@@ -123,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("上报结果")
@@ -146,9 +164,9 @@
    @ApiOperation("执法单投诉")
    @Log(title = "执法单投诉", businessType = BusinessType.UPDATE)
    @PostMapping("/orderComplaint")
    public AjaxResult orderComplaint(OrderComplaintBo bo)
    public AjaxResult orderComplaint(@RequestBody OrderComplaintBo bo)
    {
        return AjaxResult.success(iEnforceOrderService.orderComplaint(bo));
        return toAjax(iEnforceOrderService.orderComplaint(bo));
    }

    @ApiOperation("执法单投诉节点")
@@ -212,4 +230,15 @@
    {
        return toAjax(iEnforceOrderService.deleteByIds(Arrays.asList(orderIds)) ? 1 : 0);
    }


    @ApiOperation("企业确认——执法单")
    //@PreAuthorize("@ss.hasPermi('enforce:order:remove')")
    @Log(title = "企业确认执法单" , businessType = BusinessType.UPDATE)
    @PostMapping("/confirm/{orderId}")
    @RepeatSubmit
    public AjaxResult remove(@PathVariable Long orderId)
    {
        return toAjax(iEnforceOrderService.confirm(orderId) ? 1 : 0);
    }
}