企业来访添加其他机构

ZQN

2024-07-23 3860e5be6992552f26e567fe4a073e3efad37ba8

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

@@ -49,6 +49,23 @@
        return Convert.toList(EnforceComplaintLogVo.class , list);
    }

    @Override//列表查询
    public List<EnforceComplaintLogVo> complaintList(EnforceComplaintLogQueryBo bo)
    {
        QueryWrapper<EnforceComplaintLog> qw = getQw(bo);
        qw.ne("complaint_type","-1");
        List<EnforceComplaintLog> list = this.list(qw);
        return Convert.toList(EnforceComplaintLogVo.class , list);
    }

    @Override
    public List<EnforceComplaintLogVo> queryPleaseList(EnforceComplaintLogQueryBo bo) {
        QueryWrapper<EnforceComplaintLog> qw = getQw(bo);
        qw.eq("complaint_type","-1");
        List<EnforceComplaintLog> list = this.list(qw);
        return Convert.toList(EnforceComplaintLogVo.class , list);
    }

    @Override//id查询
    public EnforceComplaintLogVo queryById(Long id)
    {
@@ -91,16 +108,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;
@@ -155,11 +173,11 @@
            ){
                throw new BaseException("投诉企业不能为空！");
            }
            if (entity.getExecuteDeptId() == null
                    || StringUtils.isEmpty(entity.getExecuteDeptName())
            ){
                throw new BaseException("投诉单位不能为空！");
            }
//            if (entity.getExecuteDeptId() == null
//                    || StringUtils.isEmpty(entity.getExecuteDeptName())
//            ){
//                throw new BaseException("投诉单位不能为空！");
//            }
            if (StringUtils.isEmpty(entity.getComplaintType())){
                throw new BaseException("请选择要投诉类型！");
            }