From 92b2c64d622d76466730d2543d2b0a8357332e86 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 27 Jun 2024 17:31:38 +0800
Subject: [PATCH] 湖北水库：施工：项目列表添加片区、审批详情添加机构名
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index 5e8dae5..cb19486 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -7,6 +7,7 @@
import cn.gistack.sm.sg.VO.SgStepReportVO;
import cn.gistack.sm.sg.mapper.*;
import cn.gistack.sm.sg.service.SgProgressReportService;
+import cn.hutool.http.useragent.UserAgentUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -16,6 +17,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -64,10 +66,19 @@
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageList(page,searchDTO);
return page.setRecords(list);
}
-
+ @Override
+ public IPage<SgProgressReportVO> queryPageListAll(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
+ List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(page,searchDTO);
+ return page.setRecords(list);
+ }
@Override
@Transactional
public void add(SgProgressReportDO sgProgressReportDO) {
+ //如果为草稿状态，单纯插入
+ if(sgProgressReportDO.getStatus()==4){
+ sgProgressReportMapper.insert(sgProgressReportDO);
+ return;
+ }
Date now = DateUtil.now();
sgProgressReportDO.setReportTime(now);
sgProgressReportDO.setCreateTime(now);
@@ -76,7 +87,7 @@
SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
- wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId);
+ wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4);
List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(wrapper);
if ( sgProgressReportDOS!=null && sgProgressReportDOS.size()>0){
throw new ServiceException("此工序已存在审批！");
@@ -86,6 +97,7 @@
QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
wrapper1.eq("gx_step_id", gxStepDO.getId());
wrapper1.eq("gx_device_id",gxDeviceId);
+ wrapper1.ne("status",4);
SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
if (one == null || one.getStatus() != 2) {
throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
@@ -148,6 +160,7 @@
for (SgReportUserDO sgReportUserDO : list) {
if (user.get("ID").equals(sgReportUserDO.getUserId())){
sgReportUserDO.setUserName(user.get("REAL_NAME").toString());
+ sgReportUserDO.setDeptName(user.get("DEPTNAME").toString());
}
}
}
@@ -164,10 +177,19 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void approval(ApprovalDTO approvalDTO) {
+ Integer isReject = approvalDTO.getIsReject();
+ Long userId = approvalDTO.getUserId();
Long id = approvalDTO.getId();
List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).eq(SgReportUserDO::getIsHis,0)
.eq(SgReportUserDO::getApprovalStatus, 0).orderByDesc(SgReportUserDO::getApprovalOrder).list();
- SgReportUserDO sgReportUserDO = list.stream().filter(s -> s.getUserId().equals(approvalDTO.getUserId())).findFirst().get();
+ //审批者
+ SgReportUserDO sgReportUserDO = new SgReportUserDO();
+ if (isReject==0){
+ list.stream().filter(s -> s.getUserId().equals(userId)).findFirst().get();
+ }
+ if (isReject==1){
+ sgReportUserDO.setUserId(userId);
+ }
Date date = new Date();
LambdaUpdateChainWrapper<SgProgressReportDO> updateChainWrapper = new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId, id);
LambdaUpdateChainWrapper<SgReportUserDO> userUpdate = new LambdaUpdateChainWrapper<>(sgReportUserMapper)
@@ -200,7 +222,7 @@
// .stream().distinct()
// .stream().filter(s->s.getApprovalOrder()!=0 && s.getApprovalOrder()<= sgReportUserDO.getApprovalOrder()).collect(Collectors.toList())
;
- userUpdate.set(SgReportUserDO::getApprovalStatus,2).update();
+ userUpdate.set(SgReportUserDO::getApprovalStatus,2).update();
for (SgReportUserDO reportUserDO : sgReportUserDOS) {
if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
//更新为历史数据
@@ -314,19 +336,33 @@
}
@Override
+ public Map<String, Long> countListAll(ProjectSearchDTO searchDTO) {
+ List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(null, searchDTO);
+ Map<String, Long> map = new HashMap<>();
+ getStatusCountByList(list, map);
+ return map;
+ }
+
+ @Override
public Map<String, Long> statusCount(ProjectSearchDTO searchDTO) {
List<SgProgressReportVO> list = sgProgressReportMapper.statusCount(searchDTO);
Map<String, Long> map = new HashMap<>();
+ getStatusCountByList(list, map);
+ return map;
+ }
+
+ private void getStatusCountByList(List<SgProgressReportVO> list, Map<String, Long> map) {
List<SgProgressReportVO> pending = list.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
List<SgProgressReportVO> progress = list.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());
List<SgProgressReportVO> over = list.stream().filter(s -> s.getStatus() == 2).collect(Collectors.toList());
List<SgProgressReportVO> reject = list.stream().filter(s -> s.getStatus() == 3).collect(Collectors.toList());
+ List<SgProgressReportVO> draft = list.stream().filter(s -> s.getStatus() == 4).collect(Collectors.toList());
map.put("all", (long) list.size());
map.put("pending", (long) pending.size());
map.put("progress", (long) progress.size());
map.put("over", (long) over.size());
map.put("reject", (long) reject.size());
- return map;
+ map.put("draft", (long) draft.size());
}
@Override
@@ -334,7 +370,7 @@
SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
- wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId);
+ wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4);
List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(wrapper);
if ( sgProgressReportDOS!=null && sgProgressReportDOS.size()>0){
return false;
@@ -344,6 +380,7 @@
QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
wrapper1.eq("gx_step_id", gxStepDO.getId());
wrapper1.eq("gx_device_id", gxDeviceId);
+ wrapper1.ne("status",4);
SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
if (one == null || one.getStatus() != 2) {
return false;
@@ -364,7 +401,7 @@
@Override
public String getDeviceReport(Long gxDeviceId, Long gxStepId) {
QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
- wrapper.eq("gx_device_id",gxDeviceId);
+ wrapper.eq("gx_device_id",gxDeviceId).ne("status",4);
if (gxStepId!=null){
wrapper.eq("gx_step_id",gxStepId);
}
--
Gitblit v1.9.3