节点添加部门名

ZQN

2024-06-25 7987ac6bf58cd64f0ad2af915ed1a9749960f643

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

@@ -18,6 +18,7 @@
import com.project.enforce.mapper.EnforceComplaintLogMapper;
import com.project.enforce.service.IEnforceComplaintLogService;
import com.project.system.service.ISysDeptService;
import com.project.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -37,6 +38,7 @@
public class EnforceComplaintLogServiceImpl extends ServiceImpl<EnforceComplaintLogMapper, EnforceComplaintLog> implements IEnforceComplaintLogService {

    private final ISysDeptService deptService;
    private final ISysUserService userService;


    @Override//列表查询
@@ -89,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.getExecuteUser(),order.getResultTime(), order.getComplaintResult()));
                vos.add(new OrderNodeVo("已驳回",order.getResultUser(),userService.getDeptNameByUserId(order.getResultId()),order.getResultTime(), order.getComplaintResult()));
            } else {
                vos.add(new OrderNodeVo("已办结",order.getExecuteUser(),order.getResultTime(), order.getComplaintResult()));
                vos.add(new OrderNodeVo("已办结",order.getResultUser(),userService.getDeptNameByUserId(order.getResultId()),order.getResultTime(), order.getComplaintResult()));
            }
        }
        return vos;
@@ -108,7 +111,7 @@
    @Transactional
    public Boolean inComplaint(ComplaintResultBo bo)
    {
        SysUser loginUser = SecurityUtils.getLoginUser().getUser();
        SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId());
        return this.update(lu()
                .set(EnforceComplaintLog::getInId,loginUser.getUserId())
                .set(EnforceComplaintLog::getInUser,loginUser.getNickName())
@@ -125,7 +128,7 @@
        if (StringUtils.isEmpty(bo.getResult())){
            throw new BaseException("请填写处理结果");
        }
        SysUser loginUser = SecurityUtils.getLoginUser().getUser();
        SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId());
        return this.update(lu()
                .set(EnforceComplaintLog::getResultId,loginUser.getUserId())
                .set(EnforceComplaintLog::getResultUser,loginUser.getNickName())