问题修改

ZQN

2024-06-24 b003b843a47f87bc47f870274d5d012d5208f00b

 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;

    /**
     * 通用列表-无权限
@@ -67,6 +68,11 @@
        return Convert.toList(EnforceOrderVo.class , list);
    }

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

    /**
     * 企业执法单列表
     * @param bo   参数
@@ -76,7 +82,7 @@
    public List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo)
    {
        QueryWrapper<EnforceOrder> qw = getQw(bo);
        qw.ge("order_status",2);
        qw.ge("order_status",4);
        List<EnforceOrder> list = this.list(qw);
        return Convert.toList(EnforceOrderVo.class , list);
    }
@@ -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);
                }
            }
        }
@@ -297,11 +305,14 @@
    public Boolean doScanOrder(Long orderId)
    {
        EnforceOrder order = this.getById(orderId);
        if (order.getOrderStatus()!=2){
            throw new BaseException("执法单还未审批！");
        }
        order.setOrderStatus(3);
        SysUser user = SecurityUtils.getLoginUser().getUser();
        order.setExecuteId(user.getUserId());
        order.setExecuteUser(user.getNickName());
        order.setExecutePhone(user.getRecommendPhone());
        order.setExecutePhone(user.getPhonenumber());
        order.setExecuteDeptId(user.getDeptId());
        order.setExecuteDeptName(deptService.getDeptAllName(user.getDeptId()));
        order.setInTime(DateUtils.getNowDate());
@@ -318,7 +329,6 @@
        if (StringUtils.isEmpty(resultBo.getRegionReason())){
            throw new BaseException("请填写执法结果说明");
        }

        return this.update(lu()
                .set(resultBo.getRegionStatus()!=null, EnforceOrder::getRegionStatus, resultBo.getRegionStatus())
                .set(StringUtils.isNotEmpty(resultBo.getRegionReason()), EnforceOrder::getRegionReason, resultBo.getRegionReason())
@@ -343,6 +353,9 @@
            throw new BaseException("请填写投诉内容！");
        }
        EnforceOrder order = this.getById(bo.getOrderId());
        if (order.getOrderStatus()!=4){
            throw new BaseException("执法单未上报执法结果！");
        }
        //添加投诉记录
        EnforceComplaintLogBo complaintLogBo = Convert.convert(EnforceComplaintLogBo.class, order);
        complaintLogBo.setComplaintType(bo.getComplaintType());
@@ -444,6 +457,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());