执法结果上报

ZQN

2024-06-22 d4202e0a054617cc1d18e5e5f92581cf9b07e1db

执法结果上报

 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java

@@ -12,6 +12,7 @@
import com.project.common.utils.StringUtils;
import com.project.common.utils.poi.ExcelUtil;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.editBo.OrderResultBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
@@ -124,6 +125,14 @@
        return AjaxResult.success(iEnforceOrderService.doScanOrder(orderId));
    }

    @ApiOperation("上报结果")
    @Log(title = "执法队员上报结果", businessType = BusinessType.UPDATE)
    @PostMapping("/doResultOrder")
    public AjaxResult doResultOrder(@RequestBody OrderResultBo resultBo)
    {
        return AjaxResult.success(iEnforceOrderService.doResultOrder(resultBo));
    }

    @ApiOperation("执法单节点")
    @GetMapping("/orderNodeList")
    public AjaxResult orderNodeList(@RequestParam("orderId") Long orderId)

 project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/OrderResultBo.java

New file
@@ -0,0 +1,31 @@
package com.project.enforce.domain.bo.editBo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * 功能描述：上报结果参数
 *
 * @author ZQN
 * @version 1.0
 */
@Data
public class OrderResultBo
{


    @ApiModelProperty("执法单id")
    private Long orderId;

    @ApiModelProperty("执法结果：0正常，1待整改")
    private Integer regionStatus;

    @ApiModelProperty("执法结果说明")
    private String regionReason;

    @ApiModelProperty("执法图片")
    private String regionImgs;

    @ApiModelProperty("执法视频")
    private String regionVideos;
}

 project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java

@@ -3,6 +3,7 @@
import com.project.common.mybatis.IBaseService;
import com.project.enforce.domain.EnforceOrder;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.editBo.OrderResultBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
@@ -108,5 +109,10 @@
     */
    Boolean doScanOrder(Long orderId);


    /**
     * 上报结果
     * @param resultBo    参数
     * @return    结果
     */
    Boolean doResultOrder(OrderResultBo resultBo);
}

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

@@ -7,6 +7,7 @@
import com.project.common.annotation.DataScope;
import com.project.common.core.domain.entity.SysUser;
import com.project.common.enums.OrderPre;
import com.project.common.exception.base.BaseException;
import com.project.common.sms.YPSmsApi;
import com.project.common.utils.DateUtils;
import com.project.common.utils.SecurityUtils;
@@ -15,6 +16,7 @@
import com.project.enforce.domain.EnforceOrder;
import com.project.enforce.domain.EnforcePeer;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.editBo.OrderResultBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
@@ -221,6 +223,25 @@
        return this.updateById(order);
    }

    @Override
    public Boolean doResultOrder(OrderResultBo resultBo)
    {
        if (resultBo.getRegionStatus()==null){
            throw new BaseException("请填写执法结果");
        }
        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())
                .set(StringUtils.isNotEmpty(resultBo.getRegionImgs()), EnforceOrder::getRegionImgs, resultBo.getRegionImgs())
                .set(StringUtils.isNotEmpty(resultBo.getRegionVideos()), EnforceOrder::getRegionVideos, resultBo.getRegionVideos())
                .set( EnforceOrder::getExecuteTime, DateUtils.getNowDate())
        );
    }


//-------------------------------------------------------------------------------------