From b0b1e641a31a0494262187f97034807fc53515dd Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 28 Oct 2024 15:49:39 +0800
Subject: [PATCH] Merge branch 'gzdyh_test' into gzdyh_grid
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java
index d9cb6d9..6e19dc5 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java
@@ -169,8 +169,8 @@
*/
public Map<String, Object> getFeedbackInfo(String caseId, String caseTaskId, String userId){
Map<String, Object> result = Maps.newHashMap();
- CaseTask caseTask = caseTaskService.getById(caseTaskId);
CaseInfoUnfold caseInfoUnfold = unfoldService.getById(caseId);
+ CaseTask caseTask = caseTaskService.getById(caseTaskId);
// 承办部门查询扩展表
if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
if (ObjectUtils.isNotEmpty(caseInfoUnfold)) {
@@ -245,8 +245,14 @@
Date nowDate = DateUtils.getNowDate();
caseFeedback.setUpdateTime(nowDate);
caseFeedback.setCreateTime(nowDate);
- //todo 承办、配合--查询task
-
+ QueryWrapper<CaseInfoUnfold> caseInfoUnfoldQueryWrapper = new QueryWrapper<>();
+ caseInfoUnfoldQueryWrapper.eq("id", caseFeedback.getCaseId());
+ CaseInfoUnfold caseInfoUnfold = unfoldService.getOne(caseInfoUnfoldQueryWrapper);
+ if(caseInfoUnfold.getMediateUnitId().equals(loginUser.getUnitId())){
+ caseFeedback.setHandleType(CaseTaskConsts.HANDLE_TYPE_1);
+ }else{
+ caseFeedback.setHandleType(CaseTaskConsts.HANDLE_TYPE_2);
+ }
this.save(caseFeedback);
}catch (Exception e){
log.error("[caseFeedbackService.savecaseFeedback]调用失败，异常信息："+e, e);
@@ -276,10 +282,9 @@
caseFeedback.setHandleUnitName(loginUser.getUnitName());
caseFeedback.setHandleUserId(loginUser.getId());
caseFeedback.setHandleUserName(loginUser.getTrueName());
- caseFeedback.setId(utilsClient.getNewTimeId());
+// caseFeedback.setId(utilsClient.getNewTimeId());
+ caseFeedback.setHandleType(caseFeedback1.getHandleType());
caseFeedback.setUpdateTime(nowDate);
- //todo 承办、配合--查询task
-
mapper.updateById(caseFeedback);
}catch (Exception e){
log.error("[caseFeedbackService.updateFeedback]调用失败，异常信息："+e, e);
--
Gitblit v1.8.0