From 07648f0083e80cc590ba8bc77a9e72be5ad66748 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:45 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java | 18 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport_temp.java | 81 +++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java | 27 +++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java | 81 +++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java | 15 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java | 1
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java | 29 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeIssueReportMapper.java | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult_temp.java | 94 +++++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java | 13 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java | 13 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java | 4
18 files changed, 356 insertions(+), 42 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java
index 2e59e7e..e4993c4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
-import com.dy.pipIrrGlobal.voOp.VoIssueReport;
+import com.dy.pipIrrGlobal.voOp.VoIssueReport_temp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -42,7 +42,7 @@
* @param params
* @return
*/
- List<VoIssueReport> getIssueReports(Map<?, ?> params);
+ List<VoIssueReport_temp> getIssueReports(Map<?, ?> params);
/**
* 鏍规嵁涓婃姤ID鍙婂贰妫�鍛業D鑾峰彇鏈垹闄ょ殑涓婃姤锛屽垹闄や笂鎶ュ垽鏂娇鐢�
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 c3ab70b..98bb782 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,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
-import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
+import com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -54,5 +54,5 @@
* @param proResultId
* @return
*/
- VoProcessingResult getProResultById(Long proResultId);
+ VoProcessingResult_temp getProResultById(Long proResultId);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeIssueReportMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeIssueReportMapper.java
index 14a4c51..c2d8d64 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeIssueReportMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeIssueReportMapper.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSe.SeIssueReport;
-import com.dy.pipIrrGlobal.voSe.VoIssueReport;
+import com.dy.pipIrrGlobal.voSe.VoIssueReport_temp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -42,7 +42,7 @@
* @param params
* @return
*/
- List<VoIssueReport> getIssueReports(Map<?, ?> params);
+ List<VoIssueReport_temp> getIssueReports(Map<?, ?> params);
/**
* 鏍规嵁涓婃姤ID鍙婂啘鎴稩D鑾峰彇鏈垹闄ょ殑涓婃姤锛屽垹闄や笂鎶ュ垽鏂娇鐢�
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 d4ccf4b..045c305 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
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.voOp;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
@@ -11,15 +12,15 @@
/**
* @author ZhuBaoMin
- * @date 2024-11-12 14:46
- * @LastEditTime 2024-11-12 14:46
+ * @date 2024-12-03 15:02
+ * @LastEditTime 2024-12-03 15:02
* @Description 宸℃鍛橀棶棰樹笂鎶ヨ鍥惧璞�
*/
@Data
@JsonPropertyOrder({"issueReportId", "inspectorName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"})
public class VoIssueReport implements BaseEntity {
- private static final long serialVersionUID = 202411121448001L;
+ private static final long serialVersionUID = 202412031504001L;
/**
* 宸℃鍛橀棶棰樹笂鎶D
@@ -51,17 +52,17 @@
/**
* 鐓х墖鍒楄〃
*/
- private String images;
+ private JSONArray images;
/**
* 闊抽鍒楄〃
*/
- private String audios;
+ private JSONArray audios;
/**
* 瑙嗛鍒楄〃
*/
- private String videos;
+ private JSONArray videos;
/**
* 涓婃姤鍥炲鏃堕棿
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
new file mode 100644
index 0000000..49d0d97
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java
@@ -0,0 +1,81 @@
+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.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-11-12 14:46
+ * @LastEditTime 2024-11-12 14:46
+ * @Description 宸℃鍛橀棶棰樹笂鎶ヤ复鏃惰鍥惧璞�
+ */
+
+@Data
+@JsonPropertyOrder({"issueReportId", "inspectorName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"})
+public class VoIssueReport_temp implements BaseEntity {
+ private static final long serialVersionUID = 202411121448001L;
+
+ /**
+ * 宸℃鍛橀棶棰樹笂鎶D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long issueReportId;
+
+ /**
+ * 宸℃鍛樺鍚�
+ */
+ private String inspectorName;
+
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ private String phone;
+
+ /**
+ * 涓婃姤鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date reportTime;
+
+ /**
+ * 涓婃姤鍐呭
+ */
+ private String content;
+
+ /**
+ * 鐓х墖鍒楄〃
+ */
+ private String images;
+
+ /**
+ * 闊抽鍒楄〃
+ */
+ private String audios;
+
+ /**
+ * 瑙嗛鍒楄〃
+ */
+ private String videos;
+
+ /**
+ * 涓婃姤鍥炲鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date replyTime;
+
+ /**
+ * 鐘舵�佸��
+ */
+ private Integer stateId;
+
+ /**
+ * 鐘舵�佹弿杩�
+ */
+ private String state;
+}
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
index 5e4a1a5..0f32185 100644
--- 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
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.voOp;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
@@ -12,15 +13,15 @@
/**
* @author ZhuBaoMin
- * @date 2024-11-08 14:59
- * @LastEditTime 2024-11-08 14:59
- * @Description
+ * @date 2024-12-03 10:56
+ * @LastEditTime 2024-12-03 10:56
+ * @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;
+ public static final long serialVersionUID = 202412031505001L;
/**
* 澶勭悊缁撴灉ID
@@ -47,17 +48,17 @@
/**
* 鐓х墖鍒楄〃
*/
- private String images;
+ private JSONArray images;
/**
* 闊抽鍒楄〃
*/
- private String audios;
+ private JSONArray audios;
/**
* 瑙嗛鍒楄〃
*/
- private String videos;
+ private JSONArray videos;
/**
* 缁忓害
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult_temp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult_temp.java
new file mode 100644
index 0000000..88852aa
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult_temp.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_temp implements BaseEntity {
+ public static final long serialVersionUID = 202411081500001L;
+
+ /**
+ * 澶勭悊缁撴灉ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long proResultId;
+
+ /**
+ * 宸ュ崟ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long workOrderId;
+
+ /**
+ * 宸℃鍛�
+ */
+ 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/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java
index 4f5b493..0a7081c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.voSe;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
@@ -11,15 +12,15 @@
/**
* @author ZhuBaoMin
- * @date 2024-10-30 13:51
- * @LastEditTime 2024-10-30 13:51
+ * @date 2024-12-03 15:56
+ * @LastEditTime 2024-12-03 15:56
* @Description 鍐滄埛闂涓婃姤瑙嗗浘瀵硅薄
*/
@Data
@JsonPropertyOrder({"issueReportId", "clientName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"})
public class VoIssueReport implements BaseEntity {
- private static final long serialVersionUID = 202410301354001L;
+ private static final long serialVersionUID = 202412031557001L;
/**
* 鍐滄埛闂涓婃姤ID
@@ -51,17 +52,17 @@
/**
* 鐓х墖鍒楄〃
*/
- private String images;
+ private JSONArray images;
/**
* 闊抽鍒楄〃
*/
- private String audios;
+ private JSONArray audios;
/**
* 瑙嗛鍒楄〃
*/
- private String videos;
+ private JSONArray videos;
/**
* 涓婃姤鍥炲鏃堕棿
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport_temp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport_temp.java
new file mode 100644
index 0000000..4a85a93
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport_temp.java
@@ -0,0 +1,81 @@
+package com.dy.pipIrrGlobal.voSe;
+
+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.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-10-30 13:51
+ * @LastEditTime 2024-10-30 13:51
+ * @Description 鍐滄埛闂涓婃姤涓存椂瑙嗗浘瀵硅薄
+ */
+
+@Data
+@JsonPropertyOrder({"issueReportId", "clientName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"})
+public class VoIssueReport_temp implements BaseEntity {
+ private static final long serialVersionUID = 202410301354001L;
+
+ /**
+ * 鍐滄埛闂涓婃姤ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long issueReportId;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
+ private String clientName;
+
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ private String phone;
+
+ /**
+ * 涓婃姤鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date reportTime;
+
+ /**
+ * 涓婃姤鍐呭
+ */
+ private String content;
+
+ /**
+ * 鐓х墖鍒楄〃
+ */
+ private String images;
+
+ /**
+ * 闊抽鍒楄〃
+ */
+ private String audios;
+
+ /**
+ * 瑙嗛鍒楄〃
+ */
+ private String videos;
+
+ /**
+ * 涓婃姤鍥炲鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date replyTime;
+
+ /**
+ * 鐘舵�佸��
+ */
+ private Integer stateId;
+
+ /**
+ * 鐘舵�佹弿杩�
+ */
+ private String state;
+}
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 47379c7..8ae72d4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
@@ -203,7 +203,7 @@
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇宸℃鍛橀棶棰樹笂鎶�-->
- <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReport">
+ <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReport_temp">
SELECT
rpt.id AS issueReportId,
us.name AS inspectorName,
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 4315729..f6e39d6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
@@ -212,7 +212,7 @@
</update>
<!--鏍规嵁涓婚敭鑾峰彇澶勭悊缁撴灉瑙嗗浘瀵硅薄-->
- <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult">
+ <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp">
SELECT
res.id AS proResultId,
res.work_order_id AS workOrderId,
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml
index 31bcb79..79c4fe8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml
@@ -202,7 +202,7 @@
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛闂涓婃姤-->
- <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voSe.VoIssueReport" >
+ <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voSe.VoIssueReport_temp" >
SELECT
rpt.id AS issueReportId,
cli.name AS clientName,
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
index 00a4d0d..b5e7f37 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
@@ -7,7 +7,6 @@
import com.dy.pipIrrGlobal.pojoOp.OpeInspect;
import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
import com.dy.pipIrrGlobal.voOp.VoInspect;
-import com.dy.pipIrrGlobal.voOp.VoIssueReport;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
index 6f67db7..2fdd3c8 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
@@ -66,8 +66,8 @@
@SsoAop()
public BaseResponse<QueryResultVo<List<VoIssueReport>>> getIssueReports(QoIssueReport vo) {
try {
- QueryResultVo<List<VoIssueReport>> res = issueSv.getIssueReports(vo);
- return BaseResponseUtils.buildSuccess(res);
+ //QueryResultVo<List<VoIssueReport_temp>> res = issueSv.getIssueReports(vo);
+ return BaseResponseUtils.buildSuccess(issueSv.getIssueReports(vo));
} 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/issue/IssueSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java
index 5787d84..229b9a1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java
@@ -1,5 +1,7 @@
package com.dy.pipIrrApp.issue;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
@@ -11,14 +13,14 @@
import com.dy.pipIrrGlobal.pojoOp.OpeReportReply;
import com.dy.pipIrrGlobal.voOp.VoIssueReport;
import com.dy.pipIrrGlobal.voOp.VoIssueReportReply;
+import com.dy.pipIrrGlobal.voOp.VoIssueReport_temp;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -74,13 +76,32 @@
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
Long itemTotal = opeIssueReportMapper.getIssueReportsCount(params);
+ //QueryResultVo<List<VoIssueReport_temp>> rsVo = new QueryResultVo<>();
QueryResultVo<List<VoIssueReport>> rsVo = new QueryResultVo<>();
rsVo.pageSize = queryVo.pageSize;
rsVo.pageCurr = queryVo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = opeIssueReportMapper.getIssueReports(params);
+
+ List<VoIssueReport_temp> list_temp = opeIssueReportMapper.getIssueReports(params);
+ List<VoIssueReport> list = new ArrayList<>();
+ for (int i = 0; i < list_temp.size(); i++) {
+ VoIssueReport_temp report_temp = list_temp.get(i);
+ VoIssueReport report = new VoIssueReport();
+ BeanUtils.copyProperties(report_temp, report);
+
+ JSONArray images_array = Optional.ofNullable(JSON.parseArray(report_temp.getImages())).orElse(new JSONArray());
+ JSONArray audios_array = Optional.ofNullable(JSON.parseArray(report_temp.getAudios())).orElse(new JSONArray());
+ JSONArray videos_array = Optional.ofNullable(JSON.parseArray(report_temp.getVideos())).orElse(new JSONArray());
+ report.setImages(images_array);
+ report.setAudios(audios_array);
+ report.setVideos(videos_array);
+ list.add(report);
+ }
+
+ rsVo.obj = list;
+ //rsVo.obj = opeIssueReportMapper.getIssueReports(params);
return rsVo;
}
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 b09f6c8..3b1c0c4 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
@@ -1,5 +1,7 @@
package com.dy.pipIrrApp.workOrder;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
@@ -12,16 +14,19 @@
import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
import com.dy.pipIrrGlobal.voBa.VoRoleSimple;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
+import com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp;
import com.dy.pipIrrGlobal.voOp.VoTaskType;
import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
/**
* @author ZhuBaoMin
@@ -182,7 +187,18 @@
* @return
*/
public VoProcessingResult getProResultById(Long proResultId) {
- return opeProcessingResultMapper.getProResultById(proResultId);
+ VoProcessingResult_temp result_temp = opeProcessingResultMapper.getProResultById(proResultId);
+ VoProcessingResult result = new VoProcessingResult();
+ BeanUtils.copyProperties(result_temp, result);
+
+ JSONArray images_array = Optional.ofNullable(JSON.parseArray(result_temp.getImages())).orElse(new JSONArray());
+ JSONArray audios_array = Optional.ofNullable(JSON.parseArray(result_temp.getAudios())).orElse(new JSONArray());
+ JSONArray videos_array = Optional.ofNullable(JSON.parseArray(result_temp.getVideos())).orElse(new JSONArray());
+ result.setImages(images_array);
+ result.setAudios(audios_array);
+ result.setVideos(videos_array);
+
+ return result;
}
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java
index b11901e..317d3c1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java
@@ -65,8 +65,8 @@
@GetMapping(path = "/getIssueReports")
public BaseResponse<QueryResultVo<List<VoIssueReport>>> getIssueReports(QoIssueReport vo) {
try {
- QueryResultVo<List<VoIssueReport>> res = issueSv.getIssueReports(vo);
- return BaseResponseUtils.buildSuccess(res);
+ //QueryResultVo<List<VoIssueReport_temp>> res = issueSv.getIssueReports(vo);
+ return BaseResponseUtils.buildSuccess(issueSv.getIssueReports(vo));
} catch (Exception e) {
log.error("鑾峰彇鍐滄埛闂涓婃姤璁板綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
index 2b6e52c..3354a6f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
@@ -1,5 +1,7 @@
package com.dy.pipIrrWechat.issue;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSe.SeIssueReportMapper;
import com.dy.pipIrrGlobal.daoSe.SeReportReplyMapper;
@@ -7,15 +9,15 @@
import com.dy.pipIrrGlobal.pojoSe.SeReportReply;
import com.dy.pipIrrGlobal.voSe.VoIssueReport;
import com.dy.pipIrrGlobal.voSe.VoIssueReportReply;
+import com.dy.pipIrrGlobal.voSe.VoIssueReport_temp;
import com.dy.pipIrrWechat.issue.qo.QoIssueReport;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -86,7 +88,24 @@
rsVo.pageCurr = queryVo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = seIssueReportMapper.getIssueReports(params);
+
+ List<VoIssueReport_temp> list_temp = seIssueReportMapper.getIssueReports(params);
+ List<VoIssueReport> list = new ArrayList<>();
+ for (int i = 0; i < list_temp.size(); i++) {
+ VoIssueReport_temp report_temp = list_temp.get(i);
+ VoIssueReport report = new VoIssueReport();
+ BeanUtils.copyProperties(report_temp, report);
+
+ JSONArray images_array = Optional.ofNullable(JSON.parseArray(report_temp.getImages())).orElse(new JSONArray());
+ JSONArray audios_array = Optional.ofNullable(JSON.parseArray(report_temp.getAudios())).orElse(new JSONArray());
+ JSONArray videos_array = Optional.ofNullable(JSON.parseArray(report_temp.getVideos())).orElse(new JSONArray());
+ report.setImages(images_array);
+ report.setAudios(audios_array);
+ report.setVideos(videos_array);
+ list.add(report);
+ }
+
+ rsVo.obj = list;
return rsVo;
}
--
Gitblit v1.8.0