From d9fa51fbd30841d807a8eb3bac552c125404f4a5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 08 十一月 2024 16:21:29 +0800
Subject: [PATCH] 处理结果3个接口

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java                   |   94 +++++++++++++++
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java            |   90 +++++++++++---
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/dto/DtoDeleteProResult.java |   28 ++++
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeWorkOrderMapper.java                  |    4 
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml                          |   42 ++++++
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml                                 |   10 +
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java          |   63 ++++++++-
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java           |   28 ++++
 8 files changed, 318 insertions(+), 41 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java
index ad53364..c3ab70b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java
@@ -2,7 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
+import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author ZhuBaoMin
@@ -26,9 +28,31 @@
     int updateByPrimaryKey(OpeProcessingResult record);
 
     /**
-     * 鏍规嵁workOrderId鑾峰彇鏈垹闄ょ殑澶勭悊缁撴灉鏁伴噺锛屾坊鍔犵粨鏋滀笂鎶ュ墠鍒ゆ柇浣跨敤
+     * 鏍规嵁宸ュ崟ID鑾峰彇鏈垹闄ょ殑宸ュ崟瀵硅薄
      * @param workOrderId
      * @return
      */
-    Integer getValidResultCount(Long workOrderId);
+    OpeProcessingResult getByWorkOrderId(Long workOrderId);
+
+    /**
+     * 鑾峰彇鎸囧畾宸℃鍛樼殑鎸囧畾鏈垹闄や笖鏈鎵圭殑澶勭悊缁撴灉涓婃姤锛屽垹闄ゅ鐞嗙粨鏋滃墠鍒ゆ柇浣跨敤浣跨敤
+     * @param proResultId
+     * @param inspectorId
+     * @return
+     */
+    OpeProcessingResult getProResult(@Param("proResultId")Long proResultId, @Param("inspectorId")Long inspectorId);
+
+    /**
+     * 閫昏緫鍒犻櫎涓�涓湭鍒犻櫎鐨勫鐞嗙粨鏋滆褰�
+     * @param proResultId
+     * @return
+     */
+    Integer deleteProResult(Long proResultId);
+
+    /**
+     * 鏍规嵁涓婚敭鑾峰彇澶勭悊缁撴灉瑙嗗浘瀵硅薄
+     * @param proResultId
+     * @return
+     */
+    VoProcessingResult getProResultById(Long proResultId);
 }
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeWorkOrderMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeWorkOrderMapper.java
index 998ab45..e0bf898 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeWorkOrderMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeWorkOrderMapper.java
@@ -39,11 +39,11 @@
 
     /**
      * 鑾峰彇鎸囧畾娲惧崟浜虹殑鎸囧畾鏈垹闄ゅ伐鍗曪紝鍒犻櫎宸ュ崟鍓嶅垽鏂娇鐢ㄤ娇鐢�
-     * @param dispatcherId
      * @param workOrderId
+     * @param dispatcherId
      * @return
      */
-    OpeWorkOrder getWorkOrder(@Param("dispatcherId")Long dispatcherId, @Param("workOrderId")Long workOrderId);
+    OpeWorkOrder getWorkOrder(@Param("workOrderId")Long workOrderId, @Param("dispatcherId")Long dispatcherId);
 
     /**
      * 閫昏緫鍒犻櫎涓�涓湭鍒犻櫎鐨勫伐鍗�
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java
new file mode 100644
index 0000000..3f927c2
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java
@@ -0,0 +1,94 @@
+package com.dy.pipIrrGlobal.voOp;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-11-08 14:59
+ * @LastEditTime 2024-11-08 14:59
+ * @Description
+ */
+
+@Data
+@JsonPropertyOrder({"proResultId","workOrderId","inspector","content"," images"," audios"," videos","lng","lat","completeTime","reportTime","state","stateName"})
+public class VoProcessingResult implements BaseEntity {
+    public static final long serialVersionUID = 202411081500001L;
+
+    /**
+     * 闂缁撴灉ID
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long proResultId;
+
+    /**
+     * 宸ュ崟ID
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long workOrderId;
+
+    /**
+     * 宸℃鍛業D
+     */
+    private String inspector;
+
+    /**
+     * 缁撴灉鍐呭
+     */
+    private String content;
+
+    /**
+     * 鐓х墖鍒楄〃
+     */
+    private String images;
+
+    /**
+     * 闊抽鍒楄〃
+     */
+    private String audios;
+
+    /**
+     * 瑙嗛鍒楄〃
+     */
+    private String videos;
+
+    /**
+     * 缁忓害
+     */
+    private BigDecimal lng;
+
+    /**
+     * 绾害
+     */
+    private BigDecimal lat;
+
+    /**
+     * 浠诲姟瀹屾垚鏃堕棿;绮剧‘鍒板垎
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date completeTime;
+
+    /**
+     * 涓婃姤鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+
+    /**
+     * 鐘舵��;1-宸蹭笂鎶ワ紝2-宸查�氳繃锛�3-宸查┏鍥�
+     */
+    private Byte state;
+
+    /**
+     * 鐘舵�佸悕绉�
+     */
+    private String stateName;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
index 56a5430..4315729 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
@@ -195,8 +195,44 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
 
-  <!--鏍规嵁workOrderId鑾峰彇鏈垹闄ょ殑澶勭悊缁撴灉鏁伴噺锛屾坊鍔犵粨鏋滀笂鎶ュ墠鍒ゆ柇浣跨敤-->
-  <select id="getValidResultCount" resultType="java.lang.Integer">
-    SELECT COUNT(*) FROM  ope_processing_result WHERE deleted = 0 AND work_order_id = #{workOrderId}
+  <!--鏍规嵁宸ュ崟ID鑾峰彇鏈垹闄ょ殑宸ュ崟瀵硅薄-->
+  <select id="getByWorkOrderId" resultType="com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult">
+    SELECT * FROM ope_processing_result WHERE deleted = 0 AND work_order_id = #{workOrderId} LIMIT 1
+  </select>
+
+  <!--鑾峰彇鎸囧畾宸℃鍛樼殑鎸囧畾鏈垹闄や笖鏈鎵圭殑澶勭悊缁撴灉涓婃姤锛屽垹闄ゅ鐞嗙粨鏋滃墠鍒ゆ柇浣跨敤浣跨敤-->
+  <select id="getProResult" resultType="com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult">
+    SELECT * FROM ope_processing_result
+    WHERE deleted = 0 AND state = 1 AND id = #{proResultId} AND inspector_id = #{inspectorId} LIMIT 1
+  </select>
+
+  <!--閫昏緫鍒犻櫎涓�涓湭鍒犻櫎鐨勫鐞嗙粨鏋滆褰�-->
+  <update id="deleteProResult">
+    UPDATE ope_processing_result SET deleted = UNIX_TIMESTAMP() WHERE deleted = 0 AND id = #{proResultId}
+  </update>
+
+  <!--鏍规嵁涓婚敭鑾峰彇澶勭悊缁撴灉瑙嗗浘瀵硅薄-->
+  <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult">
+    SELECT
+        res.id AS proResultId,
+        res.work_order_id AS workOrderId,
+        us.name AS inspector,
+        res.content,
+        res.images,
+        res.audios,
+        res.videos,
+        res.lng,
+        res.lat,
+        res.complete_time AS completeTime,
+        res.report_time AS reportTime,
+        res.state,
+        CASE
+            WHEN res.state = 1 THEN '宸蹭笂鎶�'
+            WHEN res.state = 2 THEN '宸查�氳繃'
+            WHEN res.state = 3 THEN '宸查┏鍥�'
+        END AS stateName
+    FROM ope_processing_result res
+        INNER JOIN ba_user us ON us.id = res.inspector_id
+    WHERE res.deleted = 0 AND res.id = #{proResultId}
   </select>
 </mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
index 9e2a155..2cdd204 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -242,10 +242,14 @@
     WHERE ord.deleted = 0 AND ord.id = #{workOrderId}
   </select>
 
-  <!--鑾峰彇鎸囧畾娲惧崟浜虹殑鎸囧畾鏈垹闄ゅ伐鍗曪紝鍒犻櫎宸ュ崟鍓嶅垽鏂娇鐢ㄤ娇鐢�-->
+  <!--鑾峰彇鎸囧畾娲惧崟浜虹殑銆佹湭涓婃姤鐨勬寚瀹氭湭鍒犻櫎宸ュ崟锛屽垹闄ゅ伐鍗曞墠鍒ゆ柇浣跨敤浣跨敤-->
   <select id="getWorkOrder" resultType="com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder">
-    SELECT * FROM ope_work_order
-    WHERE deleted = 0 AND id = #{workOrderId} AND dispatcher_id = #{dispatcherId} LIMIT 1
+    SELECT
+        *
+    FROM ope_work_order ord
+    WHERE deleted = 0
+        AND NOT EXISTS(SELECT * FROM ope_processing_result res WHERE res.work_order_id = ord.id)
+        AND id = #{workOrderId} AND dispatcher_id = #{dispatcherId} LIMIT 1
   </select>
 
   <!--閫昏緫鍒犻櫎涓�涓湭鍒犻櫎鐨勫伐鍗�-->
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
index dbf73c5..e365380 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
@@ -1,13 +1,16 @@
 package com.dy.pipIrrApp.workOrder;
 
+import com.alibaba.fastjson2.JSON;
 import com.dy.common.aop.SsoAop;
 import com.dy.common.webUtil.BaseResponse;
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrApp.workOrder.dto.DtoDeleteProResult;
 import com.dy.pipIrrApp.workOrder.dto.DtoDeleteWorkOrder;
 import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
 import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
 import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
+import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
 import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -133,7 +136,7 @@
             return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
 
-        OpeWorkOrder workOrder = workOrderSv.getWorkOrder(deleteWorkOrder.getDispatcherId(), deleteWorkOrder.getWorkOrderId());
+        OpeWorkOrder workOrder = workOrderSv.getWorkOrder(deleteWorkOrder.getWorkOrderId(), deleteWorkOrder.getDispatcherId());
         if(workOrder == null) {
             return BaseResponseUtils.buildErrorMsg("鎮ㄨ鍒犻櫎鐨勫伐鍗曚笉瀛樺湪");
         }
@@ -141,7 +144,6 @@
         if(workOrderSv.deleteWorkOrder(deleteWorkOrder.getWorkOrderId()) == 0) {
             return BaseResponseUtils.buildErrorMsg("宸ュ崟鍒犻櫎澶辫触");
         }
-
 
         return BaseResponseUtils.buildSuccess();
     }
@@ -178,8 +180,10 @@
 
     /**
      * 涓婃姤宸ュ崟澶勭悊缁撴灉
-     *      鍒ゆ柇璇ュ伐鍗曟槸鍚﹀瓨鍦ㄦ湁鏁堢殑澶勭悊缁撴灉锛屽鏋滃瓨鍦ㄥ垯鎻愮ず鐢ㄦ埛璇ュ伐鍗曞凡瀛樺湪澶勭悊缁撴灉
-     *      娣诲姞澶勭悊缁撴灉鍥炲
+     *      1.鏈笂鎶ョ殑锛岀洿鎺ヤ笂鎶�
+     *      2. 宸蹭笂鎶ョ殑鐨勶紝鎻愮ず鐢ㄦ埛涓嶈兘閲嶅涓婃姤
+     *      3. 宸查�氳繃鐨勶紝鎻愮ず鐢ㄦ埛澶勭悊缁撴灉澶勭悊缁撴灉宸查�氳繃
+     *      4. 椹冲洖鐨勶紝閫昏緫鍒犻櫎鍘熷鐞嗙粨鏋滐紝涓婃姤鏂扮殑澶勭悊缁撴灉
      * @param po
      * @param bindingResult
      * @return
@@ -191,16 +195,53 @@
             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
 
-        if(workOrderSv.hasValidProcessingResult(po.getWorkOrderId())) {
-            return BaseResponseUtils.buildErrorMsg("璇ュ伐鍗曞瓨鍦ㄦ湁鏁堢殑澶勭悊缁撴灉");
-        }
-
-        Long processingResultId = workOrderSv.insertProcessingResult(po);
-        if(processingResultId == null) {
-            return BaseResponseUtils.buildErrorMsg("涓婃姤宸ュ崟澶勭悊缁撴灉澶辫触");
+        String result = workOrderSv.addProcessingResult(po);
+        if(!result.equals("success")) {
+            return BaseResponseUtils.buildErrorMsg(result);
         }
 
         return BaseResponseUtils.buildSuccess(true) ;
     }
 
+    /**
+     * 閫昏緫鍒犻櫎涓�涓鐞嗙粨鏋�
+     * @param deleteProResult
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping(path = "deleteProResult")
+    @SsoAop()
+    public BaseResponse<Boolean> deleteProResult(@RequestBody @Valid DtoDeleteProResult deleteProResult, BindingResult bindingResult) {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+
+        OpeProcessingResult proResult = workOrderSv.getProResult(deleteProResult.getProResultId(), deleteProResult.getInspectorId());
+        if(proResult == null) {
+            return BaseResponseUtils.buildErrorMsg("鎮ㄨ鍒犻櫎鐨勫鐞嗙粨鏋滀笉瀛樺湪");
+        }
+
+        if(workOrderSv.deleteProResult(deleteProResult.getProResultId()) == 0) {
+            return BaseResponseUtils.buildErrorMsg("澶勭悊缁撴灉鍒犻櫎澶辫触");
+        }
+
+        return BaseResponseUtils.buildSuccess();
+    }
+
+    /**
+     * 鑾峰彇澶勭悊缁撴灉璇︽儏
+     * @param proResultId
+     * @return
+     */
+    @GetMapping(path = "/getProResult")
+    public BaseResponse<VoProcessingResult> getProResult(@RequestParam("proResultId") Long proResultId) {
+        try {
+            String  aa = JSON.toJSONString(workOrderSv.getProResultById(proResultId));
+            System.out.println(aa);
+            return BaseResponseUtils.buildSuccess(workOrderSv.getProResultById(proResultId));
+        } catch (Exception e) {
+            log.error("鑾峰彇澶勭悊缁撴灉璇︽儏寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage());
+        }
+    }
 }
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java
index 34746ef..356820b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java
@@ -6,6 +6,7 @@
 import com.dy.pipIrrGlobal.daoOp.OpeWorkOrderMapper;
 import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
 import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
+import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
 import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.PojoUtils;
@@ -53,8 +54,8 @@
      * @param workOrderId
      * @return
      */
-    public OpeWorkOrder getWorkOrder(Long dispatcherId, Long workOrderId) {
-        return opeWorkOrderMapper.getWorkOrder(dispatcherId, workOrderId);
+    public OpeWorkOrder getWorkOrder(Long workOrderId, Long dispatcherId) {
+        return opeWorkOrderMapper.getWorkOrder(workOrderId, dispatcherId);
     }
 
     /**
@@ -96,27 +97,76 @@
     }
 
     /**
-     * 鏍规嵁workOrderId鑾峰彇鏈垹闄ょ殑澶勭悊缁撴灉鏁伴噺锛屾坊鍔犵粨鏋滀笂鎶ュ墠鍒ゆ柇浣跨敤
-     * @param workOrderId
-     * @return
-     */
-    public Boolean hasValidProcessingResult(Long workOrderId) {
-        if (opeProcessingResultMapper.getValidResultCount(workOrderId) == 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
      * 涓婃姤宸ュ崟澶勭悊缁撴灉
      * @param po
      * @return
      */
-    public Long insertProcessingResult(OpeProcessingResult po) {
-        po.setReportTime(new Date());
-        po.setState((byte)1);
-        po.setDeleted(0L);
-        opeProcessingResultMapper.insert(po);
-        return po.getId();
+    public String addProcessingResult(OpeProcessingResult po) {
+        String result = "";
+        OpeProcessingResult processingResult = opeProcessingResultMapper.getByWorkOrderId(po.getWorkOrderId());
+        if(processingResult == null) {
+            // 鏃犲鐞嗙粨鏋滀笂鎶ュ鐞嗙粨鏋�
+            po.setReportTime(new Date());
+            po.setState((byte)1);
+            po.setDeleted(0L);
+            opeProcessingResultMapper.insert(po);
+            if(po.getId() == 0) {
+                result = "宸ュ崟澶勭悊缁撴灉涓婃姤澶辫触";
+                return result;
+            }
+
+            result = "success";
+            return result;
+        }
+
+        switch (processingResult.getState()) {
+            case 1:
+                result = "宸ュ崟澶勭悊缁撴灉宸蹭笂鎶ワ紝璇峰嬁閲嶅涓婃姤";
+                break;
+            case 2:
+                result = "宸ュ崟澶勭悊缁撴灉宸查�氳繃";
+                break;
+            case 3:
+                // 澶勭悊缁撴灉琚┏鍥炴椂锛屽垹闄ゅ綋鍓嶅鐞嗙粨鏋滐紝涓婃姤鏂扮殑澶勭悊缁撴灉
+                processingResult.setDeleted(System.currentTimeMillis()/1000);
+                opeProcessingResultMapper.updateByPrimaryKeySelective(processingResult);
+
+                po.setReportTime(new Date());
+                po.setState((byte)1);
+                po.setDeleted(0L);
+                opeProcessingResultMapper.insert(po);
+                result = "success";
+                break;
+        }
+
+        return result;
+    }
+
+    /**
+     * 鑾峰彇鎸囧畾宸℃鍛樼殑鎸囧畾鏈垹闄や笖鏈鎵圭殑澶勭悊缁撴灉涓婃姤锛屽垹闄ゅ鐞嗙粨鏋滃墠鍒ゆ柇浣跨敤浣跨敤
+     * @param proResultId
+     * @param inspectorId
+     * @return
+     */
+    public OpeProcessingResult getProResult(Long proResultId, Long inspectorId) {
+        return opeProcessingResultMapper.getProResult(proResultId, inspectorId);
+    }
+
+    /**
+     * 閫昏緫鍒犻櫎涓�涓湭鍒犻櫎鐨勫鐞嗙粨鏋�
+     * @param proResultId
+     * @return
+     */
+    public Integer deleteProResult(Long proResultId) {
+        return opeProcessingResultMapper.deleteProResult(proResultId);
+    }
+
+    /**
+     * 鑾峰彇澶勭悊缁撴灉璇︽儏
+     * @param proResultId
+     * @return
+     */
+    public VoProcessingResult getProResultById(Long proResultId) {
+        return opeProcessingResultMapper.getProResultById(proResultId);
     }
 }
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/dto/DtoDeleteProResult.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/dto/DtoDeleteProResult.java
new file mode 100644
index 0000000..601bc66
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/dto/DtoDeleteProResult.java
@@ -0,0 +1,28 @@
+package com.dy.pipIrrApp.workOrder.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-11-08 11:43
+ * @LastEditTime 2024-11-08 11:43
+ * @Description 鍒犻櫎澶勭悊缁撴灉浼犺緭绫�
+ */
+
+@Data
+public class DtoDeleteProResult {
+    public static final long serialVersionUID = 202411081144001L;
+
+    /**
+     * 澶勭悊缁撴灉ID
+     */
+    @NotNull(message = "澶勭悊缁撴灉涓嶈兘涓虹┖")
+    private Long proResultId;
+
+    /**
+     * 宸℃鍛業D
+     */
+    @NotNull(message = "宸℃鍛樹笉鑳戒负绌�")
+    private Long inspectorId;
+}

--
Gitblit v1.8.0