From d015cc0b48ca51a2b93b6c60c91dc352a104b1e7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 九月 2024 10:41:50 +0800
Subject: [PATCH] 删除密码加密
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDutyWorkApproveServiceImpl.java | 121 +++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 21 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDutyWorkApproveServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDutyWorkApproveServiceImpl.java
index 0f3ced2..bdfa9ee 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDutyWorkApproveServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDutyWorkApproveServiceImpl.java
@@ -1,32 +1,41 @@
package com.gkhy.safePlatform.targetDuty.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.commons.co.ContextCacheUser;
-import com.gkhy.safePlatform.targetDuty.enums.TargetDutyResultCodes;
-import com.gkhy.safePlatform.targetDuty.excepiton.TargetDutyException;
-import com.gkhy.safePlatform.targetDuty.model.dto.resp.ListCheckDataDto;
-import com.gkhy.safePlatform.targetDuty.repository.TargetDutyWorkApproveRepository;
-import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove;
-import com.gkhy.safePlatform.targetDuty.service.CommonService;
-import com.gkhy.safePlatform.targetDuty.service.TargetDutyWorkApproveService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.targetDuty.entity.TargetDivideDetail;
+import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove;
+import com.gkhy.safePlatform.targetDuty.enums.TargetDutyResultCodes;
+import com.gkhy.safePlatform.targetDuty.excepiton.TargetDutyException;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDutyWorkApproveQueryCriteria;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.ListCheckDataDto;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetApproveDivideDetailDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDutyWorkApproveDto;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.WorkApproveRelateDesc;
+import com.gkhy.safePlatform.targetDuty.service.CommonService;
+import com.gkhy.safePlatform.targetDuty.service.TargetDutyWorkApproveService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.TargetDivideDetailBaseService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.TargetDutyWorkApproveBaseService;
import com.gkhy.safePlatform.targetDuty.utils.QueryHelpPlus;
-import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
+import java.io.Serializable;
import java.sql.Timestamp;
import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 目标责任管理工作流审批表(TargetDutyWorkApprove)表服务实现类
@@ -35,24 +44,28 @@
* @since 2022-08-11 10:13:37
*/
@Service("targetDutyWorkApproveService")
-public class TargetDutyWorkApproveServiceImpl extends ServiceImpl<TargetDutyWorkApproveRepository, TargetDutyWorkApprove> implements TargetDutyWorkApproveService {
+public class TargetDutyWorkApproveServiceImpl implements TargetDutyWorkApproveService {
@Autowired
- private TargetDutyWorkApproveRepository targetDutyWorkApproveRepository;
+ private TargetDutyWorkApproveBaseService targetDutyWorkApproveBaseService;
@Resource
private CommonService commonService;
+
+ @Autowired
+ private TargetDivideDetailBaseService targetDivideDetailBaseService;
@Override
public ResultVO queryAll(PageQuery<TargetDutyWorkApproveQueryCriteria> pageQuery) {
+ PageUtils.checkCheck(pageQuery);
Long pageIndex = pageQuery.getPageIndex();
Long pageSize = pageQuery.getPageSize();
IPage<TargetDutyWorkApprove> page = new Page<>(pageIndex, pageSize);
QueryWrapper queryWrapper = QueryHelpPlus.getPredicate(TargetDutyWorkApprove.class, pageQuery.getSearchParams());
- queryWrapper.eq("delFlag","0");
- page = baseMapper.selectPage(page,queryWrapper);
+ queryWrapper.eq("del_flag","0");
+ page = targetDutyWorkApproveBaseService.selectPage(page,queryWrapper);
List<TargetDutyWorkApproveDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetDutyWorkApproveDto.class);
return new SearchResultVO<>(
@@ -68,7 +81,7 @@
@Override
public List<TargetDutyWorkApprove> queryAll(TargetDutyWorkApproveQueryCriteria criteria) {
- return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetDutyWorkApprove.class, criteria));
+ return targetDutyWorkApproveBaseService.queryAll( criteria);
}
@Override
@@ -92,7 +105,7 @@
addInfo.setApproveResult(null);
addInfo.setApproveMemo(null);
addInfo.setSort(addInfo.getSort()+1);
- targetDutyWorkApproveRepository.insert(addInfo);
+ targetDutyWorkApproveBaseService.save(addInfo);
}
// 更新原审批记录
@@ -104,7 +117,7 @@
updateInfo.setApproveResult(targetDutyWorkApprove.getApproveResult());
updateInfo.setApproveMemo(targetDutyWorkApprove.getApproveMemo());
updateInfo.setChildId(addInfo.getId());
- targetDutyWorkApproveRepository.updateById(updateInfo);
+ targetDutyWorkApproveBaseService.updateById(updateInfo);
}
@Override
@@ -116,6 +129,10 @@
// 业务主表id
if (targetDutyWorkApprove.getRelateId()==null){
throw new TargetDutyException(TargetDutyResultCodes.APPROVE_RELATE_TYPE_NULL);
+ }
+ // 关联业务json
+ if (!StringUtils.hasText(targetDutyWorkApprove.getRelateDesc())){
+ throw new TargetDutyException("参数错误");
}
// 审批人
if (targetDutyWorkApprove.getApprovePersonId()==null){
@@ -139,7 +156,7 @@
info.setSubmitPersonId(uid);
info.setSubmitPersonName(uName);
info.setSort(1);
- targetDutyWorkApproveRepository.insert(info);
+ targetDutyWorkApproveBaseService.save(info);
}
@Override
@@ -148,7 +165,7 @@
Long pageSize = pageQuery.getPageSize();
IPage<ListCheckDataDto> page = new Page<>(pageIndex, pageSize);
- page = targetDutyWorkApproveRepository.listCheckData(page,pageQuery.getSearchParams().getRelateId());
+ page = targetDutyWorkApproveBaseService.listCheckData(page,pageQuery.getSearchParams().getRelateId());
List<ListCheckDataDto> respList = page.getRecords();
// --------------------------- 获取部门信息-----------------------
@@ -174,4 +191,66 @@
ResultCodes.OK
);
}
+
+ @Override
+ public TargetDutyWorkApproveDto selectOne(Serializable id) {
+ TargetDutyWorkApprove targetDutyWorkApprove = targetDutyWorkApproveBaseService.getById(id);
+ if(targetDutyWorkApprove == null){
+ return new TargetDutyWorkApproveDto();
+ }
+
+ TargetDutyWorkApproveDto dto = BeanCopyUtils.copyBean(targetDutyWorkApprove, TargetDutyWorkApproveDto.class);
+
+ List<WorkApproveRelateDesc> relateDescList = JSONObject.parseArray(targetDutyWorkApprove.getRelateDesc(),WorkApproveRelateDesc.class);
+ Map<Long,WorkApproveRelateDesc> relateDescMap = relateDescList.stream()
+ .collect(Collectors.toMap(WorkApproveRelateDesc::getId, Function.identity(),(k1, k2)->k1));
+
+ //
+ List<TargetDivideDetail> dList = targetDivideDetailBaseService.selectBatchIds(relateDescMap.keySet());
+ List<TargetApproveDivideDetailDto> divideDetailList = BeanCopyUtils.copyBeanList(dList, TargetApproveDivideDetailDto.class);
+
+ divideDetailList.forEach(f->{
+ WorkApproveRelateDesc relateDesc = relateDescMap.get(f.getId());
+ if(relateDesc != null){
+ f.setPersonId(relateDesc.getPersonId());
+ f.setPersonName(relateDesc.getPersonName());
+ f.setCommitValue(relateDesc.getValue());
+ }
+ });
+
+ // --------------------------- 获取部门信息-----------------------
+ //收集所用到的部门ID
+ Set<Long> collectDepIdSet = new HashSet();
+ divideDetailList.forEach(f->{
+ collectDepIdSet.add(f.getDutyDepartmentId());
+ collectDepIdSet.add(f.getMakerDepartmentId());
+ });
+ //获取部门名集合
+ Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
+
+ divideDetailList.forEach(f->{
+ f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
+ f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
+ });
+
+ dto.setTargetDivideDetailList(divideDetailList);
+ return dto;
+ }
+
+ @Override
+ public void delete(Long[] ids) {
+ if(ids == null){
+ throw new TargetDutyException(ResultCodes.CLIENT_PARAM_ILLEGAL);
+ }
+ List<Long> idList = Arrays.asList(ids);
+
+ List<TargetDutyWorkApprove> delList = new ArrayList<>();
+ idList.forEach(f->{
+ TargetDutyWorkApprove info = new TargetDutyWorkApprove();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ targetDutyWorkApproveBaseService.updateBatchById(delList);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2