From decd787ae356353e5927889284e1734705e8c6ad Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 十二月 2024 11:50:46 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java              |    4 ++++
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml                 |    2 +-
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml                        |   14 +++++++-------
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java          |   11 +++++++++++
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/ResultCodeMsg.java                  |    2 ++
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java |    6 +++++-
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java               |   11 +++++++++++
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml                      |    2 ++
 8 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java
index 95bcee8..91de585 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java
@@ -52,6 +52,10 @@
         return buildResult(ResultCodeMsg.RsCode.ERROR_CODE,ResultCodeMsg.RsMsg.ERROR_MESSAGE, obj);
     }
 
+    public static BaseResponse buildNonExist(){
+        return buildResult(ResultCodeMsg.RsCode.NON_EXISTENT_CODE, ResultCodeMsg.RsMsg.NON_EXISTENT_MESSAGE, null);
+    }
+
     public static BaseResponse buildResult(String code, String msg, Object data){
         return BaseResponse.builder()
                 .code((code == null || "".equals(code)) ? ResultCodeMsg.RsCode.SUCCESS_CODE : code)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/ResultCodeMsg.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/ResultCodeMsg.java
index 3f794b6..68a4e30 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/ResultCodeMsg.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/ResultCodeMsg.java
@@ -9,6 +9,7 @@
         public static final String FAIL_CODE = "1002";
         public static final String ERROR_CODE = "1003";
         public static final String EXCEPTION_CODE = "1004";
+        public static final String NON_EXISTENT_CODE = "1001";
     }
     public final class RsMsg{
         public static final String TOLOGIN_MESSAGE = "璇风櫥褰�";
@@ -18,5 +19,6 @@
         public static final String ERROR_MESSAGE = "璇锋眰鍑洪敊";
         public static final String EXCEPTION_MESSAGE = "璇锋眰寮傚父";
         public static final String ERROR_PARAM = "璇锋眰鍙傛暟鏈夎";
+        public static final String NON_EXISTENT_MESSAGE = "鏁版嵁涓嶅瓨鍦�";
     }
 }
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java
index 045c305..f63a003 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java
@@ -71,6 +71,17 @@
     private Date replyTime;
 
     /**
+     * 鍥炲鍐呭
+     */
+    private String replyContent;
+
+    /**
+     * 鍥炲浜篒D
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long replyPersonId;
+
+    /**
      * 鐘舵�佸��
      */
     private Integer stateId;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java
index 49d0d97..4491c77 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java
@@ -70,6 +70,17 @@
     private Date replyTime;
 
     /**
+     * 鍥炲鍐呭
+     */
+    private String replyContent;
+
+    /**
+     * 鍥炲浜篒D
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long replyPersonId;
+
+    /**
      * 鐘舵�佸��
      */
     private Integer stateId;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
index 8ae72d4..339bf9d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
@@ -214,6 +214,8 @@
         rpt.audios,
         rpt.videos,
         rpy.reply_time AS replyTime,
+        rpy.reply_content AS replyContent,
+        rpy.replier_id AS replyPersonId,
         rpt.state AS stateId,
         CASE
             WHEN rpt.state = 1 THEN '鏈彈鐞�'
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 f6e39d6..3e7ca07 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
@@ -227,7 +227,7 @@
         res.report_time AS reportTime,
         res.state,
         CASE
-            WHEN res.state = 1 THEN '宸蹭笂鎶�'
+            WHEN res.state = 1 THEN '寰呭鏍�'
             WHEN res.state = 2 THEN '宸查�氳繃'
             WHEN res.state = 3 THEN '宸查┏鍥�'
         END AS stateName
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 7201f42..2c29293 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -225,13 +225,13 @@
         ord.dispatch_time AS dispatchTime,
         ord.reject_times AS rejectTimes,
         res.id AS proResultId,
-        res.state AS proResultStateId,
+        IFNULL(res.state,0) AS proResultStateId,
         CASE
             WHEN ord.state = 1 THEN '鏈畬鎴�'
             WHEN ord.state = 2 THEN '宸插畬鎴�'
         END AS state,
         CASE
-            WHEN res.state = 0 THEN	'鏈笂鎶�'
+            WHEN IFNULL(res.state,0) = 0 THEN	'鏈笂鎶�'
             WHEN res.state = 1 THEN	'寰呭鏍�'
             WHEN res.state = 2 THEN	'宸查�氳繃'
             WHEN res.state = 3 THEN	'琚┏鍥�'
@@ -241,7 +241,7 @@
         INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id
         INNER JOIN ba_user us2 ON us2.id = ord.inspector_id
         INNER JOIN ope_task_type typ ON typ.id = ord.task_type_id
-        LEFT JOIN ope_processing_result res ON res.work_order_id = ord.id
+        LEFT JOIN (SELECT * FROM `ope_processing_result` WHERE deleted = 0) res ON res.work_order_id = ord.id
     WHERE ord.deleted = 0 AND ord.id = #{workOrderId}
   </select>
 
@@ -268,7 +268,7 @@
     INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id
     INNER JOIN ba_user us2 ON us2.id = ord.inspector_id
     INNER JOIN ope_task_type typ ON typ.id = ord.task_type_id
-    LEFT JOIN ope_processing_result res ON res.work_order_id = ord.id
+    LEFT JOIN (SELECT * FROM `ope_processing_result` WHERE deleted = 0) res ON res.work_order_id = ord.id
     <where>
       AND ord.deleted = 0
 
@@ -314,13 +314,13 @@
         ord.complete_time AS completeTime,
         ord.dispatch_time AS dispatchTime,
         ord.reject_times AS rejectTimes,
-        res.state AS proResultStateId,
+        IFNULL(res.state,0) AS proResultStateId,
         CASE
             WHEN ord.state = 1 THEN '鏈畬鎴�'
             WHEN ord.state = 2 THEN '宸插畬鎴�'
         END AS state,
         CASE
-            WHEN res.state = 0 THEN	'鏈笂鎶�'
+            WHEN IFNULL(res.state,0) = 0 THEN	'鏈笂鎶�'
             WHEN res.state = 1 THEN	'寰呭鏍�'
             WHEN res.state = 2 THEN	'宸查�氳繃'
             WHEN res.state = 3 THEN	'琚┏鍥�'
@@ -331,7 +331,7 @@
         INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id
         INNER JOIN ba_user us2 ON us2.id = ord.inspector_id
         INNER JOIN ope_task_type typ ON typ.id = ord.task_type_id
-        LEFT JOIN ope_processing_result res ON res.work_order_id = ord.id
+        LEFT JOIN (SELECT * FROM `ope_processing_result` WHERE deleted = 0) res ON res.work_order_id = ord.id
     <where>
       AND ord.deleted = 0
 
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 a7ae909..dae2151 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
@@ -170,7 +170,11 @@
     @SsoAop()
     public BaseResponse<VoWorkOrder> getOneWorkOrder(@RequestParam("workOrderId") Long workOrderId) {
         try {
-            return BaseResponseUtils.buildSuccess(workOrderSv.getWorkOrderById(workOrderId));
+            VoWorkOrder workOrder = workOrderSv.getWorkOrderById(workOrderId);
+            if(workOrder == null) {
+                return BaseResponseUtils.buildNonExist();
+            }
+            return BaseResponseUtils.buildSuccess(workOrder);
         } catch (Exception e) {
             log.error("鑾峰彇宸ュ崟璇︽儏寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage());

--
Gitblit v1.8.0