From df5414b84bf33c55a3aab890baaa0bd8eabcd70c Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 13:01:50 +0800
Subject: [PATCH] 1、工作台-全部已办、事项草稿数量统计
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 576 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 343 insertions(+), 233 deletions(-)
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..5eaa724 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
@@ -22,6 +22,8 @@
import cn.huge.module.cust.constant.UserBaseConsts;
import cn.huge.module.cust.dto.CtUnitDTO;
import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.draft.domain.po.CasedraftInfo;
+import cn.huge.module.draft.service.CasedraftInfoService;
import cn.huge.module.mediate.constant.AuditBaseConsts;
import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
import cn.huge.module.disp.constant.DispBaseConstsEnum;
@@ -97,15 +99,10 @@
private CaseEvaluateService caseEvaluateService;
@Autowired
private CaseAssistInfoService caseAssistInfoService;
-
@Autowired
- private CaseWindupApplyMapper caseWindupApplyMapper;
+ private CaseDismissService caseDismissService;
@Autowired
- private CaseReturnMapper caseReturnMapper;
- @Autowired
- private CaseAppearMapper caseAppearMapper;
- @Autowired
- private CaseAssistApplyMapper caseAssistApplyMapper;
+ private CasedraftInfoService casedraftInfoService;
/**
* 更新对象
@@ -198,6 +195,20 @@
}
/**
+ * 根据纠纷编号查询进行中的配合部门任务
+ * @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;
+ }
+
+ /**
* web端-任务出来页面-初始化tab和按钮
* @param caseTaskId
* @return
@@ -216,9 +227,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("回退审核");
@@ -237,6 +248,9 @@
TabButtonInfoDTO daxx = new TabButtonInfoDTO();
daxx.setId("daxx");
daxx.setName("档案信息");
+ TabButtonInfoDTO byslxq = new TabButtonInfoDTO();
+ byslxq.setId("byslxq");
+ byslxq.setName("详情");
// 定义button
TabButtonInfoDTO tjbljl = new TabButtonInfoDTO();
@@ -266,137 +280,154 @@
TabButtonInfoDTO sb = new TabButtonInfoDTO();
sb.setId("sb");
sb.setName("上报");
+ TabButtonInfoDTO bysl = new TabButtonInfoDTO();
+ bysl.setId("bysl");
+ bysl.setName("不予受理");
// 根据流程显示tab
List<TabButtonInfoDTO> tabList = new LinkedList<>();
// 根据流程显示button
List<TabButtonInfoDTO> buttonList = new LinkedList<>();
if (ObjectUtils.isNotEmpty(caseTask)) {
- if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
-// tabList.add(sqjl);
+ // 不予受理
+ if (ObjectUtils.isNotEmpty(caseTask.getHandleResult()) && CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
+ tabList.add(byslxq);
+ tabList.add(sqjl);
- buttonList.add(zxsl);
- buttonList.add(jb);
- buttonList.add(sb);
- }
- if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
-// tabList.add(sqjl);
+ }else {
+ // 正常流程
+ if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
+ tabList.add(dslxq);
+ tabList.add(sqjl);
- buttonList.add(sl);
- buttonList.add(ht);
- }
- if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
- sxxq.setName("详情");
- tabList.add(sxxq);
-// 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(sbsh);
- }
- if (FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
-// tabList.add(sqjl);
-
- buttonList.add(zxsl);
- buttonList.add(jb);
- buttonList.add(sb);
- }
- if (FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
-// tabList.add(sqjl);
-
- buttonList.add(sl);
- buttonList.add(ht);
- }
- if (FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
- sxxq.setName("详情");
- tabList.add(sxxq);
-// 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(sbsh);
- }
- if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
-// tabList.add(sqjl);
-
- buttonList.add(zxsl);
- buttonList.add(jb);
- }
- if (FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
-// tabList.add(sqjl);
-
- buttonList.add(sl);
- buttonList.add(ht);
- }
- if (FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
- sxxq.setName("详情");
- tabList.add(sxxq);
-// tabList.add(sqjl);
- tabList.add(htsh);
- }
- if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
- if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
- tabList.add(sxxq);
- tabList.add(sxbl);
- tabList.add(lcdb);
-// tabList.add(sqjl);
-
- buttonList.add(tjbljl);
- buttonList.add(lhczsq);
- buttonList.add(jasq);
- buttonList.add(db);
- }else {
- tabList.add(sxxq);
- tabList.add(sxbl);
- tabList.add(lcdb);
-// tabList.add(sqjl);
-
- buttonList.add(tjbljl);
+ buttonList.add(zxsl);
+ buttonList.add(jb);
+ buttonList.add(sb);
+ buttonList.add(bysl);
}
- }
- if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(sxxq);
-// 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);
- }
- if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(daxx);
- tabList.add(lcdb);
-// tabList.add(sqjl);
- }
- if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
-// tabList.add(sqjl);
+ if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
+ tabList.add(dslxq);
+ tabList.add(sqjl);
- buttonList.add(sl);
- buttonList.add(ht);
- }
- if (FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
- sxxq.setName("详情");
- tabList.add(sxxq);
-// tabList.add(sqjl);
- tabList.add(htsh);
+ 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(htsh);
+ }
+ if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
+ sxxq.setName("详情");
+ tabList.add(sxxq);
+ tabList.add(sqjl);
+ tabList.add(sbsh);
+ }
+ if (FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())) {
+ tabList.add(dslxq);
+ 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);
+
+ 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(htsh);
+ }
+ if (FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
+ sxxq.setName("详情");
+ tabList.add(sxxq);
+ tabList.add(sqjl);
+ tabList.add(sbsh);
+ }
+ if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
+ tabList.add(dslxq);
+ 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);
+
+ 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(htsh);
+ }
+ if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
+ if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
+ tabList.add(sxxq);
+ tabList.add(sxbl);
+ tabList.add(lcdb);
+ tabList.add(sqjl);
+
+ buttonList.add(tjbljl);
+ buttonList.add(lhczsq);
+ buttonList.add(jasq);
+ buttonList.add(db);
+ } else {
+ tabList.add(sxxq);
+ tabList.add(sxbl);
+ tabList.add(lcdb);
+ tabList.add(sqjl);
+
+ buttonList.add(tjbljl);
+ }
+ }
+ if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
+ tabList.add(sxxq);
+ 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);
+ }
+ if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(caseTask.getNodeId())) {
+ tabList.add(daxx);
+ tabList.add(lcdb);
+ tabList.add(sqjl);
+ }
+ if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
+ tabList.add(dslxq);
+ tabList.add(sqjl);
+
+ buttonList.add(sl);
+ buttonList.add(ht);
+ }
+ if (FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
+ sxxq.setName("详情");
+ tabList.add(sxxq);
+ tabList.add(sqjl);
+ tabList.add(htsh);
+ }
}
}else {
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(lhczsh);
}
// 封装数据
@@ -523,6 +554,12 @@
// 临时加上
webCaseFlowDTO.setHandleNotes("化解结果："+webCaseFlowDTO.getMediResultName());
}
+ }
+ // 不予受理
+ if (CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
+ webCaseFlowDTO.setNodeShowName("不予受理");
+ webCaseFlowDTO.setHandleNotes(null);
+ webCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_4);
}
handleCaseFlowList.add(webCaseFlowDTO);
}else {
@@ -726,6 +763,16 @@
long countAppearReview = caseAppearService.countAppearReview(loginUser.getUnitId());
long countAssistReview = caseAssistApplyService.countAssistReview(loginUser.getUnitId());
frontPageCountDTO.setWaitReview(countApplyReview+countReturnReview+countAppearReview+countAssistReview);
+ // 已办
+ Map<String, Object> ybTerms = new HashMap<>();
+ ybTerms.put("handleUnitId", loginUser.getUnitId());
+ long alreadyDone = mapper.countMyTaskYb(ybTerms);
+ frontPageCountDTO.setAlreadyDone(alreadyDone);
+ // 已办
+ Map<String, Object> cgTerms = new HashMap<>();
+ cgTerms.put("inputUnitId", loginUser.getUnitId());
+ long caseDraft = casedraftInfoService.countTerms(cgTerms);
+ frontPageCountDTO.setCaseDraft(caseDraft);
return frontPageCountDTO;
}catch (Exception e) {
log.error("[CaseTaskService.getCountList]调用失败，异常信息：" + e, e);
@@ -734,16 +781,16 @@
}
/**
- * 首页-查询待办任务-受分派
+ * 首页-查询待办任务-待/已分派
* @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);
+ return new PageImpl<FrontPageListFPDTO>(frontPageListFPDTOList, page, total);
}catch (Exception e) {
log.error("[CaseTaskService.pageMyTaskFp]调用失败，异常信息：" + e, e);
throw new ServiceException("CaseTaskService.pageMyTaskFp", e);
@@ -752,16 +799,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 +816,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);
}
}
@@ -791,39 +838,22 @@
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListBLZDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
try {
- long total = mapper.countMyTaskProcessing(terms);
- List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskProcessing(page, terms);
- List<String> caseIdList = new ArrayList<>();
+ long total = mapper.countMyTaskBlz(terms);
+ List<FrontPageListBLZDTO> frontPageListBLZDTOList = mapper.pageMyTaskBlz(page, terms);
Date now = DateUtils.getNowDate();
- for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
- long milliseconds1 = frontPageListDTO.getTurnaroundTime().getTime();
+ for(FrontPageListBLZDTO frontPageListBLZDTO: frontPageListBLZDTOList){
+ long milliseconds1 = frontPageListBLZDTO.getTurnaroundTime().getTime();
long milliseconds2 = now.getTime();
long diff = milliseconds2 - milliseconds1;
long daysBetween = diff / (24 * 60 * 60 * 1000);
- frontPageListDTO.setProcessingDays(daysBetween);
- caseIdList.add(frontPageListDTO.getCaseId());
+ frontPageListBLZDTO.setProcessingDays(daysBetween);
}
- if(CollectionUtils.isNotEmpty(caseIdList)){
- QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
- unfoldQueryWrapper.in("id", caseIdList);
- List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
- for(CaseInfoUnfold unfold: unfoldList){
- for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
- if(frontPageListDTO.getCaseId().equals(unfold.getId())){
- frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
- frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
- frontPageListDTO.setManager(unfold.getMediator());
- }
- }
- }
- }
-
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ return new PageImpl<FrontPageListBLZDTO>(frontPageListBLZDTOList, page, total);
}catch (Exception e) {
- log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
- throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
+ log.error("[CaseTaskService.pageMyTaskBlz]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.pageMyTaskBlz", e);
}
}
@@ -833,30 +863,14 @@
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskBl(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListJADTO> pageMyTaskJa(PageRequest page, Map<String, Object> terms){
try {
- long total = caseWindupApplyService.countMySubmitApplyReview(terms);
- List<FrontPageListDTO> frontPageListDTOList = caseWindupApplyService.listMySubmitApplyReview(page, terms);
-
- List<String> caseIdList = new ArrayList<>();
- caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList());
- if(CollectionUtils.isNotEmpty(caseIdList)){
- QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
- unfoldQueryWrapper.in("id", caseIdList);
- List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
- for(CaseInfoUnfold unfold: unfoldList){
- for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
- if(frontPageListDTO.getCaseId().equals(unfold.getId())){
- frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
- frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
- }
- }
- }
- }
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ long total = caseWindupApplyService.countMyTaskJa(terms);
+ List<FrontPageListJADTO> frontPageListJADTOList = caseWindupApplyService.listMyTaskJa(page, terms);
+ return new PageImpl<FrontPageListJADTO>(frontPageListJADTOList, page, total);
}catch (Exception e) {
- log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
- throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
+ log.error("[CaseTaskService.pageMyTaskJa]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.pageMyTaskJa", e);
}
}
@@ -896,14 +910,11 @@
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskShWSQD(PageRequest page, int type, Map<String, Object> terms){
+ public Page<FrontPageListWSQDDTO> pageMyTaskShWSQD(PageRequest page, Map<String, Object> terms){
try {
- long total = 0;
- List<FrontPageListDTO> frontPageListDTOList = new ArrayList<>();
- total = mapper.countMyTaskShWSQD(terms);
- frontPageListDTOList = mapper.pageMyTaskShWSQD(page,terms);
-
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ long total = mapper.countMyTaskShWSQD(terms);
+ List<FrontPageListWSQDDTO> frontPageListWSQDDTOList = mapper.pageMyTaskShWSQD(page,terms);
+ return new PageImpl<FrontPageListWSQDDTO>(frontPageListWSQDDTOList, page, total);
}catch (Exception e) {
log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
@@ -934,16 +945,18 @@
List<CaseAssistApply>caseAssistApplyList = caseAssistApplyService.list(caseAssistApplyQueryWrapper);
List<SortUtilDTO> sortUtilDTOList = new ArrayList<>();
+ List<String> idList = new ArrayList<>();
String ids = new String();
- ids += caseReturnList.stream().map(CaseReturn:: getId).collect(Collectors.joining(","));
- ids += caseAppearList.stream().map(CaseAppear:: getId).collect(Collectors.joining(","));
- ids += caseWindupApplyList.stream().map(CaseWindupApply:: getId).collect(Collectors.joining(","));
- ids += caseAssistApplyList.stream().map(CaseAssistApply:: getId).collect(Collectors.joining(","));
+ idList.addAll(caseReturnList.stream().map(CaseReturn:: getId).collect(Collectors.toList()));
+ idList.addAll(caseAppearList.stream().map(CaseAppear:: getId).collect(Collectors.toList()));
+ idList.addAll(caseWindupApplyList.stream().map(CaseWindupApply:: getId).collect(Collectors.toList()));
+ idList.addAll(caseAssistApplyList.stream().map(CaseAssistApply:: getId).collect(Collectors.toList()));
+ ids = idList.stream().map(String::valueOf).collect(Collectors.joining("','"));
List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = new ArrayList<>();
if(StringUtils.isNotBlank(ids)){
Map terms = new HashMap();
terms.put("mainId", caseId);
- terms.put("ownerIds", "," + ids + ",");
+ terms.put("ownerIds", "'" + ids + "'");
fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(terms);
}
@@ -1310,6 +1323,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 当前登录用户
@@ -1403,13 +1488,14 @@
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())){
// 拼接配合组织编号和名称
String assistUnitId = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
collect(Collectors.joining(BaseConsts.COMMA));
- String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
+ String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitName).
collect(Collectors.joining(BaseConsts.COMMA));
for (AssignAssistUnitDTO assignAssistUnitDTO: assignTaskDTO.getAssistUnitList()){
// 启动联合处置工作流
@@ -1577,8 +1663,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());
@@ -1620,6 +1711,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();
@@ -1880,17 +1972,13 @@
caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
- caseInfoUnfoldPO.setCloseTime(nowDate);
caseInfoUnfoldPO.setUpdateTime(nowDate);
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());
@@ -1900,10 +1988,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);
@@ -1994,12 +2080,6 @@
// 更新纠纷扩展信息
CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
caseInfoUnfoldPO.setId(dsrpjCaseTask.getCaseId());
- caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
- caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
- caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
- caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
- caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
- caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
caseInfoUnfoldPO.setCloseTime(nowDate);
caseInfoUnfoldPO.setUpdateTime(nowDate);
caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
@@ -2062,18 +2142,6 @@
caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
caseInfoPO.setUpdateTime(nowDate);
caseInfoService.updateCaseInfo(caseInfoPO);
- // 更新纠纷扩展信息
- CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
- caseInfoUnfoldPO.setId(blfkCaseTask.getCaseId());
- caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
- caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
- caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
- caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
- caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
- caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
- caseInfoUnfoldPO.setCloseTime(nowDate);
- caseInfoUnfoldPO.setUpdateTime(nowDate);
- caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
}
}catch (Exception e){
log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e);
@@ -2244,6 +2312,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<>();
@@ -2530,4 +2614,30 @@
}
}
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<SignTaskDTO> listIdByTerms(Map<String, Object> terms){
+ return mapper.listIdByTerms(terms);
+ }
+
+ /**
+ * web端-工作台-已办事项
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<FrontPageListYBDTO> pageMyTaskYb(PageRequest page, Map<String, Object> terms){
+ try {
+ long total = mapper.countMyTaskYb(terms);
+ List<FrontPageListYBDTO> frontPageListYBDTOList = mapper.pageMyTaskYb(page, terms);
+ return new PageImpl<FrontPageListYBDTO>(frontPageListYBDTOList, page, total);
+ }catch (Exception e) {
+ log.error("[CaseTaskService.pageMyTaskYb]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.pageMyTaskYb", e);
+ }
+ }
+
}
--
Gitblit v1.8.0