节点添加部门名

ZQN

2024-06-25 7987ac6bf58cd64f0ad2af915ed1a9749960f643

节点添加部门名

 project-enforce/src/main/java/com/project/enforce/domain/vo/OrderNodeVo.java

@@ -27,6 +27,9 @@
    @ApiModelProperty("节点用户")
    private String nodeUser;

    @ApiModelProperty("节点部门")
    private String nodeDept;

    @ApiModelProperty("节点时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date nodeTime;

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java

@@ -91,16 +91,17 @@
        List<OrderNodeVo> vos = new ArrayList<>();
        EnforceComplaintLog order = this.getById(id);
        if (order.getComplaintTime()!=null){
            vos.add(new OrderNodeVo("发起投诉",order.getCompanyUser(),order.getComplaintTime(), null));
            vos.add(new OrderNodeVo("发起投诉",order.getCompanyUser(),order.getCompanyName(),order.getComplaintTime(), null));
        }
        if (order.getInTime()!=null){
            vos.add(new OrderNodeVo("处理中",order.getInUser(),order.getInTime(), null));
        if (order.getInTime()!=null && StringUtils.isNotEmpty(order.getInUser())){

            vos.add(new OrderNodeVo("处理中",order.getInUser(), userService.getDeptNameByUserId(order.getInId()), order.getInTime(), null));
        }
        if (order.getResultTime()!=null){
            if (order.getComplaintStatus()==-1){
                vos.add(new OrderNodeVo("已驳回",order.getResultUser(),order.getResultTime(), order.getComplaintResult()));
                vos.add(new OrderNodeVo("已驳回",order.getResultUser(),userService.getDeptNameByUserId(order.getResultId()),order.getResultTime(), order.getComplaintResult()));
            } else {
                vos.add(new OrderNodeVo("已办结",order.getResultUser(),order.getResultTime(), order.getComplaintResult()));
                vos.add(new OrderNodeVo("已办结",order.getResultUser(),userService.getDeptNameByUserId(order.getResultId()),order.getResultTime(), order.getComplaintResult()));
            }
        }
        return vos;

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java

@@ -275,22 +275,23 @@
                .eq(EnforceCheckLog::getOrderId, orderId).orderByAsc(EnforceCheckLog::getCheckTime)
        );
        if (order.getApplyTime()!=null){
            vos.add(new OrderNodeVo("提交申请",order.getApplyUser(),order.getApplyTime(), null));
            vos.add(new OrderNodeVo("提交申请",order.getApplyUser(),order.getApplyDeptName(),order.getApplyTime(), null));
        }
        if (StringUtils.isNotEmpty(checkLogs)){
            for (EnforceCheckLog checkLog : checkLogs) {

                if (checkLog.getCheckStatus()>0){
                    vos.add(new OrderNodeVo("审批通过",checkLog.getCheckUser(),checkLog.getCheckTime(), null));
                    vos.add(new OrderNodeVo("审批通过",checkLog.getCheckUser(),userService.getDeptNameByUserId(checkLog.getCheckId()),checkLog.getCheckTime(), null));
                } else {
                    vos.add(new OrderNodeVo("审批拒绝",checkLog.getCheckUser(),checkLog.getCheckTime(), checkLog.getCheckReason()));
                    vos.add(new OrderNodeVo("审批拒绝",checkLog.getCheckUser(),userService.getDeptNameByUserId(checkLog.getCheckId()),checkLog.getCheckTime(), checkLog.getCheckReason()));
                }
            }
        }
        if (order.getInTime()!=null){
            vos.add(new OrderNodeVo("扫码入企",order.getExecuteUser(),order.getInTime(), null));
            vos.add(new OrderNodeVo("扫码入企",order.getExecuteUser(),order.getExecuteDeptName(),order.getInTime(), null));
        }
        if (order.getExecuteTime()!=null){
            vos.add(new OrderNodeVo("结果上报",order.getExecuteUser(),order.getExecuteTime(), null));
            vos.add(new OrderNodeVo("结果上报",order.getExecuteUser(),order.getExecuteDeptName(),order.getExecuteTime(), null));
        }

        return vos;

 project-system/src/main/java/com/project/system/service/ISysCompanyService.java

@@ -78,5 +78,4 @@
     */
    Boolean saveImport(SysCompanyResultVo resultVo);


}

 project-system/src/main/java/com/project/system/service/ISysUserService.java

@@ -254,4 +254,13 @@
     * @return    结果
     */
    Boolean saveImport(SysUserResultVo resultVo);

    /**
     * 获取部门名
     * @param userId    用户id
     * @return  部门名
     */
    String getDeptNameByUserId(Long userId);


}

 project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java

@@ -718,4 +718,10 @@
        }
        return true;
    }

    @Override
    public String getDeptNameByUserId(Long userId)
    {
        return deptService.selectDeptById(selectUserById(userId).getDeptId()).getDeptName();
    }
}