From d4202e0a054617cc1d18e5e5f92581cf9b07e1db Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 10:35:06 +0800
Subject: [PATCH] 执法结果上报
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 9 ++++
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 21 ++++++++++
project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java | 8 +++
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/OrderResultBo.java | 31 +++++++++++++++
4 files changed, 68 insertions(+), 1 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index d87f258..2de01dd 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/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)
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/OrderResultBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/OrderResultBo.java
new file mode 100644
index 0000000..a6777e6
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/OrderResultBo.java
@@ -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("鎵ф硶鍗昳d")
+ private Long orderId;
+
+ @ApiModelProperty("鎵ф硶缁撴灉锛�0姝ｅ父锛�1寰呮暣鏀�")
+ private Integer regionStatus;
+
+ @ApiModelProperty("鎵ф硶缁撴灉璇存槑")
+ private String regionReason;
+
+ @ApiModelProperty("鎵ф硶鍥剧墖")
+ private String regionImgs;
+
+ @ApiModelProperty("鎵ф硶瑙嗛")
+ private String regionVideos;
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
index 0234118..70ad5e1 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
+++ b/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);
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index 7ca3bc4..cc5e2a1 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/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())
+ );
+ }
+
//-------------------------------------------------------------------------------------
--
Gitblit v1.9.1