审批，投诉，报表修改

ZQN

2024-06-22 484bc1f21e7d29b480005f9c7077b03c64d8f86e

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

@@ -53,6 +53,7 @@
    private final IEnforceComplaintLogService complaintLogService;
    private final IEnforceEvaluateLogService evaluateLogService;
    private final YPSmsService smsService;
    private final EnforceOrderMapper orderMapper;

    /**
     * 通用列表-无权限
@@ -65,6 +66,11 @@
        QueryWrapper<EnforceOrder> qw = getQw(bo);
        List<EnforceOrder> list = this.list(qw);
        return Convert.toList(EnforceOrderVo.class , list);
    }

    @Override
    public Integer getDistinctCompanyNum() {
        return orderMapper.getDistinctCompanyNum();
    }

    /**
@@ -171,12 +177,14 @@
            if (one!=null){
                String questionStatic = one.getQuestionStatic();
                if (StringUtils.isNotEmpty(questionStatic)){
                    EnforceEvaluateVo evaluateVo = Convert.convert(EnforceEvaluateVo.class, one);
                    try {
                        EnforceEvaluateVo evaluateVo = JsonUtils.jsonToPojo(questionStatic, EnforceEvaluateVo.class);
                        vo.setEvaluateVo(evaluateVo);
                        List<EnforceEvaluateQuestion> questions = JsonUtils.jsonToList(questionStatic, EnforceEvaluateQuestion.class);
                        evaluateVo.setQuestionList(questions);
                    } catch (Exception e) {
                        throw new BaseException("评价问券解析异常！");
                    }
                    vo.setEvaluateVo(evaluateVo);
                }
            }
        }
@@ -444,6 +452,8 @@
        qw.eq(bo.getIsShow() != null, "is_show", bo.getIsShow());
        qw.eq(bo.getIsEva() != null, "is_eva", bo.getIsEva());
        qw.eq(bo.getTotalScore() != null, "total_score", bo.getTotalScore());
        qw.ge(StringUtils.isNotEmpty(bo.getBeginTime()), "in_time", bo.getBeginTime());
        qw.le(StringUtils.isNotEmpty(bo.getEndTime()), "in_time", bo.getEndTime());
        if (StringUtils.isNotEmpty(bo.getIsAsc()) && StringUtils.isNotEmpty(bo.getOrderByColumn())){
            if ("acs".equals(bo.getIsAsc())) {
                qw.orderByAsc(bo.getOrderByColumn());