保洁巡检本周代码

无关风月

4 天以前 f4bd0aee057469535a859905582ba4e955fbb79d

保洁巡检本周代码

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java

@@ -644,7 +644,7 @@

    @ApiOperation(value = "我的审批-详情")
    @GetMapping(value = "/leaveDetail")
    public R<LeaveUserDetailVO> leaveDetail(@RequestParam String id) {
    public  R<LeaveUserDetailVO> leaveDetail(@RequestParam String id) {
        TLeave leave = leaveService.getById(id);
        LeaveUserDetailVO leaveUserDetailVO = new LeaveUserDetailVO();
        SysUser sysUser = sysUserService.selectUserById(Long.parseLong(leave.getLeavePerson()));
@@ -671,6 +671,15 @@
            TDept byId = deptService.getById(sysUser.getDeptId());
            leaveUserDetailVO.setDeptName(byId.getDeptName());
        }
        if (sysUser.getDeptType()==1){
            TProjectDept projectDept = projectDeptService.getById(sysUser.getDeptId());
            if (projectDept.getParentId().equals("0")){
                leaveUserDetailVO.setDeptName(projectDept.getProjectName());
            }else{
                TProjectDept projectDept1 = projectDeptService.getById(projectDept.getParentId());
                leaveUserDetailVO.setDeptName(projectDept1.getProjectName()+">"+projectDept.getProjectName());
            }
        }
        leaveUserDetailVO.setLeavePersonName(sysUser.getNickName());
        LeaveAuditListVO leaveAuditListVO = new LeaveAuditListVO();
        List<TLeaveAudit> list = leaveAuditService.list(new LambdaQueryWrapper<TLeaveAudit>()

 ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/KnowledgeVO.java

@@ -28,6 +28,9 @@
    @ApiModelProperty(value = "浏览量")
    @TableField("views")
    private Integer views;
    @ApiModelProperty(value = "内容")
    @TableField("content")
    private String content;

    @ApiModelProperty(value = "状态 1启用 2禁用")
    @TableField("status")