From d1fcb44a9b81d0880b414e9125cb60897cf0b6a8 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 21 Sep 2024 13:19:14 +0800
Subject: [PATCH] 1、受理操作报错修复 整改： 2、工作台-待/已分派列表 3、工作台-待/已签收列表 4、工作台-待/已/不予受理列表
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java | 2
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListSLDTO.java | 78 +++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 92 ++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeChatDTO.java | 4
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListQSDTO.java | 78 +++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 90 ++
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseProcessBaseConstsEnum.java | 5
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java | 4
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseDismissService.java | 151 ++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/bo/CaseDismissBO.java | 17
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java | 6
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseStatusBaseConstsEnum.java | 5
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java | 21
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java | 10
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml | 231 +++++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseDismiss.java | 108 ++++
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java | 5
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 198 ++++---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseDismissMapper.java | 79 +++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListFPDTO.java | 84 +++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java | 205 ++++++++
21 files changed, 1,299 insertions(+), 174 deletions(-)
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java
index 59f3087..4790bd8 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConsts.java
@@ -15,16 +15,6 @@
*/
public static final int INPUT_WAY_1 = 1;
public static final int INPUT_WAY_2 = 2;
-
- /**
- * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
- */
- public static final int CASE_STATUS_1 = 1;
- public static final int CASE_STATUS_2 = 2;
- public static final int CASE_STATUS_3 = 3;
- public static final int CASE_STATUS_4 = 4;
- public static final int CASE_STATUS_5 = 5;
- public static final int CASE_STATUS_6 = 6;
}
/**
* -------------------_ooOoo_-------------------
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java
index 3f6fcc1..0fca60d 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java
@@ -11,11 +11,12 @@
public enum CaseInfoProcessBaseConstsEnum {
/**
- * 对外展示事项进度，1：待受理，2：办理中，3：已结案
+ * 对外展示事项进度，1：待受理，2：办理中，3：已结案，4：不予受理，4：不予受理
*/
CASE_INFO_PROCESS_1(1, "待受理"),
CASE_INFO_PROCESS_2(2, "办理中"),
- CASE_INFO_PROCESS_3(3, "已结案");
+ CASE_INFO_PROCESS_3(3, "已结案"),
+ CASE_INFO_PROCESS_4(3, "不予受理");
/**
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseProcessBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseProcessBaseConstsEnum.java
index 61ce4ff..8c003cf 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseProcessBaseConstsEnum.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseProcessBaseConstsEnum.java
@@ -11,14 +11,15 @@
public enum CaseProcessBaseConstsEnum {
/**
- * 事项进度，1：来访登记，2：事件流转，3：办理反馈，4：结案审核，5：当事人评价，6：结案归档
+ * 事项进度，1：来访登记，2：事件流转，3：办理反馈，4：结案审核，5：当事人评价，6：结案归档，7：不予受理
*/
CASE_PROCESS_1(1, "来访登记"),
CASE_PROCESS_2(2, "事件流转"),
CASE_PROCESS_3(3, "办理反馈"),
CASE_PROCESS_4(4, "结案审核"),
CASE_PROCESS_5(5, "当事人评价"),
- CASE_PROCESS_6(6, "结案归档");
+ CASE_PROCESS_6(6, "结案归档"),
+ CASE_PROCESS_7(6, "不予受理");
/**
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseStatusBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseStatusBaseConstsEnum.java
index 296c388..6155df3 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseStatusBaseConstsEnum.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseStatusBaseConstsEnum.java
@@ -11,7 +11,7 @@
public enum CaseStatusBaseConstsEnum {
/**
- * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
+ * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档，8：不予受理
*/
CASE_STATUS_1(1, "待分派"),
CASE_STATUS_2(2, "待签收"),
@@ -19,7 +19,8 @@
CASE_STATUS_4(4, "办理中"),
CASE_STATUS_5(5, "结案审核"),
CASE_STATUS_6(6, "待评价"),
- CASE_STATUS_7(7, "已归档");
+ CASE_STATUS_7(7, "已归档"),
+ CASE_STATUS_8(8, "不予受理");
/**
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java
new file mode 100644
index 0000000..18653a7
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java
@@ -0,0 +1,205 @@
+package cn.huge.module.cases.controller.web;
+
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.cases.domain.po.CaseDismiss;
+import cn.huge.module.cases.service.CaseDismissService;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @title: 纠纷不予受理信息表接口api-web端
+ * @description: 纠纷不予受理信息表接口api-web端
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-09-21 13:06:20
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/web/caseDismiss")
+public class CaseDismissWebController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+ @Autowired
+ private CaseDismissService service;
+
+ /**
+ * 获取请求URL参数
+ * @return Map<String, Object>
+ */
+ private Map<String, Object> getParameter(){
+ Map<String, Object> terms = Maps.newHashMap();
+ // 主键编号
+ String id = request.getParameter("id");
+ if (StringUtils.isNotBlank(id)){
+ terms.put("id", id);
+ }
+ // 纠纷编号
+ String caseId = request.getParameter("caseId");
+ if (StringUtils.isNotBlank(caseId)){
+ terms.put("caseId", caseId);
+ }
+ // 操作的纠纷任务编号
+ String caseTaskId = request.getParameter("caseTaskId");
+ if (StringUtils.isNotBlank(caseTaskId)){
+ terms.put("caseTaskId", caseTaskId);
+ }
+ // 操作的纠纷任务流转时间
+ String caseTaskTime = request.getParameter("caseTaskTime");
+ if (StringUtils.isNotBlank(caseTaskTime)){
+ terms.put("caseTaskTime", caseTaskTime);
+ }
+ // 不予受理理由
+ String disContent = request.getParameter("disContent");
+ if (StringUtils.isNotBlank(disContent)){
+ terms.put("disContent", disContent);
+ }
+ // 操作组织编号
+ String disUnitId = request.getParameter("disUnitId");
+ if (StringUtils.isNotBlank(disUnitId)){
+ terms.put("disUnitId", disUnitId);
+ }
+ // 操作组织名称
+ String disUnitName = request.getParameter("disUnitName");
+ if (StringUtils.isNotBlank(disUnitName)){
+ terms.put("disUnitName", disUnitName);
+ }
+ // 操作人编号
+ String disUserId = request.getParameter("disUserId");
+ if (StringUtils.isNotBlank(disUserId)){
+ terms.put("disUserId", disUserId);
+ }
+ // 操作人名称
+ String disUserName = request.getParameter("disUserName");
+ if (StringUtils.isNotBlank(disUserName)){
+ terms.put("disUserName", disUserName);
+ }
+ // 操作时间
+ String disTime = request.getParameter("disTime");
+ if (StringUtils.isNotBlank(disTime)){
+ terms.put("disTime", disTime);
+ }
+ // 删除状态，0：未删除，1：已删除
+ String deleteStatus = request.getParameter("deleteStatus");
+ if (StringUtils.isNotBlank(deleteStatus)){
+ terms.put("deleteStatus", deleteStatus);
+ }
+ // 顾客编号
+ String custId = request.getParameter("custId");
+ if (StringUtils.isNotBlank(custId)){
+ terms.put("custId", custId);
+ }
+ // 创建时间区间
+ String createStart = request.getParameter("createStart");
+ String createEnd = request.getParameter("createEnd");
+ if(StringUtils.isNotBlank(createStart) && StringUtils.isNotBlank(createEnd)) {
+ terms.put("createStart", createStart);
+ terms.put("createEnd", createEnd);
+ }
+ // 更新时间区间
+ String updateStart = request.getParameter("updateStart");
+ String updateEnd = request.getParameter("updateEnd");
+ if(StringUtils.isNotBlank(updateStart) && StringUtils.isNotBlank(updateEnd)) {
+ terms.put("updateStart", updateStart);
+ terms.put("updateEnd", updateEnd);
+ }
+ return terms;
+ }
+
+ /**
+ * 条件查询多个
+ * @url {ctx}/api/web/caseDismiss/listQuery
+ * @return Object
+ */
+ @GetMapping("/listQuery")
+ public Object listQuery() {
+ try {
+ Map<String, Object> terms = getParameter();
+ return ReturnSucUtils.getRepInfo(service.listTerms(terms));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 条件分页查询
+ * @url {ctx}/api/web/caseDismiss/pageQuery
+ * @param page 页码
+ * @param size 每页数量
+ * @return Object
+ */
+ @GetMapping("/pageQuery")
+ public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
+ try {
+ Map<String, Object> terms = getParameter();
+ Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
+ PageRequest pageRequest = PageRequest.of(page-1, size, sort);
+ Page<CaseDismiss> caseDismissPage = service.pageQuery(pageRequest, terms);
+ return ReturnSucUtils.getRepInfo( "处理成功", caseDismissPage);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 根据编号查询单个
+ * @url {ctx}/api/web/caseDismiss/getById
+ * @param id 主键编号
+ * @return Object
+ */
+ @GetMapping("/getById")
+ public Object getById(@RequestParam(value = "id") String id) {
+ try {
+ return ReturnSucUtils.getRepInfo(service.getById(id));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 根据主键单个
+ * @url {ctx}/api/web/caseDismiss/deleteById
+ * @param id 主键编号
+ * @return Object
+ */
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
+ try {
+ service.removeById(id);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 新增或更新对象
+ * @url {ctx}/api/web/caseDismiss/saveCaseDismiss
+ * @param caseDismiss 实体对象
+ * @return Object
+ */
+ @PostMapping("/saveCaseDismiss")
+ public Object saveCaseDismiss(@RequestBody CaseDismiss caseDismiss) {
+ try {
+ service.saveCaseDismiss(caseDismiss);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java
index 968cc9a..dee0d41 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java
@@ -370,7 +370,7 @@
if (StringUtils.isNotBlank(inputWay)){
terms.put("inputWay", inputWay);
}
- // 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
+ // 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档，8：不予受理
String status = request.getParameter("status");
if (StringUtils.isNotBlank(status)){
terms.put("status", status);
@@ -390,7 +390,7 @@
if (StringUtils.isNotBlank(processName)){
terms.put("processName", processName);
}
- // 对外展示事项进度，1：待受理，2：办理中，3：已结案
+ // 对外展示事项进度，1：待受理，2：办理中，3：已结案，4：不予受理
String infoProcess = request.getParameter("process");
if (StringUtils.isNotBlank(infoProcess)){
terms.put("infoProcess", infoProcess);
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
index 69aaa23..cb69bf0 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
@@ -6,6 +6,7 @@
import cn.huge.base.config.CurrentUser;
import cn.huge.module.cases.domain.dto.AcceptTaskDTO;
import cn.huge.module.cases.domain.dto.AssignTaskDTO;
+import cn.huge.module.cases.domain.dto.FrontPageListSLDTO;
import cn.huge.module.cases.domain.dto.SignTaskDTO;
import cn.huge.module.cases.domain.po.CaseAppear;
import cn.huge.module.cases.domain.po.CaseReturn;
@@ -64,6 +65,8 @@
private CustClientImpl custClient;
@Autowired
private CaseSuperviseService superviseService;
+ @Autowired
+ private CaseDismissService caseDismissService;
/**
* web端-任务处理页面-初始化tab和按钮
@@ -313,7 +316,7 @@
* @param size 每页数量
* @param status 状态，1：待分派，2：已分派
* @param sortType 排序方式（1：正序；2：倒序）
- * @param sortColmn 排序字段（1：流转时间；2：分派时限；3：事项等级）
+ * @param sortColmn 排序字段（1：流转时间；2：分派时限/分派时间；3：事项等级）
* @return
*/
@GetMapping("/pageMyTaskFp")
@@ -326,8 +329,15 @@
String timeStart = request.getParameter("timeStart");
String timeEnd = request.getParameter("timeEnd");
if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
- terms.put("timeStart", timeStart);
- terms.put("timeEnd", timeEnd);
+ // 待分派，查询流转时间
+ if (status == 1){
+ terms.put("createTimeStart", timeStart);
+ terms.put("createTimeEnd", timeEnd);
+ }else {
+ // 已分派，查询分派时间
+ terms.put("handleTimeStart", timeStart);
+ terms.put("handleTimeEnd", timeEnd);
+ }
}
// 查询申请方/被申请方关键词
String partyName = request.getParameter("partyName");
@@ -341,7 +351,11 @@
sortName = "t1.create_time";
break;
case 2:
- sortName = "t1.expire_time";
+ if (status == 1){
+ sortName = "t1.expire_time";
+ }else {
+ sortName = "t1.handle_time";
+ }
break;
case 3:
sortName = "t2.case_level";
@@ -375,7 +389,7 @@
* @param size 每页数量
* @param status 状态，1：待签收，2：已签收
* @param sortType 排序方式（1：正序；2：倒序）
- * @param sortColmn 排序字段（1：流转时间；2：分派时限；3：事项等级）
+ * @param sortColmn 排序字段（1：流转时间；2：签收时限/签收时间；3：事项等级）
* @return
*/
@GetMapping("/pageMyTaskQs")
@@ -388,8 +402,15 @@
String timeStart = request.getParameter("timeStart");
String timeEnd = request.getParameter("timeEnd");
if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
- terms.put("timeStart", timeStart);
- terms.put("timeEnd", timeEnd);
+ // 待签收，查询流转时间
+ if (status == 1){
+ terms.put("createTimeStart", timeStart);
+ terms.put("createTimeEnd", timeEnd);
+ }else {
+ // 已签收，查询签收时间
+ terms.put("signTimeStart", timeStart);
+ terms.put("signTimeEnd", timeEnd);
+ }
}
// 查询申请方/被申请方关键词
String partyName = request.getParameter("partyName");
@@ -403,7 +424,11 @@
sortName = "t1.create_time";
break;
case 2:
- sortName = "t1.expire_time";
+ if (status == 1){
+ sortName = "t1.sign_expire_time";
+ }else {
+ sortName = "t1.sign_time";
+ }
break;
case 3:
sortName = "t2.case_level";
@@ -435,9 +460,9 @@
* @url {ctx}/api/web/caseTask/pageMyTaskSl
* @param page 页码
* @param size 每页数量
- * @param status 状态，1：待受理，2：已受理
+ * @param status 状态，1：待受理，2：已受理，3：不予受理
* @param sortType 排序方式（1：正序；2：倒序）
- * @param sortColmn 排序字段（1：流转时间；2：分派时限；3：事项等级）
+ * @param sortColmn 排序字段（1：流转时间；2：受理时限/受理时间/不予受理时间；3：事项等级）
* @return
*/
@GetMapping("/pageMyTaskSl")
@@ -450,8 +475,19 @@
String timeStart = request.getParameter("timeStart");
String timeEnd = request.getParameter("timeEnd");
if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
- terms.put("timeStart", timeStart);
- terms.put("timeEnd", timeEnd);
+ // 待受理，查询流转时间
+ if (status == 1){
+ terms.put("createTimeStart", timeStart);
+ terms.put("createTimeEnd", timeEnd);
+ }else if (status == 2){
+ // 已受理，查询受理时间
+ terms.put("handleTimeStart", timeStart);
+ terms.put("handleTimeEnd", timeEnd);
+ }else {
+ // 不予受理，查询不予受理时间
+ terms.put("disTimeStart", timeStart);
+ terms.put("disTimeEnd", timeEnd);
+ }
}
// 查询申请方/被申请方关键词
String partyName = request.getParameter("partyName");
@@ -462,10 +498,24 @@
String sortName = null;
switch (sortColmn){
case 1:
- sortName = "t1.create_time";
+ // 不予受理
+ if (status == 3){
+ sortName = "t1.case_task_time";
+ }else {
+ sortName = "t1.create_time";
+ }
break;
case 2:
- sortName = "t1.expire_time";
+ // 待受理
+ if (status == 1){
+ sortName = "t1.expire_time";
+ }else if (status == 2){
+ // 已受理
+ sortName = "t1.handle_time";
+ }else {
+ // 不予受理
+ sortName = "t1.dis_time";
+ }
break;
case 3:
sortName = "t2.case_level";
@@ -484,9 +534,15 @@
}
PageRequest pageRequest = PageRequest.of(page-1, size, sort);
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
- terms.put("candeUnitId",loginUser.getUnitId());
- terms.put("status", status);
- return ReturnSucUtils.getRepInfo(service.pageMyTaskSl(pageRequest, terms));
+ // 不予受理，查询case_dismiss表
+ if (status == 3){
+ terms.put("disUnitId", loginUser.getUnitId());
+ return ReturnSucUtils.getRepInfo(caseDismissService.pageMyTaskBysl(pageRequest, terms));
+ }else {
+ terms.put("status", status);
+ terms.put("candeUnitId", loginUser.getUnitId());
+ return ReturnSucUtils.getRepInfo(service.pageMyTaskSl(pageRequest, terms));
+ }
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseDismissMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseDismissMapper.java
new file mode 100644
index 0000000..59110df
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseDismissMapper.java
@@ -0,0 +1,79 @@
+package cn.huge.module.cases.dao.mapper;
+
+import cn.huge.module.cases.domain.dto.FrontPageListSLDTO;
+import cn.huge.module.cases.domain.po.CaseDismiss;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 纠纷不予受理信息表持久层业务处理
+* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
+* @company: hugeinfo
+* @author: liyj
+* @time: 2024-09-21 09:14:40
+* @version 1.0.0
+*/
+@Repository
+public interface CaseDismissMapper extends BaseMapper<CaseDismiss>{
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ void updateCaseDismiss(@Param("entity") CaseDismiss entity);
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ void updateCaseDismissTerms(@Param("entity") CaseDismiss entity, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ void deleteCaseDismiss(@Param("id") String id);
+
+ /**
+ * 按条件查询结果集
+ * @param terms 查询条件集合
+ * @return List<CaseDismiss>
+ */
+ List<CaseDismiss> listTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体总数
+ * @param terms 查询条件集合
+ * @return long
+ */
+ long countTerms(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 按条件查询实体分页结果集
+ * @param page 分页对象
+ * @param terms 查询条件集合
+ * @return List<CaseDismiss>
+ */
+ List<CaseDismiss> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+ /**
+ * 首页-不予待理条件统计
+ * @param terms 条件
+ * @return long
+ */
+ long countMyTaskBysl(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 首页-不予待理分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return List<FrontPageListDTO>
+ */
+ List<FrontPageListSLDTO> pageMyTaskBysl(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java
index c59621e..f295539 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java
@@ -1,7 +1,6 @@
package cn.huge.module.cases.dao.mapper;
-import cn.huge.module.cases.domain.dto.FrontPageCountDTO;
-import cn.huge.module.cases.domain.dto.FrontPageListDTO;
+import cn.huge.module.cases.domain.dto.*;
import cn.huge.module.cases.domain.po.CaseTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -78,49 +77,49 @@
FrontPageCountDTO countTaskList(@Param("terms") Map<String, Object> terms);
/**
- * 首页-受分派条件统计
+ * 首页-待/已分派条件统计
* @param terms 条件
* @return long
*/
long countMyTaskFp(@Param("terms") Map<String, Object> terms);
/**
- * 首页-受分派分页查询
+ * 首页-待/已分派分页查询
* @param page 分页对象
* @param terms 条件
* @return List<FrontPageListDTO>
*/
- List<FrontPageListDTO> pageMyTaskFp(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+ List<FrontPageListFPDTO> pageMyTaskFp(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
/**
- * 首页-受签收条件统计
+ * 首页-待/已签收条件统计
* @param terms 条件
* @return long
*/
long countMyTaskQs(@Param("terms") Map<String, Object> terms);
/**
- * 首页-受签收分页查询
+ * 首页-待/已签收分页查询
* @param page 分页对象
* @param terms 条件
* @return List<FrontPageListDTO>
*/
- List<FrontPageListDTO> pageMyTaskQs(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+ List<FrontPageListQSDTO> pageMyTaskQs(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
/**
- * 首页-受待理条件统计
+ * 首页-待/已受理条件统计
* @param terms 条件
* @return long
*/
long countMyTaskSl(@Param("terms") Map<String, Object> terms);
/**
- * 首页-受待理分页查询
+ * 首页-待/已受理分页查询
* @param page 分页对象
* @param terms 条件
* @return List<FrontPageListDTO>
*/
- List<FrontPageListDTO> pageMyTaskSl(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+ List<FrontPageListSLDTO> pageMyTaskSl(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
/**
* 首页-待审核-我申请的条件统计
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml
new file mode 100644
index 0000000..c704392
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseDismissMapper.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+ * @title: 纠纷不予受理信息表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2024-09-21 13:06:20
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.cases.dao.mapper.CaseDismissMapper">
+ <!-- 结果集 -->
+ <resultMap id="dataResult" type="cn.huge.module.cases.domain.po.CaseDismiss">
+ <result property="id" column="id"/>
+ <result property="caseId" column="case_id"/>
+ <result property="caseTaskId" column="case_task_id"/>
+ <result property="caseTaskTime" column="case_task_time"/>
+ <result property="disContent" column="dis_content"/>
+ <result property="disUnitId" column="dis_unit_id"/>
+ <result property="disUnitName" column="dis_unit_name"/>
+ <result property="disUserId" column="dis_user_id"/>
+ <result property="disUserName" column="dis_user_name"/>
+ <result property="disTime" column="dis_time"/>
+ <result property="deleteStatus" column="delete_status"/>
+ <result property="custId" column="cust_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+ <!-- 表 -->
+ <sql id='table-name'>dyh_case_dismiss</sql>
+ <!-- 字段 -->
+ <sql id="column-part">
+ id,
+ case_id,
+ case_task_id,
+ case_task_time,
+ dis_content,
+ dis_unit_id,
+ dis_unit_name,
+ dis_user_id,
+ dis_user_name,
+ dis_time,
+ delete_status,
+ cust_id,
+ create_time,
+ update_time
+ </sql>
+ <!-- 更新实体字段 -->
+ <sql id="set-part">
+ <if test="entity.caseId != null">case_id = #{entity.caseId},</if>
+ <if test="entity.caseTaskId != null">case_task_id = #{entity.caseTaskId},</if>
+ <if test="entity.caseTaskTime != null">case_task_time = #{entity.caseTaskTime},</if>
+ <if test="entity.disContent != null">dis_content = #{entity.disContent},</if>
+ <if test="entity.disUnitId != null">dis_unit_id = #{entity.disUnitId},</if>
+ <if test="entity.disUnitName != null">dis_unit_name = #{entity.disUnitName},</if>
+ <if test="entity.disUserId != null">dis_user_id = #{entity.disUserId},</if>
+ <if test="entity.disUserName != null">dis_user_name = #{entity.disUserName},</if>
+ <if test="entity.disTime != null">dis_time = #{entity.disTime},</if>
+ <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+ <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+ <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ </sql>
+ <!-- 条件 -->
+ <sql id="where-part">
+ <if test="terms != null">
+ <where>
+ <if test="terms.id != null and terms.id !=''">
+ and id = #{terms.id}
+ </if>
+ <if test="terms.caseId != null and terms.caseId !=''">
+ and case_id = #{terms.caseId}
+ </if>
+ <if test="terms.caseTaskId != null and terms.caseTaskId !=''">
+ and case_task_id = #{terms.caseTaskId}
+ </if>
+ <if test="terms.caseTaskTime != null and terms.caseTaskTime !=''">
+ and case_task_time = #{terms.caseTaskTime}
+ </if>
+ <if test="terms.disContent != null and terms.disContent !=''">
+ and dis_content = #{terms.disContent}
+ </if>
+ <if test="terms.disUnitId != null and terms.disUnitId !=''">
+ and dis_unit_id = #{terms.disUnitId}
+ </if>
+ <if test="terms.disUnitName != null and terms.disUnitName !=''">
+ and dis_unit_name = #{terms.disUnitName}
+ </if>
+ <if test="terms.disUserId != null and terms.disUserId !=''">
+ and dis_user_id = #{terms.disUserId}
+ </if>
+ <if test="terms.disUserName != null and terms.disUserName !=''">
+ and dis_user_name = #{terms.disUserName}
+ </if>
+ <if test="terms.disTime != null and terms.disTime !=''">
+ and dis_time = #{terms.disTime}
+ </if>
+ <if test="terms.deleteStatus = null and terms.deleteStatus =''">
+ and delete_status = 0
+ </if>
+ <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+ and delete_status = #{terms.deleteStatus}
+ </if>
+ <if test="terms.custId != null and terms.custId !=''">
+ and cust_id = #{terms.custId}
+ </if>
+ <if test="terms.createTime != null and terms.createTime !=''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.updateTime != null and terms.updateTime !=''">
+ and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
+ </if>
+ <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
+ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
+ and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+ </if>
+ </where>
+ </if>
+ </sql>
+ <!-- 更新对象 -->
+ <update id="updateCaseDismiss">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id = #{entity.id}
+ </where>
+ </update>
+ <!-- 条件更新对象 -->
+ <update id="updateCaseDismissTerms">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <include refid="where-part"/>
+ </update>
+ <!-- 根据编号物理删除 -->
+ <delete id="deleteCaseDismiss">
+ delete from
+ <include refid="table-name" />
+ where id = #{id}
+ </delete>
+ <!-- 根据条件查询 -->
+ <select id="listTerms" resultMap="dataResult">
+ select
+ <include refid="column-part"/>
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件统计 -->
+ <select id="countTerms" resultType="java.lang.Long">
+ select
+ COUNT(1)
+ from
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ </select>
+ <!-- 根据条件分页查询 -->
+ <select id="pageTerms" resultMap="dataResult">
+ SELECT
+ <include refid="column-part"/>
+ FROM
+ <include refid="table-name" />
+ <include refid="where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(create_time), create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+
+ <!-- 工作台-不予受理条件查询-条件 -->
+ <sql id="myTaskBysl-where-part">
+ <if test="terms != null">
+ <if test="terms.disUnitId != null and terms.disUnitId !=''">
+ and t1.dis_unit_id = #{terms.disUnitId}
+ </if>
+ <if test="terms.disTimeStart != null and terms.disTimeStart !='' and terms.disTimeEnd != null and terms.disTimeEnd !=''">
+ and (DATE_FORMAT(t1.dis_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.disTimeStart}
+ and DATE_FORMAT(t1.dis_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.disTimeEnd})
+ </if>
+ <if test="terms.partyName != null and terms.partyName !=''">
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ </if>
+ </if>
+ </sql>
+ <!-- 首页-不予受理条件统计 -->
+ <select id="countMyTaskBysl" resultType="java.lang.Long">
+ select
+ COUNT(t1.id)
+ from
+ dyh_case_dismiss t1 left join dyh_case_info t2 on t1.case_id = t2.id
+ where t2.delete_status = 0
+ <include refid="myTaskBysl-where-part"/>
+ </select>
+ <!-- 首页-不予受理分页查询 -->
+ <select id="pageMyTaskBysl" resultType="cn.huge.module.cases.domain.dto.FrontPageListSLDTO">
+ SELECT t1.id as ownerId, t1.case_id as caseId,
+ t1.case_task_time as turnaroundTime, t1.dis_time as taskHandleTime,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
+ concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
+ (select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
+ FROM
+ dyh_case_dismiss t1 left join dyh_case_info t2 on t1.case_id = t2.id
+ where t2.delete_status = 0
+ <include refid="myTaskBysl-where-part"/>
+ <if test="page.sort != null">
+ <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+ isnull(${s.property}), ${s.property} ${s.direction}
+ </foreach>
+ </if>
+ <if test="page.sort == null">
+ order by isnull(t1.create_time), t1.create_time desc
+ </if>
+ limit #{page.offset}, #{page.size}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
index b6aa449..2c0da83 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
@@ -398,46 +398,56 @@
<result property="process" column="process"/>
</resultMap>
- <!-- 首页-待分派条件统计 -->
+
+ <!-- 工作台-待/已分派条件查询-条件 -->
+ <sql id="myTaskFp-where-part">
+ <if test="terms != null">
+ <if test="terms.candeUnitId != null and terms.candeUnitId !=''">
+ and t1.cande_unit_id = #{terms.candeUnitId}
+ </if>
+ <if test="terms.status != null and terms.status !=''">
+ and t1.status = #{terms.status}
+ </if>
+ <if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''">
+ and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart}
+ and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createTimeEnd})
+ </if>
+ <if test="terms.handleTimeStart != null and terms.handleTimeStart !='' and terms.handleTimeEnd != null and terms.handleTimeEnd !=''">
+ and (DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.handleTimeStart}
+ and DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.handleTimeEnd})
+ </if>
+ <if test="terms.partyName != null and terms.partyName !=''">
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ </if>
+ </if>
+ </sql>
+ <!-- 工作台-待/已分派条件统计 -->
<select id="countMyTaskFp" resultType="java.lang.Long">
select
COUNT(t1.id)
from
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
- cande_unit_id = #{terms.candeUnitId}
- and (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP')
+ (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP')
and sign_status != 1
- and t1.delete_status = 0
- and t1.status = #{terms.status}
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
- </if>
- <if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
- </if>
+ and t2.delete_status = 0
+ <include refid="myTaskFp-where-part"/>
</select>
- <!-- 首页-待分派分页查询 -->
- <select id="pageMyTaskFp" resultMap="MyTaskApplyReviewResult">
+ <!-- 工作台-待分派分页查询 -->
+ <select id="pageMyTaskFp" resultType="cn.huge.module.cases.domain.dto.FrontPageListFPDTO">
SELECT t1.id as ownerId, t1.case_id as caseId,
- t1.create_time as turnaroundTime, t1.expire_time as timeLimit, t2.case_level as caseGrade, t2.canal_name as caseSource,
- t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
+ t1.create_time as turnaroundTime, t1.expire_time as timeLimit, t1.handle_time as taskHandleTime,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
+ concat(t2.que_area_name, t2.que_road_name) as queAddress,
+ concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
+ (select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
- t1.cande_unit_id = #{terms.candeUnitId}
- and (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP')
+ (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP')
and sign_status != 1
- and t1.delete_status = 0
- and t1.status = #{terms.status}
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
- </if>
- <if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
- </if>
+ and t2.delete_status = 0
+ <include refid="myTaskFp-where-part"/>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
isnull(${s.property}), ${s.property} ${s.direction}
@@ -449,45 +459,53 @@
limit #{page.offset}, #{page.size}
</select>
- <!-- 首页-待签收条件统计 -->
+
+ <!-- 工作台-待/已签收条件查询-条件 -->
+ <sql id="myTaskQs-where-part">
+ <if test="terms != null">
+ <if test="terms.candeUnitId != null and terms.candeUnitId !=''">
+ and t1.cande_unit_id = #{terms.candeUnitId}
+ </if>
+ <if test="terms.signStatus != null and terms.signStatus !=''">
+ and t1.sign_status = #{terms.signStatus}
+ </if>
+ <if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''">
+ and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart}
+ and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createTimeEnd})
+ </if>
+ <if test="terms.signTimeStart != null and terms.signTimeStart !='' and terms.signTimeEnd != null and terms.signTimeEnd !=''">
+ and (DATE_FORMAT(t1.sign_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.signTimeStart}
+ and DATE_FORMAT(t1.sign_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.signTimeEnd})
+ </if>
+ <if test="terms.partyName != null and terms.partyName !=''">
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ </if>
+ </if>
+ </sql>
+ <!-- 首页-待/已签收条件统计 -->
<select id="countMyTaskQs" resultType="java.lang.Long">
select
COUNT(t1.id)
from
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
- t1.cande_unit_id = #{terms.candeUnitId}
- and t1.sign_status = #{terms.signStatus}
- and t1.delete_status = 0
+ t2.delete_status = 0
and t1.status = '1'
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
- </if>
- <if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
- </if>
+ <include refid="myTaskQs-where-part"/>
</select>
- <!-- 首页-待签收分页查询 -->
- <select id="pageMyTaskQs" resultMap="MyTaskApplyReviewResult">
+ <!-- 首页-待/已签收分页查询 -->
+ <select id="pageMyTaskQs" resultType="cn.huge.module.cases.domain.dto.FrontPageListQSDTO">
SELECT t1.id as ownerId, t1.case_id as caseId,
- t1.create_time as turnaroundTime, t1.expire_time as timeLimit, t2.case_level as caseGrade, t2.canal_name as caseSource,
- t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
- concat(t2.defendants, t2.dagents) as defendants
+ t1.create_time as turnaroundTime, t1.sign_expire_time as timeLimit, t1.sign_time as taskHandleTime,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
+ concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
+ (select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
- t1.cande_unit_id = #{terms.candeUnitId}
- and t1.sign_status = #{terms.signStatus}
- and t1.delete_status = 0
+ t2.delete_status = 0
and t1.status = '1'
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
- </if>
- <if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
- </if>
+ <include refid="myTaskQs-where-part"/>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
isnull(${s.property}), ${s.property} ${s.direction}
@@ -499,48 +517,58 @@
limit #{page.offset}, #{page.size}
</select>
- <!-- 首页-待受理条件统计 -->
+
+ <!-- 工作台-待/已受理条件查询-条件 -->
+ <sql id="myTaskSl-where-part">
+ <if test="terms != null">
+ <if test="terms.candeUnitId != null and terms.candeUnitId !=''">
+ and t1.cande_unit_id = #{terms.candeUnitId}
+ </if>
+ <if test="terms.status != null and terms.status !=''">
+ and t1.status = #{terms.status}
+ </if>
+ <if test="terms.caseTaskType != null and terms.caseTaskType !=''">
+ and t1.case_task_type = #{terms.caseTaskType}
+ </if>
+ <if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''">
+ and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart}
+ and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createTimeEnd})
+ </if>
+ <if test="terms.handleTimeStart != null and terms.handleTimeStart !='' and terms.handleTimeEnd != null and terms.handleTimeEnd !=''">
+ and (DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.handleTimeStart}
+ and DATE_FORMAT(t1.handle_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.handleTimeEnd})
+ </if>
+ <if test="terms.partyName != null and terms.partyName !=''">
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ </if>
+ </if>
+ </sql>
+ <!-- 首页-待/已受理条件统计 -->
<select id="countMyTaskSl" resultType="java.lang.Long">
select
COUNT(t1.id)
from
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
- t1.cande_unit_id = #{terms.candeUnitId}
- and (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL')
- and t1.delete_status = 0
+ (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL')
+ and t2.delete_status = 0
and t1.sign_status != 1
- and t1.status = #{terms.status}
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
- </if>
- <if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
- </if>
+ <include refid="myTaskSl-where-part"/>
</select>
- <!-- 首页-待受理分页查询 -->
- <select id="pageMyTaskSl" resultMap="MyTaskApplyReviewResult">
+ <!-- 首页-待/已受理分页查询 -->
+ <select id="pageMyTaskSl" resultType="cn.huge.module.cases.domain.dto.FrontPageListSLDTO">
SELECT t1.id as ownerId, t1.case_id as caseId,
- t1.create_time as turnaroundTime, t1.expire_time as timeLimit,
- t2.case_level as caseGrade, t2.canal_name as caseSource,
- t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
- concat(t2.defendants, t2.dagents) as defendants
+ t1.create_time as turnaroundTime, t1.sign_expire_time as timeLimit, t1.handle_time as taskHandleTime,
+ t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
+ concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants,
+ (select count(1) from dyh_case_supervise where case_id = t1.case_id) as superviseCount
FROM
dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
- t1.cande_unit_id = #{terms.candeUnitId}
- and (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL')
- and t1.delete_status = 0
+ (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL')
+ and t2.delete_status = 0
and t1.sign_status != 1
- and t1.status = #{terms.status}
- <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
- and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
- and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
- </if>
- <if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
- </if>
+ <include refid="myTaskSl-where-part"/>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
isnull(${s.property}), ${s.property} ${s.direction}
@@ -561,7 +589,7 @@
where
t1.cande_unit_id = #{terms.candeUnitId}
and t1.node_id = 'BLFK'
- and t1.delete_status = 0
+ and t2.delete_status = 0
and t1.status = 1
<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
@@ -582,7 +610,7 @@
where
t1.cande_unit_id = #{terms.candeUnitId}
and t1.node_id = 'BLFK'
- and t1.delete_status = 0
+ and t2.delete_status = 0
and t1.status = 1
<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
@@ -611,7 +639,7 @@
where
t1.cande_unit_id = #{terms.candeUnitId}
and (t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL')
- and t1.delete_status = 0
+ and t2.delete_status = 0
and t1.sign_status != 1
and t1.status = #{terms.status}
<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/bo/CaseDismissBO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/bo/CaseDismissBO.java
new file mode 100644
index 0000000..fc0de57
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/bo/CaseDismissBO.java
@@ -0,0 +1,17 @@
+package cn.huge.module.cases.domain.bo;
+
+import cn.huge.module.cases.domain.po.CaseDismiss;
+
+/**
+ * @title: 纠纷不予受理信息表业务扩展类
+ * @description: 纠纷不予受理信息表业务扩展类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-09-21 09:14:40
+ * @version: 1.0.0
+ * @see cn.huge.module.cases.domain.po.CaseDismiss
+ */
+public class CaseDismissBO extends CaseDismiss {
+
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeChatDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeChatDTO.java
index 1f66d07..5bc41ea 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeChatDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeChatDTO.java
@@ -26,7 +26,7 @@
*/
private Date visitTime;
/**
- * 事项进度，1：来访登记，2：事件流转，3：办理反馈，4：结案审核，5：当事人评价，6：结案归档
+ * 事项进度，1：来访登记，2：事件流转，3：办理反馈，4：结案审核，5：当事人评价，6：结案归档，7：不予受理
*/
private Integer process;
@@ -36,7 +36,7 @@
private String processName;
/**
- * 事项进度，1：来访登记，2：事件流转，3：办理反馈，4：结案审核，5：当事人评价，6：结案归档
+ * 事项进度，1：来访登记，2：事件流转，3：办理反馈，4：结案审核，5：当事人评价，6：结案归档，7：不予受理
*/
private Integer processStatus;
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java
index c0361a9..0b93b5c 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java
@@ -18,7 +18,7 @@
*/
private String id;
/**
- * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
+ * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档，8：不予受理
*/
private Integer status;
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListFPDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListFPDTO.java
new file mode 100644
index 0000000..0b66615
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListFPDTO.java
@@ -0,0 +1,84 @@
+package cn.huge.module.cases.domain.dto;
+
+import cn.huge.module.cases.domain.po.CaseInfo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 工作台-待办列表-传输对象-分派
+ * @description: 作台-待办列表-传输对象-分派
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-09-21 09:36:25
+ * @version: 1.0.0
+ * @see CaseInfo
+ */
+@Data
+public class FrontPageListFPDTO {
+
+ /**
+ * 所属业务表编号
+ */
+ private String ownerId;
+
+ /**
+ * 纠纷信息ID
+ */
+ private String caseId;
+
+ /**
+ * 流转时间
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date turnaroundTime;
+
+ /**
+ * 分派时限
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date timeLimit;
+
+ /**
+ * 分派时间
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date taskHandleTime;
+
+ /**
+ * 事项等级
+ */
+ private Integer caseGrade;
+
+ /**
+ * 事项来源
+ */
+ private String caseSource;
+
+ /**
+ * 问题属地
+ */
+ private String queAddress;
+
+ /**
+ * 纠纷类型
+ */
+ private String caseType;
+
+ /**
+ * 申请方
+ */
+ private String plaintiffs;
+
+ /**
+ * 被申请方
+ */
+ private String defendants;
+
+ /**
+ * 督办次数
+ */
+ private int superviseCount;
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListQSDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListQSDTO.java
new file mode 100644
index 0000000..7d85b1d
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListQSDTO.java
@@ -0,0 +1,78 @@
+package cn.huge.module.cases.domain.dto;
+
+import cn.huge.module.cases.domain.po.CaseInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 工作台-待办列表-传输对象-分派
+ * @description: 作台-待办列表-传输对象-分派
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-09-21 09:36:25
+ * @version: 1.0.0
+ * @see CaseInfo
+ */
+@Data
+public class FrontPageListQSDTO {
+
+ /**
+ * 所属业务表编号
+ */
+ private String ownerId;
+
+ /**
+ * 纠纷信息ID
+ */
+ private String caseId;
+
+ /**
+ * 流转时间
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date turnaroundTime;
+
+ /**
+ * 签收时限
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date timeLimit;
+
+ /**
+ * 签收时间
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date taskHandleTime;
+
+ /**
+ * 事项等级
+ */
+ private Integer caseGrade;
+
+ /**
+ * 事项来源
+ */
+ private String caseSource;
+
+ /**
+ * 纠纷类型
+ */
+ private String caseType;
+
+ /**
+ * 申请方
+ */
+ private String plaintiffs;
+
+ /**
+ * 被申请方
+ */
+ private String defendants;
+
+ /**
+ * 督办次数
+ */
+ private int superviseCount;
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListSLDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListSLDTO.java
new file mode 100644
index 0000000..696de72
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListSLDTO.java
@@ -0,0 +1,78 @@
+package cn.huge.module.cases.domain.dto;
+
+import cn.huge.module.cases.domain.po.CaseInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 工作台-待办列表-传输对象-分派
+ * @description: 作台-待办列表-传输对象-分派
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-09-21 09:36:25
+ * @version: 1.0.0
+ * @see CaseInfo
+ */
+@Data
+public class FrontPageListSLDTO {
+
+ /**
+ * 所属业务表编号
+ */
+ private String ownerId;
+
+ /**
+ * 纠纷信息ID
+ */
+ private String caseId;
+
+ /**
+ * 流转时间
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date turnaroundTime;
+
+ /**
+ * 受理时限
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date timeLimit;
+
+ /**
+ * 受理时间/不予受理时间
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date taskHandleTime;
+
+ /**
+ * 事项等级
+ */
+ private Integer caseGrade;
+
+ /**
+ * 事项来源
+ */
+ private String caseSource;
+
+ /**
+ * 纠纷类型
+ */
+ private String caseType;
+
+ /**
+ * 申请方
+ */
+ private String plaintiffs;
+
+ /**
+ * 被申请方
+ */
+ private String defendants;
+
+ /**
+ * 督办次数
+ */
+ private int superviseCount;
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseDismiss.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseDismiss.java
new file mode 100644
index 0000000..96d23e1
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseDismiss.java
@@ -0,0 +1,108 @@
+package cn.huge.module.cases.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 纠纷不予受理信息表数据库对应关系类
+ * @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
+ * @company:hugeinfo
+ * @author: liyj
+ * @time: 2024-09-21 13:06:20
+ * @version 1.0.0
+ */
+@TableName(value = "dyh_case_dismiss")
+@Data
+public class CaseDismiss {
+
+ /**
+ * 主键编号
+ */
+ @TableId(value = "id")
+ private String id;
+
+ /**
+ * 纠纷编号
+ */
+ @TableField(value = "case_id")
+ private String caseId;
+
+ /**
+ * 操作的纠纷任务编号
+ */
+ @TableField(value = "case_task_id")
+ private String caseTaskId;
+
+ /**
+ * 操作的纠纷任务流转时间
+ */
+ @TableField(value = "case_task_time")
+ private Date caseTaskTime;
+
+ /**
+ * 不予受理理由
+ */
+ @TableField(value = "dis_content")
+ private String disContent;
+
+ /**
+ * 操作组织编号
+ */
+ @TableField(value = "dis_unit_id")
+ private String disUnitId;
+
+ /**
+ * 操作组织名称
+ */
+ @TableField(value = "dis_unit_name")
+ private String disUnitName;
+
+ /**
+ * 操作人编号
+ */
+ @TableField(value = "dis_user_id")
+ private String disUserId;
+
+ /**
+ * 操作人名称
+ */
+ @TableField(value = "dis_user_name")
+ private String disUserName;
+
+ /**
+ * 操作时间
+ */
+ @TableField(value = "dis_time")
+ private Date disTime;
+
+ /**
+ * 删除状态，0：未删除，1：已删除
+ */
+ @TableLogic
+ @TableField(value = "delete_status")
+ private Integer deleteStatus;
+
+ /**
+ * 顾客编号
+ */
+ @TableField(value = "cust_id")
+ private String custId;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java
index f15fc77..2bfba2d 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java
@@ -354,7 +354,7 @@
private Integer inputWay;
/**
- * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
+ * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档，8：不予受理
*/
@TableField(value = "status")
private Integer status;
@@ -366,7 +366,7 @@
private String statusName;
/**
- * 事项进度，1：来访登记，2：事件流转，3：办理反馈，4：结案审核，5：当事人评价，6：结案归档
+ * 事项进度，1：来访登记，2：事件流转，3：办理反馈，4：结案审核，5：当事人评价，6：结案归档，7：不予受理
*/
@TableField(value = "process")
private Integer process;
@@ -378,7 +378,7 @@
private String processName;
/**
- * 对外展示事项进度，1：待受理，2：办理中，3：已结案
+ * 对外展示事项进度，1：待受理，2：办理中，3：已结案，4：不予受理
*/
@TableField(value = "info_process")
private Integer infoProcess;
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseDismissService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseDismissService.java
new file mode 100644
index 0000000..7f4ff7f
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseDismissService.java
@@ -0,0 +1,151 @@
+package cn.huge.module.cases.service;
+
+import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.DateUtils;
+import cn.huge.base.common.utils.IdUtils;
+import cn.huge.module.cases.domain.dto.FrontPageListSLDTO;
+import cn.huge.module.client.api.impl.UtilsClientImpl;
+import cn.huge.module.cases.dao.mapper.CaseDismissMapper;
+import cn.huge.module.cases.domain.po.CaseDismiss;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 纠纷不予受理信息表业务逻辑处理
+ * @Description 纠纷不予受理信息表业务逻辑处理
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-09-21 09:14:40
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CaseDismissService extends ServiceImpl<CaseDismissMapper, CaseDismiss>{
+
+ @Autowired
+ private CaseDismissMapper mapper;
+
+ @Autowired
+ private UtilsClientImpl utilsClient;
+
+ /**
+ * 更新对象
+ * @param entity 对象
+ */
+ public void updateCaseDismiss(CaseDismiss entity){
+ try{
+ mapper.updateCaseDismiss(entity);
+ }catch (Exception e){
+ log.error("[CaseDismissService.updateCaseDismiss]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseDismissService.updateCaseDismiss", e);
+ }
+ }
+
+ /**
+ * 条件更新对象
+ * @param entity 对象
+ * @param terms 条件
+ */
+ public void updateCaseDismissTerms(CaseDismiss entity, Map<String, Object> terms){
+ try{
+ mapper.updateCaseDismissTerms(entity, terms);
+ }catch (Exception e){
+ log.error("[CaseDismissService.updateCaseDismissTerms]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseDismissService.updateCaseDismissTerms", e);
+ }
+ }
+
+ /**
+ * 根据编号物理删除
+ * @param id 查询条件集合
+ */
+ public void deleteCaseDismiss(String id){
+ try{
+ mapper.deleteCaseDismiss(id);
+ }catch (Exception e){
+ log.error("[CaseDismissService.deleteCaseDismiss]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseDismissService.deleteCaseDismiss", e);
+ }
+ }
+
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<CaseDismiss> listTerms(Map<String, Object> terms){
+ return mapper.listTerms(terms);
+ }
+
+ /**
+ * 按条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countTerms(Map<String, Object> terms){
+ return mapper.countTerms(terms);
+ }
+
+ /**
+ * 按条件分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CaseDismiss> pageQuery(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTerms(terms);
+ List<CaseDismiss> content = mapper.pageTerms(page, terms);
+ return new PageImpl<CaseDismiss>(content, page, total);
+ }
+
+ /**
+ * 新增或更新对象
+ * @param caseDismiss 实体对象
+ */
+ public void saveCaseDismiss(CaseDismiss caseDismiss){
+ try{
+ Date nowDate = DateUtils.getNowDate();
+ // 判断是否新增
+ if (IdUtils.checkNewId(caseDismiss.getId())){
+ caseDismiss.setId(utilsClient.getNewTimeId());
+ caseDismiss.setCreateTime(nowDate);
+ }
+ caseDismiss.setUpdateTime(nowDate);
+ this.saveOrUpdate(caseDismiss);
+ }catch (Exception e){
+ log.error("[CaseDismissService.saveCaseDismiss]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseDismissService.saveCaseDismiss", e);
+ }
+ }
+
+ /**
+ * 首页-查询待办任务-不予受理
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<FrontPageListSLDTO> pageMyTaskBysl(PageRequest page, Map<String, Object> terms){
+ try {
+ long total = mapper.countMyTaskBysl(terms);
+ List<FrontPageListSLDTO> frontPageListDTOList = mapper.pageMyTaskBysl(page, terms);
+ return new PageImpl<FrontPageListSLDTO>(frontPageListDTOList, page, total);
+ }catch (Exception e) {
+ log.error("[CaseDismissService.pageMyTaskBysl]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseDismissService.pageMyTaskBysl", e);
+ }
+ }
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
index 96aab01..fd02986 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -216,9 +216,9 @@
TabButtonInfoDTO sxbl = new TabButtonInfoDTO();
sxbl.setId("sxbl");
sxbl.setName("事项办理");
-// TabButtonInfoDTO sqjl = new TabButtonInfoDTO();
-// sqjl.setId("sqjl");
-// sqjl.setName("申请记录");
+ TabButtonInfoDTO sqjl = new TabButtonInfoDTO();
+ sqjl.setId("sqjl");
+ sqjl.setName("申请记录");
TabButtonInfoDTO htsh = new TabButtonInfoDTO();
htsh.setId("htsh");
htsh.setName("回退审核");
@@ -266,6 +266,9 @@
TabButtonInfoDTO sb = new TabButtonInfoDTO();
sb.setId("sb");
sb.setName("上报");
+ TabButtonInfoDTO bysl = new TabButtonInfoDTO();
+ sb.setId("bysl");
+ sb.setName("不予受理");
// 根据流程显示tab
List<TabButtonInfoDTO> tabList = new LinkedList<>();
// 根据流程显示button
@@ -273,76 +276,82 @@
if (ObjectUtils.isNotEmpty(caseTask)) {
if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(zxsl);
buttonList.add(jb);
buttonList.add(sb);
+ buttonList.add(bysl);
}
if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(sl);
buttonList.add(ht);
+ buttonList.add(bysl);
}
if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(htsh);
}
if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(sbsh);
}
if (FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(zxsl);
buttonList.add(jb);
buttonList.add(sb);
+ buttonList.add(bysl);
}
if (FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(sl);
buttonList.add(ht);
+ buttonList.add(bysl);
}
if (FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(htsh);
}
if (FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(sbsh);
}
if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(zxsl);
buttonList.add(jb);
+ buttonList.add(bysl);
}
if (FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(sl);
buttonList.add(ht);
+ buttonList.add(bysl);
}
if (FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(htsh);
}
if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
@@ -350,7 +359,7 @@
tabList.add(sxxq);
tabList.add(sxbl);
tabList.add(lcdb);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(tjbljl);
buttonList.add(lhczsq);
@@ -360,30 +369,30 @@
tabList.add(sxxq);
tabList.add(sxbl);
tabList.add(lcdb);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(tjbljl);
}
}
if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(jash);
}
if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
daxx.setName("信息");
tabList.add(daxx);
tabList.add(lcdb);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
}
if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(caseTask.getNodeId())) {
tabList.add(daxx);
tabList.add(lcdb);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
}
if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(sl);
buttonList.add(ht);
@@ -391,12 +400,12 @@
if (FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(htsh);
}
}else {
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(lhczsh);
}
// 封装数据
@@ -734,16 +743,20 @@
}
/**
- * 首页-查询待办任务-受分派
+ * 首页-查询待办任务-待/已分派
* @param page 分页对象
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskFp(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListFPDTO> pageMyTaskFp(PageRequest page, Map<String, Object> terms){
try {
long total = mapper.countMyTaskFp(terms);
- List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskFp(page, terms);
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ List<FrontPageListFPDTO> frontPageListFPDTOList = mapper.pageMyTaskFp(page, terms);
+ for (FrontPageListFPDTO frontPageListFPDTO: frontPageListFPDTOList){
+ // 查询督办次数
+
+ }
+ return new PageImpl<FrontPageListFPDTO>(frontPageListFPDTOList, page, total);
}catch (Exception e) {
log.error("[CaseTaskService.pageMyTaskFp]调用失败，异常信息：" + e, e);
throw new ServiceException("CaseTaskService.pageMyTaskFp", e);
@@ -752,16 +765,16 @@
}
/**
- * 首页-查询待办任务-受签收
+ * 首页-查询待办任务-待/已签收
* @param page 分页对象
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskQs(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListQSDTO> pageMyTaskQs(PageRequest page, Map<String, Object> terms){
try {
long total = mapper.countMyTaskQs(terms);
- List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskQs(page, terms);
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ List<FrontPageListQSDTO> frontPageListDTOList = mapper.pageMyTaskQs(page, terms);
+ return new PageImpl<FrontPageListQSDTO>(frontPageListDTOList, page, total);
}catch (Exception e) {
log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
@@ -769,19 +782,19 @@
}
/**
- * 首页-查询待办任务-受待理
+ * 首页-查询待办任务-待/已受理
* @param page 分页对象
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskSl(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListSLDTO> pageMyTaskSl(PageRequest page, Map<String, Object> terms){
try {
long total = mapper.countMyTaskSl(terms);
- List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskSl(page, terms);
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ List<FrontPageListSLDTO> frontPageListDTOList = mapper.pageMyTaskSl(page, terms);
+ return new PageImpl<FrontPageListSLDTO>(frontPageListDTOList, page, total);
}catch (Exception e) {
- log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
- throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
+ log.error("[CaseTaskService.pageMyTaskSl]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.pageMyTaskSl", e);
}
}
@@ -1577,8 +1590,13 @@
dslCaseTaskPO.setUpdateTime(nowDate);
mapper.updateCaseTask(dslCaseTaskPO);
// 完成当前待受理工作流任务
+ String operation = FlowableConsts.OPERATION_sl;
+ // 配合部门受理条件改为通过
+ if (CaseTaskConsts.CASE_TASK_TYPE_2 == dslCaseTask.getCaseTaskType()) {
+ operation = FlowableConsts.OPERATION_forward;
+ }
FlowNode newFlowNode = flowInfoService.completeTask(dslCaseTask.getFlowableId(), dslCaseTask.getProcessTaskId(),
- FlowableConsts.OPERATION_forward, userId);
+ operation, userId);
// 新建办理反馈任务
CaseTask blfkCaseTask = new CaseTask();
blfkCaseTask.setId(utilsClient.getNewTimeId());
--
Gitblit v1.8.0