From 8d642e0225cfeed0da8b916618c7139c9a98ec4c Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Thu, 12 Sep 2024 11:33:07 +0800
Subject: [PATCH] 联合处置申请接口
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAssistApplyWebController.java | 17 ++++++++++++++++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java | 32 ++++++++++++++++++++++++++------
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseAssistApply.java | 5 +++--
3 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAssistApplyWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAssistApplyWebController.java
index d70c0a7..a10c730 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAssistApplyWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAssistApplyWebController.java
@@ -5,6 +5,7 @@
import cn.huge.base.config.CurrentUser;
import cn.huge.module.cases.domain.po.CaseAssistApply;
import cn.huge.module.cases.service.CaseAssistApplyService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -264,7 +265,7 @@
/**
* 审核联合审核
- * @url {ctx}/api/web/caseAssistApply/addCaseAssistApply
+ * @url {ctx}/api/web/caseAssistApply/reviewCaseAssistApply
* @param caseAssistApply 实体对象
* @return Object
*/
@@ -278,4 +279,18 @@
}
}
+ /**
+ * 根据案件编号查询联合处置申请
+ * @url {ctx}/api/web/caseAssistApply/getByCaseId
+ * @param caseId 主键编号
+ * @return Object
+ */
+ @GetMapping("/getByCaseId")
+ public Object getByCaseId(@RequestParam(value = "caseId") String caseId) {
+ try {
+ return ReturnSucUtils.getRepInfo(service.caseAssistApplyByCaseId(caseId));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseAssistApply.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseAssistApply.java
index 9da09ba..112c866 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseAssistApply.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseAssistApply.java
@@ -1,5 +1,6 @@
package cn.huge.module.cases.domain.po;
+import cn.huge.module.sys.dto.FileInfoBaseDTO;
import cn.huge.module.sys.dto.FileTypeInfoBaseDTO;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -134,7 +135,7 @@
* 审核理由
*/
@TableField(value = "audit__content")
- private String audit_content;
+ private String auditContent;
/**
* 删除状态，0：未删除，1：已删除
@@ -162,5 +163,5 @@
private Date updateTime;
@TableField(exist = false)
- private List<FileTypeInfoBaseDTO> fileTypeInfoBaseDTOList;
+ private List<FileInfoBaseDTO> fileInfoBaseDTOList;
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
index b823f72..bde0bd2 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
@@ -4,12 +4,16 @@
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
import cn.huge.module.client.api.impl.CustClientImpl;
+import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseAssistApplyMapper;
import cn.huge.module.cases.domain.po.CaseAssistApply;
+import cn.huge.module.cust.dto.CtUnitDTO;
import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.sys.dto.FileIdInfoBaseDTO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import lombok.extern.slf4j.Slf4j;
@@ -19,8 +23,10 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @title: 联合处置申请信息表业务逻辑处理
@@ -43,6 +49,9 @@
@Autowired
private CustClientImpl custClient;
+
+ @Autowired
+ private SysClientImpl sysClient;
/**
* 更新对象
@@ -149,9 +158,14 @@
caseAssistApply.setApplyUserId(loginUser.getId());
caseAssistApply.setApplyUserName(loginUser.getTrueName());
caseAssistApply.setApplyStatus(0);
+ caseAssistApply.setDeleteStatus(0);
+ caseAssistApply.setApplyTime(now);
caseAssistApply.setCreateTime(now);
caseAssistApply.setUpdateTime(now);
//todo 添加任务
+ CtUnitDTO ctUnitDTO = custClient.getParentZzzxUnit(loginUser.getUnitId());
+ caseAssistApply.setAuditUnitId(ctUnitDTO.getId());
+ caseAssistApply.setAuditUnitName(ctUnitDTO.getUnitName());
mapper.insert(caseAssistApply);
}catch (Exception e){
@@ -171,8 +185,6 @@
Date now = DateUtils.getNowDate();
caseAssistApply.setApplyStatus(1);
- caseAssistApply.setAuditUnitId(loginUser.getUnitId());
- caseAssistApply.setAuditUnitName(loginUser.getUnitName());
caseAssistApply.setAuditUserId(loginUser.getId());
caseAssistApply.setAuditUserName(loginUser.getTrueName());
caseAssistApply.setAuditTime(now);
@@ -191,10 +203,18 @@
* @param caseId 条件
* @return long
*/
- public List<CaseAssistApply> listCaseAssistApplyByCaseId(String caseId){
+ public CaseAssistApply caseAssistApplyByCaseId(String caseId){
QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
- caseAssistApplyQueryWrapper.eq("case_id", caseId).orderByDesc("create_time");
- List<CaseAssistApply> caseAssistApplyList = mapper.selectList(caseAssistApplyQueryWrapper);
- return caseAssistApplyList;
+ caseAssistApplyQueryWrapper.eq("case_id", caseId).eq("apply_status", 0)
+ .orderByDesc("create_time");
+ CaseAssistApply caseAssistApply = mapper.selectOne(caseAssistApplyQueryWrapper);
+ Map<String, Object> terms = new HashMap<>();
+ terms.put("mainId", caseId);
+ terms.put("ownerIds", "'" + caseAssistApply.getId() + "'");
+ List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms);
+ if(CollectionUtils.isNotEmpty(fileIdInfoBaseDTOList)){
+ caseAssistApply.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList());
+ }
+ return caseAssistApply;
}
}
--
Gitblit v1.8.0