执法单节点添加，审批修改

ZQN

2024-06-21 6acee0d1d79a05f7a3a3c386e9df02e9a741f544

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

@@ -1,30 +1,31 @@
package com.project.admin.controller.enforce;

import java.util.List;
import java.util.Arrays;

import com.project.common.annotation.RepeatSubmit;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.project.common.annotation.Log;
import com.project.common.annotation.RepeatSubmit;
import com.project.common.core.controller.BaseController;
import com.project.common.core.domain.AjaxResult;
import com.project.common.core.domain.entity.SysDept;
import com.project.common.core.domain.entity.SysUser;
import com.project.common.core.page.TableDataInfo;
import com.project.common.enums.BusinessType;
import com.project.enforce.domain.vo.EnforceOrderVo;
import com.project.common.utils.SecurityUtils;
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.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.service.IEnforceOrderService;
import com.project.common.utils.poi.ExcelUtil;
import com.project.common.core.page.TableDataInfo;
import com.project.system.service.ISysDeptService;
import com.project.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
 * 执法单Controller
@@ -38,9 +39,29 @@
public class EnforceOrderController extends BaseController {

    private final IEnforceOrderService iEnforceOrderService;
    private final ISysUserService userService;
    private final ISysDeptService deptService;

    @ApiOperation("获取同行人")
    @GetMapping("/peerList")
    public AjaxResult peerList(String nickName, String deptId)
    {
        List<SysUser> list = userService.list(userService.lq()
                .ne(SysUser::getUserType,"02")
                .ne(SysUser::getUserName,"admin")
                .ne(SysUser::getUserId, SecurityUtils.getUserId())
                .eq(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
                .eq(deptId!=null, SysUser::getDeptId,deptId)
        );
        list.forEach(user->{
            SysDept sysDept = deptService.selectDeptById(user.getDeptId());
            sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
            user.setDept(sysDept);
        });
        return AjaxResult.success(list);
    }

    @ApiOperation("查询执法单列表")
    @ApiOperation("执法单列表")
    @GetMapping("/list")
    public TableDataInfo list(EnforceOrderQueryBo bo)
    {
@@ -49,6 +70,32 @@
        return getDataTable(list);
    }

    @ApiOperation("信息公式列表")
    @GetMapping("/showList")
    public TableDataInfo showList()
    {
        startPage();
        List<EnforceOrderVo> list = iEnforceOrderService.showList();
        return getDataTable(list);
    }


    @ApiOperation("审批人列表")
    @GetMapping("/checkList")
    public TableDataInfo checkList(EnforceOrderQueryBo bo)
    {
        startPage();
        List<EnforceOrderVo> list = iEnforceOrderService.queryCheckList(bo);
        return getDataTable(list);
    }

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


    @ApiOperation("导出执法单列表")
@@ -59,7 +106,7 @@
    public AjaxResult export(EnforceOrderQueryBo bo)
    {
        List<EnforceOrderVo> list = iEnforceOrderService.queryList(bo);
        ExcelUtil<EnforceOrderVo> util = new ExcelUtil<EnforceOrderVo>(EnforceOrderVo.class);
        ExcelUtil<EnforceOrderVo> util = new ExcelUtil<>(EnforceOrderVo.class);
        return util.exportExcel(list, "执法单");
    }

@@ -72,6 +119,7 @@
    }



    @ApiOperation("新增执法单")
    //@PreAuthorize("@ss.hasPermi('enforce:order:add')")
    @Log(title = "执法单", businessType = BusinessType.INSERT)