From c0416f1a5154926e74e472aad2dc027eca5f94cb Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 26 十一月 2024 17:04:40 +0800
Subject: [PATCH] 重构获取工单列表接口，查询条件中增加派单人ID和巡检员ID
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 110 insertions(+), 5 deletions(-)
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 36f7867..5787d84 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,12 +1,24 @@
package com.dy.pipIrrApp.issue;
+import com.alibaba.fastjson2.JSONObject;
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrApp.issue.dto.DtoDeleteParam;
+import com.dy.pipIrrApp.issue.qo.QoIssueReport;
import com.dy.pipIrrGlobal.daoOp.OpeIssueReportMapper;
+import com.dy.pipIrrGlobal.daoOp.OpeReportReplyMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
+import com.dy.pipIrrGlobal.pojoOp.OpeReportReply;
+import com.dy.pipIrrGlobal.voOp.VoIssueReport;
+import com.dy.pipIrrGlobal.voOp.VoIssueReportReply;
import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* @author ZhuBaoMin
@@ -20,6 +32,9 @@
public class IssueSv {
@Autowired
private OpeIssueReportMapper opeIssueReportMapper;
+
+ @Autowired
+ private OpeReportReplyMapper opeReportReplyMapper;
/**
* 娣诲姞宸℃鍛橀棶棰樹笂鎶�
@@ -39,13 +54,103 @@
}
/**
- * 娣诲姞宸℃鍛橀棶棰樹笂鎶ヤ俊鎭�
+ * 鏍规嵁鏉′欢鑾峰彇宸℃鍛橀棶棰樹笂鎶ヨ褰�
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoIssueReport>> getIssueReports(QoIssueReport queryVo) {
+ //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
+ String timeStart = queryVo.getTimeStart();
+ String timeStop = queryVo.getTimeStop();
+ if (timeStart != null) {
+ timeStart = timeStart + " 00:00:00";
+ queryVo.setTimeStart(timeStart);
+ }
+ if (timeStop != null) {
+ timeStop = timeStop + " 23:59:59";
+ queryVo.setTimeStop(timeStop);
+ }
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = opeIssueReportMapper.getIssueReportsCount(params);
+ QueryResultVo<List<VoIssueReport>> rsVo = new QueryResultVo<>();
+
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = opeIssueReportMapper.getIssueReports(params);
+ return rsVo;
+ }
+
+ /**
+ * 閫昏緫鍒犻櫎宸℃鍛橀棶棰樹笂鎶ワ紝鍒犻櫎鍓嶅厛鍒ゆ柇瑕佸垹闄ょ殑涓婃姤鏄惁瀛樺湪
* @param po
* @return
*/
- //public Long insertIssueReport(OpeIssueReport po) {
- // opeIssueReportMapper.insert(po);
- // return po.getId();
- //}
+ public String deleteIssueReport(DtoDeleteParam po) {
+ // 鏍规嵁涓婃姤ID鍙婂贰妫�鍛業D鑾峰彇鏈垹闄ょ殑涓婃姤锛屽垹闄や笂鎶ュ垽鏂娇鐢�
+ OpeIssueReport opeIssueReport = opeIssueReportMapper.getReport(po.getIssueReportId(), po.getInspectorId());
+ if(opeIssueReport == null) {
+ return "鎮ㄨ鍒犻櫎鐨勯棶棰樹笂鎶ヤ笉瀛樺湪";
+ }
+
+ if(opeIssueReportMapper.deleteIssueReport(po.getIssueReportId()) == 0) {
+ return "宸℃鍛橀棶棰樹笂鎶ュ垹闄ゅけ璐�";
+ }
+
+ return "success";
+ }
+
+ /**
+ * 娣诲姞宸℃鍛橀棶棰樹笂鎶ュ洖澶�
+ * 娣诲姞闂涓婃姤鍥炲璁板綍
+ * 闂涓婃姤鐘舵�佹敼涓哄凡鍥炲
+ * @param po
+ * @return
+ */
+ public String replyReport(OpeReportReply po) {
+ po.setReplyTime(new Date());
+ opeReportReplyMapper.insert(po);
+ if(po.getId() == 0) {
+ return "鍥炲璁板綍娣诲姞澶辫触";
+ }
+
+ OpeIssueReport issueReport = new OpeIssueReport();
+ issueReport.setId(po.getReportId());
+ issueReport.setState((byte)2);
+ Integer rec = opeIssueReportMapper.updateByPrimaryKeySelective(issueReport);
+ if(rec == 0) {
+ return "宸℃鍛橀棶棰樹笂鎶ョ姸鎬佷慨鏀瑰け璐�";
+ }
+ return "sucess";
+ }
+
+ /**
+ * 鑾峰彇涓婃姤鍥炲淇℃伅
+ * @param reportId
+ * @return
+ */
+ public JSONObject getReportReply(Long reportId) {
+ JSONObject result = new JSONObject();
+ if(reportId == null) {
+ result.put("code", ResultCodeMsg.RsCode.ERROR_CODE);
+ result.put("msg","璇烽�夋嫨涓�涓棶棰樹笂鎶�");
+ return result;
+ }
+
+ VoIssueReportReply issueReportReply = opeReportReplyMapper.getReportReplyByReportId(reportId);
+ if(issueReportReply != null) {
+ result.put("code", ResultCodeMsg.RsCode.SUCCESS_CODE);
+ result.put("msg","success");
+ result.put("data", issueReportReply);
+ return result;
+ }
+ result.put("code", ResultCodeMsg.RsCode.ERROR_CODE);
+ result.put("msg","鏈幏鍙栧埌涓婃姤鍥炲淇℃伅");
+ return result;
+
+ }
}
--
Gitblit v1.8.0