From b512f03e1ea30e22209ec5a889d568c45f3e03c9 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Fri, 13 Sep 2024 10:41:03 +0800
Subject: [PATCH] 1、删除经办人 2、规范代码
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 deletions(-)
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..b0354a1 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
@@ -3,13 +3,18 @@
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.FrontPageListDTO;
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 +24,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 +50,9 @@
@Autowired
private CustClientImpl custClient;
+
+ @Autowired
+ private SysClientImpl sysClient;
/**
* 更新对象
@@ -149,9 +159,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 +186,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 +204,46 @@
* @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;
+ }
+
+ /**
+ * 首页查询
+ * @param auditUnitId 审核组织编号
+ * @return long
+ */
+ public long countAssistReview(String auditUnitId){
+ return mapper.countAssistReview(auditUnitId);
+ }
+
+ /**
+ * 首页-待审核条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countMyTaskAssistReview(Map<String, Object> terms){
+ return mapper.countMyTaskAssistReview(terms);
+ }
+
+ /**
+ * 按条件查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return List
+ */
+ public List<FrontPageListDTO> pageMyTaskAssistReview(PageRequest page, Map<String, Object> terms){
+ return mapper.pageMyTaskAssistReview(page, terms);
}
}
--
Gitblit v1.8.0