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

ZQN

2024-06-21 6acee0d1d79a05f7a3a3c386e9df02e9a741f544

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

@@ -4,13 +4,20 @@
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.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.system.service.ISysDeptService;
import com.project.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -32,6 +39,27 @@
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("执法单列表")
    @GetMapping("/list")
@@ -61,6 +89,14 @@
        return getDataTable(list);
    }

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


    @ApiOperation("导出执法单列表")
    //@PreAuthorize("@ss.hasPermi('enforce:order:export')")
@@ -83,6 +119,7 @@
    }



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