响应

ZQN

2024-06-24 4172b0bdc098d4a8055bdb0b1bfb4cbf866e47a0

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

@@ -82,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);
    }
@@ -305,6 +305,9 @@
    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());
@@ -326,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())
@@ -351,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());