From 107ef10e9309dd299e8983232dbec5beacecb06d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 28 十一月 2024 15:14:19 +0800
Subject: [PATCH] 获取任务类型列表接口，获取工单列表接口返回值增加处理结果ID字段
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java | 4 +-
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java | 13 ++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoTaskType.java | 31 +++++++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml | 3 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeTaskTypeMapper.java | 11 +++++
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 16 ++++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTaskTypeMapper.xml | 9 ++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoWorkOrder.java | 8 +++
8 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeTaskTypeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeTaskTypeMapper.java
index dde3037..38dd74b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeTaskTypeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeTaskTypeMapper.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeTaskType;
+import com.dy.pipIrrGlobal.voOp.VoTaskType;
import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
/**
* @author ZhuBaoMin
@@ -24,4 +27,12 @@
int updateByPrimaryKeySelective(OpeTaskType record);
int updateByPrimaryKey(OpeTaskType record);
+
+ /**
+ * 鑾峰彇浠诲姟绫诲瀷鍒楄〃
+ * @return
+ */
+ List<VoTaskType> getTaskTypes();
+
+
}
\ No newline at end of file
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 3f927c2..5e4a1a5 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
@@ -23,7 +23,7 @@
public static final long serialVersionUID = 202411081500001L;
/**
- * 闂缁撴灉ID
+ * 澶勭悊缁撴灉ID
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long proResultId;
@@ -35,7 +35,7 @@
private Long workOrderId;
/**
- * 宸℃鍛業D
+ * 宸℃鍛�
*/
private String inspector;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoTaskType.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoTaskType.java
new file mode 100644
index 0000000..3d1d944
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoTaskType.java
@@ -0,0 +1,31 @@
+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.JsonPropertyOrder;
+import lombok.Data;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-11-28 14:39
+ * @LastEditTime 2024-11-28 14:39
+ * @Description 浠诲姟绫诲瀷瑙嗗浘瀵硅薄
+ */
+
+@Data
+@JsonPropertyOrder({"taskTypeId", "taskType"})
+public class VoTaskType implements BaseEntity {
+ public static final long serialVersionUID = 202411281440001L;
+
+ /**
+ * 浠诲姟绫诲瀷ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long taskTypeId;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ private String taskType;
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoWorkOrder.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoWorkOrder.java
index c0e4cd7..0acd2bf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoWorkOrder.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoWorkOrder.java
@@ -17,7 +17,7 @@
*/
@Data
-@JsonPropertyOrder({"workOrderId", "dispatcherId", "dispatcher", "inspectorId", "inspector", "taskTypeId", "taskType", "taskContent", "completeCriteria", "deadLine", "clientReportId", "inspectorReportId", "completeTime", "dispatchTime", "rejectTimes", "state", "processingState"})
+@JsonPropertyOrder({"workOrderId", "dispatcherId", "dispatcher", "inspectorId", "inspector", "taskTypeId", "taskType", "taskContent", "completeCriteria", "deadLine", "clientReportId", "inspectorReportId", "completeTime", "dispatchTime", "rejectTimes", "state", "processingState", "proResultId"})
public class VoWorkOrder implements BaseEntity {
public static final long serialVersionUID = 202411061524001L;
@@ -114,4 +114,10 @@
* 澶勭悊鐘舵��
*/
private String processingState;
+
+ /**
+ * 澶勭悊缁撴灉ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long proResultId;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTaskTypeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTaskTypeMapper.xml
index a6ed490..2103691 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTaskTypeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTaskTypeMapper.xml
@@ -77,4 +77,13 @@
deleted = #{deleted,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
+
+ <!--鑾峰彇浠诲姟绫诲瀷鍒楄〃-->
+ <select id="getTaskTypes" resultType="com.dy.pipIrrGlobal.voOp.VoTaskType">
+ SELECT
+ id AS taskTypeId,
+ task_type AS taskType
+ FROM ope_task_type
+ WHERE deleted = 0
+ </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 6601a2a..ccf7545 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -320,7 +320,8 @@
WHEN res.state = 2 THEN '宸查�氳繃'
WHEN res.state = 3 THEN '宸查┏鍥�'
ELSE '鏈笂鎶�'
- END AS processingState
+ END AS processingState,
+ res.id AS proResultId
FROM ope_work_order ord
INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id
INNER JOIN ba_user us2 ON us2.id = ord.inspector_id
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 a746c19..c3d3eba 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
@@ -15,6 +15,7 @@
import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
+import com.dy.pipIrrGlobal.voOp.VoTaskType;
import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -265,4 +266,19 @@
return BaseResponseUtils.buildSuccess(true) ;
}
+
+ /**
+ * 鑾峰彇浠诲姟绫诲瀷鍒楄〃
+ * @return
+ */
+ @GetMapping(path = "/getTaskTypes")
+ @SsoAop()
+ public BaseResponse<List<VoTaskType>> getTaskTypes() {
+ try {
+ return BaseResponseUtils.buildSuccess(workOrderSv.getTaskTypes());
+ } 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 30d7b7f..1375549 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
@@ -4,11 +4,13 @@
import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
import com.dy.pipIrrGlobal.daoOp.OpeApproveResultMapper;
import com.dy.pipIrrGlobal.daoOp.OpeProcessingResultMapper;
+import com.dy.pipIrrGlobal.daoOp.OpeTaskTypeMapper;
import com.dy.pipIrrGlobal.daoOp.OpeWorkOrderMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeApproveResult;
import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
+import com.dy.pipIrrGlobal.voOp.VoTaskType;
import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
@@ -37,6 +39,9 @@
@Autowired
private OpeApproveResultMapper opeApproveResultMapper;
+
+ @Autowired
+ private OpeTaskTypeMapper opeTaskTypeMapper;
/**
* 娣诲姞宸ュ崟璁板綍
@@ -227,4 +232,12 @@
return "success";
}
+
+ /**
+ * 鑾峰彇浠诲姟绫诲瀷鍒楄〃
+ * @return
+ */
+ public List<VoTaskType> getTaskTypes() {
+ return opeTaskTypeMapper.getTaskTypes();
+ }
}
--
Gitblit v1.8.0