From 9aed65a6aee6a4ec73bad2b34150a50285bc951b Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 28 Jun 2024 22:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 106 +++++++++++++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 48 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 94b8b06..e817bb1 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
@@ -17,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;
@@ -73,14 +74,16 @@
@Override
@Transactional
public void add(SgProgressReportDO sgProgressReportDO) {
+ Long userId = AuthUtil.getUserId();
+ sgProgressReportDO.setReportUser(userId);
+ Date now = DateUtil.now();
+ sgProgressReportDO.setReportTime(now);
+ sgProgressReportDO.setCreateTime(now);
//如果为草稿状态，单纯插入
if(sgProgressReportDO.getStatus()==4){
sgProgressReportMapper.insert(sgProgressReportDO);
return;
}
- Date now = DateUtil.now();
- sgProgressReportDO.setReportTime(now);
- sgProgressReportDO.setCreateTime(now);
Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
Long gxStepId = sgProgressReportDO.getGxStepId();
SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
@@ -103,9 +106,7 @@
}
}
}
- Long userId = AuthUtil.getUserId();
sgProgressReportDO.setStatus(0);
- sgProgressReportDO.setReportUser(userId);
sgProgressReportMapper.insert(sgProgressReportDO);
SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
String deviceType = sgDeviceDO.getDeviceType();
@@ -151,6 +152,8 @@
public SgProgressReportVO detail(String id) {
SgProgressReportVO sgProgressReportVO = sgProgressReportMapper.queryById(id);
SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(sgProgressReportVO.getGxDeviceId());
+ SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(sgProgressReportVO.getGxStepId());
+ sgProgressReportVO.setStepRemark(sgGxStepDO.getRemark());
sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).orderByAsc(SgReportUserDO::getId).list();
List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
@@ -159,6 +162,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());
}
}
}
@@ -175,51 +179,53 @@
@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();
+ SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectById(id);
+ List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).ne(SgReportUserDO::getApprovalOrder,0).eq(SgReportUserDO::getIsHis,0)
+ .orderByAsc(SgReportUserDO::getApprovalOrder).list();
+ //审批者
+ SgReportUserDO sgReportUserDO = new SgReportUserDO();
+ if (isReject==1 && sgProgressReportDO.getStatus().equals(2)){
+ sgReportUserDO = sgReportUserDOS.get(0);
+ }else {
+ sgReportUserDO = sgReportUserDOS.stream().filter(s -> s.getUserId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
+ }
Date date = new Date();
LambdaUpdateChainWrapper<SgProgressReportDO> updateChainWrapper = new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId, id);
LambdaUpdateChainWrapper<SgReportUserDO> userUpdate = new LambdaUpdateChainWrapper<>(sgReportUserMapper)
.eq(SgReportUserDO::getId, sgReportUserDO.getId()).set(SgReportUserDO::getApprovalContent,approvalDTO.getApprovalContent()).set(SgReportUserDO::getApprovalTime,date);
if (approvalDTO.getStatus()==1){
+ Integer approvalOrder = sgReportUserDO.getApprovalOrder();
userUpdate.set(SgReportUserDO::getApprovalStatus,1).update();
- if (sgReportUserDO.getId()==list.get(0).getId()){
- updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();
-
-
- //工序审核完成后 进行项目和设备状态的判断
-
- cachedThreadPool.execute(new Runnable(){
- @Override
- public void run(){
- setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
- }
- });
-
-
-
- }else {
- SgReportUserDO nextUser = list.stream().filter(s -> s.getApprovalOrder()==sgReportUserDO.getApprovalOrder()+1).findFirst().get();
- updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
- }
+ Optional<SgReportUserDO> next = sgReportUserDOS.stream().filter(s -> s.getApprovalOrder() == approvalOrder + 1).findFirst();
+ //如果存在下一个审批人，则继续审批
+ if (next.isPresent()){
+ SgReportUserDO nextUser = next.get();
+ updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
+ }else {
+ updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();
+ //工序审核完成后 进行项目和设备状态的判断
+ cachedThreadPool.execute(new Runnable(){
+ @Override
+ public void run(){
+ setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
+ }
+ });
+ }
}else {
updateChainWrapper.set(SgProgressReportDO::getStatus,3);
- List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).eq(SgReportUserDO::getIsHis,0)
- .orderByAsc(SgReportUserDO::getApprovalOrder).list()
-// .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);
+ if (isReject==1){
+ userUpdate.set(SgReportUserDO::getUserId,userId);
+ }
+ userUpdate.update();
for (SgReportUserDO reportUserDO : sgReportUserDOS) {
if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
//更新为历史数据
new LambdaUpdateChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getId,reportUserDO.getId()).set(SgReportUserDO::getIsHis,1).update();
- reportUserDO.setId(null);
- reportUserDO.setApprovalStatus(0);
- reportUserDO.setIsHis(0);
- reportUserDO.setApprovalTime(date);
+ setReportUser(date, reportUserDO);
sgReportUserMapper.insert(reportUserDO);
try {
Thread.sleep(100);
@@ -228,10 +234,7 @@
}
}else if (reportUserDO.getApprovalOrder()>sgReportUserDO.getApprovalOrder()){
sgReportUserMapper.deleteById(reportUserDO.getId());
- reportUserDO.setId(null);
- reportUserDO.setApprovalStatus(0);
- reportUserDO.setIsHis(0);
- reportUserDO.setApprovalTime(date);
+ setReportUser(date, reportUserDO);
sgReportUserMapper.insert(reportUserDO);
try {
Thread.sleep(100);
@@ -247,6 +250,14 @@
}
+ }
+
+ private void setReportUser(Date date, SgReportUserDO reportUserDO) {
+ reportUserDO.setId(null);
+ reportUserDO.setApprovalStatus(0);
+ reportUserDO.setIsHis(0);
+ reportUserDO.setApprovalTime(date);
+ reportUserDO.setApprovalContent(null);
}
@@ -327,13 +338,8 @@
@Override
public Map<String, Long> countListAll(ProjectSearchDTO searchDTO) {
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(null, searchDTO);
- List<SgProgressReportVO> pending = list.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
- List<SgProgressReportVO> over = list.stream().filter(s -> s.getStatus() == 1||s.getStatus()==2).collect(Collectors.toList());
- List<SgProgressReportVO> reject = list.stream().filter(s -> s.getStatus() == 3).collect(Collectors.toList());
Map<String, Long> map = new HashMap<>();
- map.put("pending", (long) pending.size());
- map.put("over", (long) over.size());
- map.put("reject", (long) reject.size());
+ getStatusCountByList(list, map);
return map;
}
@@ -341,6 +347,11 @@
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());
@@ -352,7 +363,6 @@
map.put("over", (long) over.size());
map.put("reject", (long) reject.size());
map.put("draft", (long) draft.size());
- return map;
}
@Override
--
Gitblit v1.9.3