From 1a34864a39b41159f83c608e72a04f14a1038228 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 21 Sep 2024 20:08:34 +0800
Subject: [PATCH] 新增 1、不予受理流程
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 130 ++++++++++++++++--
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/consts/CaseTaskConsts.java | 3
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseDismiss.java | 8 +
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java | 13 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 21 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseTask.java | 2
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseProcessBaseConstsEnum.java | 15 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java | 178 +++----------------------
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseDismissService.java | 13 +
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java | 5
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseAreaDTO.java | 2
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 2
12 files changed, 200 insertions(+), 192 deletions(-)
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 5d49106..2e5f711 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
@@ -16,7 +16,7 @@
CASE_INFO_PROCESS_1(1, "待受理"),
CASE_INFO_PROCESS_2(2, "化解中"),
CASE_INFO_PROCESS_3(3, "已结案"),
- CASE_INFO_PROCESS_4(3, "不予受理");
+ CASE_INFO_PROCESS_4(4, "不予受理");
/**
@@ -95,18 +95,21 @@
}else if (CaseProcessBaseConstsEnum.CASE_PROCESS_2.getIndex() == caseProcess){
return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_1;
- }if (CaseProcessBaseConstsEnum.CASE_PROCESS_3.getIndex() == caseProcess){
+ }else if (CaseProcessBaseConstsEnum.CASE_PROCESS_3.getIndex() == caseProcess){
return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2;
- }if (CaseProcessBaseConstsEnum.CASE_PROCESS_4.getIndex() == caseProcess){
+ }else if (CaseProcessBaseConstsEnum.CASE_PROCESS_4.getIndex() == caseProcess){
return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2;
- }if (CaseProcessBaseConstsEnum.CASE_PROCESS_5.getIndex() == caseProcess){
+ }else if (CaseProcessBaseConstsEnum.CASE_PROCESS_5.getIndex() == caseProcess){
return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_3;
- }if (CaseProcessBaseConstsEnum.CASE_PROCESS_6.getIndex() == caseProcess){
+ }else if (CaseProcessBaseConstsEnum.CASE_PROCESS_6.getIndex() == caseProcess){
return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_3;
+ }else if (CaseProcessBaseConstsEnum.CASE_PROCESS_7.getIndex() == caseProcess){
+ return CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_4;
+
}else {
return null;
}
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 8c003cf..e3c839e 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
@@ -19,7 +19,7 @@
CASE_PROCESS_4(4, "结案审核"),
CASE_PROCESS_5(5, "当事人评价"),
CASE_PROCESS_6(6, "结案归档"),
- CASE_PROCESS_7(6, "不予受理");
+ CASE_PROCESS_7(7, "不予受理");
/**
@@ -98,21 +98,24 @@
}else if (CaseStatusBaseConstsEnum.CASE_STATUS_2.getIndex() == caseStatus){
return CaseProcessBaseConstsEnum.CASE_PROCESS_2;
- }if (CaseStatusBaseConstsEnum.CASE_STATUS_3.getIndex() == caseStatus){
+ }else if (CaseStatusBaseConstsEnum.CASE_STATUS_3.getIndex() == caseStatus){
return CaseProcessBaseConstsEnum.CASE_PROCESS_2;
- }if (CaseStatusBaseConstsEnum.CASE_STATUS_4.getIndex() == caseStatus){
+ }else if (CaseStatusBaseConstsEnum.CASE_STATUS_4.getIndex() == caseStatus){
return CaseProcessBaseConstsEnum.CASE_PROCESS_3;
- }if (CaseStatusBaseConstsEnum.CASE_STATUS_5.getIndex() == caseStatus){
+ }else if (CaseStatusBaseConstsEnum.CASE_STATUS_5.getIndex() == caseStatus){
return CaseProcessBaseConstsEnum.CASE_PROCESS_4;
- }if (CaseStatusBaseConstsEnum.CASE_STATUS_6.getIndex() == caseStatus){
+ }else if (CaseStatusBaseConstsEnum.CASE_STATUS_6.getIndex() == caseStatus){
return CaseProcessBaseConstsEnum.CASE_PROCESS_5;
- }if (CaseStatusBaseConstsEnum.CASE_STATUS_7.getIndex() == caseStatus){
+ }else if (CaseStatusBaseConstsEnum.CASE_STATUS_7.getIndex() == caseStatus){
return CaseProcessBaseConstsEnum.CASE_PROCESS_6;
+ }else if (CaseStatusBaseConstsEnum.CASE_STATUS_8.getIndex() == caseStatus){
+ return CaseProcessBaseConstsEnum.CASE_PROCESS_7;
+
}else {
return null;
}
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java
index d9ab1b4..a0b580f 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java
@@ -92,6 +92,7 @@
OWNER_TYPE_512("22_00018-512", "上报申请附件"),
OWNER_TYPE_513("22_00018-513", "上报审核附件"),
OWNER_TYPE_514("22_00018-514", "结案审核附件"),
+ OWNER_TYPE_515("22_00018-515", "不予受理附件"),
/**
* 系统材料
@@ -253,6 +254,8 @@
return OWNER_CAT_7.getIndex();
case "22_00018-514":
return OWNER_CAT_7.getIndex();
+ case "22_00018-515":
+ return OWNER_CAT_7.getIndex();
case "22_00018-502":
return OWNER_CAT_9.getIndex();
@@ -399,6 +402,8 @@
return OWNER_TYPE_513;
case "22_00018-514":
return OWNER_TYPE_514;
+ case "22_00018-515":
+ return OWNER_TYPE_515;
case "22_00018-502":
return OWNER_TYPE_502;
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/consts/CaseTaskConsts.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/consts/CaseTaskConsts.java
index d57528a..ff7da81 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/consts/CaseTaskConsts.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/consts/CaseTaskConsts.java
@@ -45,10 +45,11 @@
public static final int TASK_STATUS_2 = 2;
/**
- * 处理结果，1：通过，2：不通过
+ * 处理结果，1：通过，2：不通过，3：不予受理
*/
public static final int HANDLE_RESULT_1 = 1;
public static final int HANDLE_RESULT_2 = 2;
+ public static final int HANDLE_RESULT_3 = 3;
/**
* 配合状态，0：配合，1：回退
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
index 18653a7..30557ef 100644
--- 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
@@ -4,8 +4,12 @@
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.module.cases.domain.po.CaseDismiss;
import cn.huge.module.cases.service.CaseDismissService;
+import cn.huge.module.client.api.impl.SysClientImpl;
+import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -14,6 +18,8 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -36,167 +42,27 @@
@Autowired
private CaseDismissService service;
+ @Autowired
+ private SysClientImpl sysClient;
/**
- * 获取请求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
+ * 根据纠纷编号查询
+ * @url {ctx}/api/web/caseDismiss/getByCaseId
+ * @param caseId 纠纷编号
* @return Object
*/
- @GetMapping("/listQuery")
- public Object listQuery() {
+ @GetMapping("/getByCaseId")
+ public Object getByCaseId(@RequestParam(value = "caseId") String caseId) {
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();
+ CaseDismiss caseDismiss = service.getByCaseId(caseId);
+ Map<String, Object> term = new HashMap<>();
+ term.put("mainId", caseDismiss.getCaseId());
+ term.put("ownerIds", caseDismiss.getId());
+ List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term);
+ if(CollectionUtils.isNotEmpty(fileInfoList)){
+ caseDismiss.setFileInfoList(fileInfoList.get(0).getFileList().get(0).getFileList());
+ }
+ return ReturnSucUtils.getRepInfo(caseDismiss);
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
}
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 2e464ae..fd3767b 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
@@ -8,10 +8,7 @@
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;
-import cn.huge.module.cases.domain.po.CaseTask;
-import cn.huge.module.cases.domain.po.CaseWindupApply;
+import cn.huge.module.cases.domain.po.*;
import cn.huge.module.cases.service.*;
import cn.huge.module.client.api.SysClient;
import cn.huge.module.client.api.impl.CustClientImpl;
@@ -85,6 +82,22 @@
}
/**
+ * web端-不予受理
+ * @url {ctx}/api/web/caseTask/dismiss
+ * @param caseDismiss 不予受理表单
+ * @return Object
+ */
+ @PostMapping("/dismiss")
+ public Object dismiss(@RequestBody CaseDismiss caseDismiss, @CurrentUser String userId) {
+ try {
+ service.webDismiss(caseDismiss, userId);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
* web端-交办
* @url {ctx}/api/web/caseTask/assign
* @param assignTaskDTO 交办表单
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/json/CaseAreaDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseAreaDTO.java
similarity index 88%
rename from dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/json/CaseAreaDTO.java
rename to dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseAreaDTO.java
index 0758558..43afa9b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/json/CaseAreaDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseAreaDTO.java
@@ -1,4 +1,4 @@
-package cn.huge.module.cases.domain.json;
+package cn.huge.module.cases.domain.dto;
import lombok.Data;
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
index 96d23e1..b9e5c89 100644
--- 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
@@ -1,5 +1,6 @@
package cn.huge.module.cases.domain.po;
+import cn.huge.module.sys.dto.FileInfoBaseDTO;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -7,6 +8,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* @title: 纠纷不予受理信息表数据库对应关系类
@@ -105,4 +107,10 @@
@TableField(value = "update_time")
private Date updateTime;
+ /**
+ * 附件列表
+ */
+ @TableField(exist = false)
+ private List<FileInfoBaseDTO> fileInfoList;
+
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseTask.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseTask.java
index 21476e9..ac17ac3 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseTask.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseTask.java
@@ -213,7 +213,7 @@
private String handleUserName;
/**
- * 处理结果，1：通过，2：回退
+ * 处理结果，1：通过，2：不通过，3：不予受理
*/
@TableField(value = "handle_result")
private Integer handleResult;
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
index 7f4ff7f..123279f 100644
--- 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
@@ -7,6 +7,7 @@
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.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -148,4 +149,16 @@
}
}
+ /**
+ * 根据纠纷编号查询
+ * @param caseId 纠纷编号
+ * @return
+ */
+ public CaseDismiss getByCaseId(String caseId){
+ QueryWrapper<CaseDismiss> caseDismissQueryWrapper = new QueryWrapper<>();
+ caseDismissQueryWrapper.eq("case_id", caseId);
+ return mapper.selectOne(caseDismissQueryWrapper);
+ }
+
+
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index 9898560..28e2dba 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -4,7 +4,7 @@
import cn.huge.base.common.utils.*;
import cn.huge.module.cases.domain.dto.*;
-import cn.huge.module.cases.domain.json.CaseAreaDTO;
+import cn.huge.module.cases.domain.dto.CaseAreaDTO;
import cn.huge.module.cases.domain.po.CaseAgent;
import cn.huge.module.cases.domain.po.CaseInfoUnfold;
import cn.huge.module.cases.domain.po.CasePerson;
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 156d9b8..836d681 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
@@ -97,15 +97,8 @@
private CaseEvaluateService caseEvaluateService;
@Autowired
private CaseAssistInfoService caseAssistInfoService;
-
@Autowired
- private CaseWindupApplyMapper caseWindupApplyMapper;
- @Autowired
- private CaseReturnMapper caseReturnMapper;
- @Autowired
- private CaseAppearMapper caseAppearMapper;
- @Autowired
- private CaseAssistApplyMapper caseAssistApplyMapper;
+ private CaseDismissService caseDismissService;
/**
* 更新对象
@@ -195,6 +188,20 @@
log.error("[CaseTaskService.saveCaseTask]调用失败，异常信息："+e, e);
throw new ServiceException("CaseTaskService.saveCaseTask", e);
}
+ }
+
+ /**
+ * 根据纠纷编号查询进行中的配合部门任务
+ * @param caseId
+ * @return
+ */
+ public List<CaseTask> listAssistTasking(String caseId){
+ // 查询配合部门的任务
+ QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
+ caseTaskQueryWrapper.eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).eq("case_id", caseId)
+ .eq("status", CaseTaskConsts.TASK_STATUS_1);
+ List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
+ return assistCaseTaskList;
}
/**
@@ -532,6 +539,10 @@
// 临时加上
webCaseFlowDTO.setHandleNotes("化解结果："+webCaseFlowDTO.getMediResultName());
}
+ }
+ // 不予受理
+ if (CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
+ webCaseFlowDTO.setNodeShowName("不予受理");
}
handleCaseFlowList.add(webCaseFlowDTO);
}else {
@@ -1290,6 +1301,78 @@
}
/**
+ * web端任务处理-不予受理
+ * @param caseDismiss 不予受理表单
+ * @param userId 当前登录用户
+ */
+ public void webDismiss(CaseDismiss caseDismiss, String userId){
+ try{
+ Date nowDate = DateUtils.getNowDate();
+ // 获取当前登录用户
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ // 查询当前任务
+ CaseTask caseTask = mapper.selectById(caseDismiss.getCaseTaskId());
+ // 结束当前任务
+ CaseTask caseTaskPO = new CaseTask();
+ caseTaskPO.setId(caseDismiss.getCaseTaskId());
+ caseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ caseTaskPO.setHandleUnitId(loginUser.getUnitId());
+ caseTaskPO.setHandleUnitName(loginUser.getUnitName());
+ caseTaskPO.setHandleUserId(loginUser.getId());
+ caseTaskPO.setHandleUserName(loginUser.getTrueName());
+ caseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_3);
+ caseTaskPO.setHandleContent(caseDismiss.getDisContent());
+ caseTaskPO.setHandleTime(nowDate);
+ caseTaskPO.setUpdateTime(nowDate);
+ mapper.updateCaseTask(caseTaskPO);
+ // 结束当前工作流任务
+ flowInfoService.endFlow(caseTask.getProcessInstanceId());
+ // 更新纠纷信息
+ CaseInfo caseInfoPO = new CaseInfo();
+ caseInfoPO.setId(caseTask.getCaseId());
+ caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_8.getIndex());
+ caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_8.getDes());
+ caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
+ caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
+ caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
+ caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
+ caseInfoPO.setUpdateTime(nowDate);
+ caseInfoService.updateCaseInfo(caseInfoPO);
+ // 有配合部门，也结束配合部门工作流程
+ List<CaseTask> assistCaseTaskList = this.listAssistTasking(caseDismiss.getCaseId());
+ for (CaseTask assistCaseTask: assistCaseTaskList){
+ // 完成配合部门当前任务
+ assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ assistCaseTask.setHandleUnitId(loginUser.getUnitId());
+ assistCaseTask.setHandleUnitName(loginUser.getUnitName());
+ assistCaseTask.setHandleUserId(loginUser.getId());
+ assistCaseTask.setHandleUserName(loginUser.getTrueName());
+ assistCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
+ assistCaseTask.setHandleTime(nowDate);
+ assistCaseTask.setUpdateTime(nowDate);
+ mapper.updateCaseTask(assistCaseTask);
+ // 结束配合部门当前工作流任务
+ flowInfoService.endFlow(assistCaseTask.getProcessInstanceId());
+ }
+ // 新增不予受理信息
+ caseDismiss.setCaseTaskTime(caseTask.getCreateTime());
+ caseDismiss.setDisUnitId(loginUser.getUnitId());
+ caseDismiss.setDisUnitName(loginUser.getUnitName());
+ caseDismiss.setDisUserId(loginUser.getId());
+ caseDismiss.setDisUserName(loginUser.getTrueName());
+ caseDismiss.setDisTime(nowDate);
+ caseDismiss.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ caseDismiss.setCustId(caseTask.getCustId());
+ caseDismiss.setCreateTime(nowDate);
+ caseDismiss.setUpdateTime(nowDate);
+ caseDismissService.save(caseDismiss);
+ }catch (Exception e){
+ log.error("[CaseTaskService.webAssign]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseTaskService.webAssign", e);
+ }
+ }
+
+ /**
* web端任务处理-交办
* @param assignTaskDTO 交办任务表单
* @param userId 当前登录用户
@@ -1383,6 +1466,7 @@
caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
+ caseInfoPO.setUpdateTime(nowDate);
caseInfoService.updateCaseInfo(caseInfoPO);
// 分派配合组织
if (CollectionUtils.isNotEmpty(assignTaskDTO.getAssistUnitList())){
@@ -1605,6 +1689,7 @@
caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
+ caseInfoPO.setUpdateTime(nowDate);
caseInfoService.updateCaseInfo(caseInfoPO);
// 更新纠纷扩展信息
CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
@@ -1869,12 +1954,9 @@
caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
}
// 查询配合部门的任务，全部结束流程
- QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
- caseTaskQueryWrapper.eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).eq("case_id", jasqCaseTask.getCaseId());
- List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
+ List<CaseTask> assistCaseTaskList = this.listAssistTasking(jasqCaseTask.getCaseId());
for (CaseTask assistCaseTask: assistCaseTaskList){
- // 完成配合部门当前办理反馈任务
- assistCaseTask.setId(caseWindupApply.getCaseTaskId());
+ // 完成配合部门当前任务
assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
assistCaseTask.setHandleUnitId(loginUser.getUnitId());
assistCaseTask.setHandleUnitName(loginUser.getUnitName());
@@ -1884,10 +1966,8 @@
assistCaseTask.setHandleTime(nowDate);
assistCaseTask.setUpdateTime(nowDate);
mapper.updateCaseTask(assistCaseTask);
- // 完成当前配合部门办理反馈工作流任务
- flowInfoService.completeTask(assistCaseTask.getFlowableId(), assistCaseTask.getProcessTaskId(),
- FlowableConsts.OPERATION_forward, userId);
-
+ // 结束配合部门当前工作流任务
+ flowInfoService.endFlow(assistCaseTask.getProcessInstanceId());
}
}catch (Exception e){
log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e);
@@ -2210,6 +2290,22 @@
caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
caseInfoPO.setUpdateTime(nowDate);
caseInfoService.updateCaseInfo(caseInfoPO);
+ // 有配合部门，也结束配合部门工作流程
+ List<CaseTask> assistCaseTaskList = this.listAssistTasking(htshCaseTask.getCaseId());
+ for (CaseTask assistCaseTask: assistCaseTaskList){
+ // 完成配合部门当前任务
+ assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ assistCaseTask.setHandleUnitId(loginUser.getUnitId());
+ assistCaseTask.setHandleUnitName(loginUser.getUnitName());
+ assistCaseTask.setHandleUserId(loginUser.getId());
+ assistCaseTask.setHandleUserName(loginUser.getTrueName());
+ assistCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
+ assistCaseTask.setHandleTime(nowDate);
+ assistCaseTask.setUpdateTime(nowDate);
+ mapper.updateCaseTask(assistCaseTask);
+ // 结束配合部门当前工作流任务
+ flowInfoService.endFlow(assistCaseTask.getProcessInstanceId());
+ }
}else {
// 更新联合处置信息
QueryWrapper<CaseAssistInfo> caseAssistInfoQueryWrapper = new QueryWrapper<>();
--
Gitblit v1.8.0