From bc91619c854cc2dbb01b20d0c47d76c4881e9ee8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java | 122 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 117 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java
index 728cb97..c1e0872 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.model.dto.ComplaintCompletionDTO;
import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO;
import com.panzhihua.sangeshenbian.model.dto.*;
@@ -9,12 +10,16 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.sangeshenbian.model.entity.ComplaintAuditRecord;
import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
+import com.panzhihua.sangeshenbian.model.query.AnalyticStatisticsQuery;
+import com.panzhihua.sangeshenbian.model.query.AppStaticsQuery;
import com.panzhihua.sangeshenbian.model.query.BasePage;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
-import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO;
-import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
-import com.panzhihua.sangeshenbian.model.vo.DispatchVO;
+import com.panzhihua.sangeshenbian.model.vo.*;
+import com.panzhihua.sangeshenbian.warpper.MgtComplaintQuery;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.List;
/**
@@ -26,7 +31,7 @@
* @since 2025-02-22
*/
public interface IComplaintService extends IService<Complaint> {
- void saveComplaint(Complaint complaint,Long userId);
+ void saveComplaint(Complaint complaint,LoginUserInfoVO loginUserInfoVO);
/**
* 诉求列表
@@ -42,7 +47,7 @@
* @param id
* @return
*/
- ComplaintVO detail(Long id);
+ ComplaintVO detail(Long id, LoginUserInfoVO loginUserInfoVO);
/**
* 保存办理进度
*
@@ -65,10 +70,22 @@
* @return
*/
List<ComplaintProgress> progress(Long complaintId);
+
+ void saveAndReport(ComplaintVO complaintVO, LoginUserInfoVO loginUserInfo);
+
/**
* 诉求上报
*/
void saveReport(ComplaintReportDTO dto, LoginUserInfoVO loginUserInfoVO);
+
+ void saveAndComplete(@Valid ComplaintSaveAndCompleteDTO complaintVO, LoginUserInfoVO loginUserInfo);
+
+ /**
+ * 诉求上报撤回
+ */
+ void reportWithdraw(ComplaintReportWithdrawDTO dto, LoginUserInfoVO loginUserInfoVO);
+
+
/**
* 诉求下派
@@ -108,4 +125,99 @@
* @return
*/
ComplaintAuditRecord delayDetail(Long complaintId);
+
+ /**
+ * 管理后台-诉求列表
+ *
+ * @param query
+ * @param loginUserInfo
+ * @return
+ */
+ Page<ComplaintVO> pageList(MgtComplaintQuery query, SystemUserVo loginUserInfo);
+
+ /**
+ * 管理后台-诉求详情
+ * @param id
+ * @return
+ */
+ ComplaintVO getDetailMgt(Long id);
+
+ /**
+ * 诉求列表导出
+ * @param query
+ * @param loginUserInfo
+ */
+ void export(MgtComplaintQuery query, SystemUserVo loginUserInfo) throws IOException;
+
+ /**
+ * 社区问题单、问题处理单、协调通知单 下载
+ *
+ * @param id
+ * @param loginUserInfo
+ */
+ String downloadFile(Long id, Integer type, SystemUserVo loginUserInfo) throws IOException;
+
+ /**
+ * 获取超时未评价的数据
+ * @return
+ */
+ List<Complaint> getTimeoutAndNotComment();
+
+
+ /**
+ * 修改办理进度
+ * @param dto
+ */
+ void updateProgress(ComplaintProcessUpdateDto dto);
+
+
+ /**
+ * 删除办理进度
+ * @param id
+ */
+ void delProgress(Long id);
+
+ /**
+ * 数据统计第一部分
+ * @param query
+ * @return
+ */
+ AnalyticStatisticsOneVo analyticStatisticsOne(AnalyticStatisticsQuery query,List<Complaint> complaints, SimpleDateFormat simpleDateFormat);
+
+
+ /**
+ * 数据统计第二部分
+ *
+ * @param time
+ * @param complaints
+ * @param simpleDateFormat
+ * @return
+ */
+ List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(String time, List<Complaint> complaints, SimpleDateFormat simpleDateFormat);
+
+
+ /**
+ * +
+ * 数据统计第三部分
+ *
+ * @param rank
+ * @param complaints
+ * @return
+ */
+ List<AnalyticStatisticsThreeVo> analyticStatisticsThree(Integer rank, List<Complaint> complaints);
+
+ /**
+ * 数据统计第四部分
+ * @param complaints
+ * @return
+ */
+ AnalyticStatisticsFourVo analyticStatisticsFour(List<Complaint> complaints);
+
+ /**
+ * 查询党员或上级对应的诉求列表
+ * @param query
+ * @param loginUserInfo
+ * @return
+ */
+ List<Complaint> queryCompliantList(AppStaticsQuery query, LoginUserInfoVO loginUserInfo);
}
--
Gitblit v1.7.1