From 6acee0d1d79a05f7a3a3c386e9df02e9a741f544 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 21 六月 2024 17:21:16 +0800
Subject: [PATCH] 执法单节点添加，审批修改
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index fce5771..e22d765 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -8,14 +8,18 @@
import com.project.common.core.domain.entity.SysUser;
import com.project.common.enums.OrderPre;
import com.project.common.sms.YPSmsApi;
+import com.project.common.utils.DateUtils;
import com.project.common.utils.SecurityUtils;
import com.project.common.utils.StringUtils;
+import com.project.enforce.domain.EnforceCheckLog;
import com.project.enforce.domain.EnforceOrder;
import com.project.enforce.domain.EnforcePeer;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
+import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.mapper.EnforceOrderMapper;
+import com.project.enforce.service.IEnforceCheckLogService;
import com.project.enforce.service.IEnforceOrderService;
import com.project.enforce.service.IEnforcePeerService;
import com.project.system.service.ISysDeptService;
@@ -27,6 +31,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -43,13 +48,16 @@
private final ISysDeptService deptService;
private final ISysOrderNoService orderNoService;
private final IEnforcePeerService peerService;
+ private final IEnforceCheckLogService checkLogService;
@Override//鍒楄〃鏌ヨ
- @DataScope(deptAlias = "apply_dept_id", userAlias = "apply_user_id")
+ @DataScope(deptAlias = "apply_dept_id", userAlias = "apply_id")
public List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
- qw.apply(bo.getParams().get("dataScope") != null, bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
+ if (StringUtils.isNotEmpty(bo.getParams())) {
+ qw.apply(bo.getParams().get("dataScope") != null, bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
+ }
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
}
@@ -59,7 +67,12 @@
{
SysUser loginUser = SecurityUtils.getLoginUser().getUser();
bo.setCheckIds(loginUser.getPhonenumber());
- bo.setApplyDeptIds(deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId()));
+ List<Long> deptIds = deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId());
+ if (StringUtils.isNotEmpty(deptIds)){
+ bo.setApplyDeptIds(deptIds);
+ } else {
+ bo.setApplyDeptIds(null);
+ }
return this.baseMapper.selectCheckList(bo);
}
@@ -74,7 +87,10 @@
public EnforceOrderVo queryById(Long orderId)
{
EnforceOrder db = this.baseMapper.selectById(orderId);
- return Convert.convert(EnforceOrderVo.class , db);
+ EnforceOrderVo vo = Convert.convert(EnforceOrderVo.class, db);
+ List<EnforcePeer> peers = peerService.list(peerService.lq().eq(EnforcePeer::getOrderId, orderId).eq(EnforcePeer::getPeerType,2));
+ vo.setPeers(peers);
+ return vo;
}
@@ -91,7 +107,7 @@
add.setCheckIds(checkPhones);
}
this.save(add);
- bo.getPeers().add(new EnforcePeer()
+ bo.getPeers().add(0,new EnforcePeer()
.setPeerType(1)
.setPeerId(add.getApplyId())
.setPeerUser(add.getApplyUser())
@@ -137,6 +153,37 @@
return getCheckPhones(checkLevel, applyDeptId, 0);
}
+ @Override
+ public List<OrderNodeVo> orderNodeList(Long orderId)
+ {
+ List<OrderNodeVo> vos = new ArrayList<>();
+ EnforceOrder order = this.getById(orderId);
+ List<EnforceCheckLog> checkLogs = checkLogService.list(checkLogService.lq()
+ .eq(EnforceCheckLog::getOrderId, orderId).orderByAsc(EnforceCheckLog::getCheckTime)
+ );
+ if (order.getApplyTime()!=null){
+ vos.add(new OrderNodeVo("鎻愪氦鐢宠",order.getApplyUser(),order.getApplyTime(), null));
+ }
+ if (StringUtils.isNotEmpty(checkLogs)){
+ for (EnforceCheckLog checkLog : checkLogs) {
+ if (checkLog.getCheckStatus()>0){
+ vos.add(new OrderNodeVo("瀹℃壒閫氳繃",checkLog.getCheckUser(),checkLog.getCheckTime(), null));
+ } else {
+ vos.add(new OrderNodeVo("瀹℃壒鎷掔粷",checkLog.getCheckUser(),checkLog.getCheckTime(), checkLog.getCheckReason()));
+ }
+ }
+ } else {
+ if (order.getInTime()!=null){
+ vos.add(new OrderNodeVo("鎵爜鍏ヤ紒",order.getExecuteUser(),order.getInTime(), null));
+ }
+ if (order.getExecuteTime()!=null){
+ vos.add(new OrderNodeVo("缁撴灉涓婃姤",order.getExecuteUser(),order.getExecuteTime(), null));
+ }
+ }
+
+ return vos;
+ }
+
//-------------------------------------------------------------------------------------
@@ -150,9 +197,7 @@
public void sendApplyMsg(List<String> phones, String applyUser)
{
String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.APPLY_TMP, applyUser));
- phones.forEach(phone->{
- YPSmsApi.sendSms(phone, applyMsg) ;
- });
+ phones.forEach(phone-> YPSmsApi.sendSms(phone, applyMsg));
}
//淇濆瓨鍓嶆牎楠�
@@ -162,14 +207,15 @@
String orderNo = orderNoService.getOrderNo(OrderPre.ZFD.getIndex());
entity.setOrderNo(orderNo);
entity.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(entity.getApplyDeptId()));
+ entity.setApplyTime(DateUtils.getNowDate());
}
- if (StringUtils.isEmpty(entity.getApplyDeptName())){
+ if (StringUtils.isEmpty(entity.getApplyDeptName()) && entity.getApplyDeptId()!=null){
entity.setApplyDeptName(deptService.getDeptAllName(entity.getApplyDeptId()));
}
- if (StringUtils.isEmpty(entity.getExecuteDeptName())){
+ if (StringUtils.isEmpty(entity.getExecuteDeptName()) && entity.getExecuteDeptId()!=null){
entity.setExecuteDeptName(deptService.getDeptAllName(entity.getExecuteDeptId()));
}
- if (StringUtils.isEmpty(entity.getCheckDeptName())){
+ if (StringUtils.isEmpty(entity.getCheckDeptName()) && entity.getCheckDeptId()!=null){
entity.setCheckDeptName(deptService.getDeptAllName(entity.getCheckDeptId()));
}
@@ -245,7 +291,7 @@
return null;
}
checkLevel = 0;
- deptId = deptService.getById(deptId).getParentId();
+ deptId = deptService.selectDeptById(deptId).getParentId();
current++;
getCheckPhones(checkLevel, deptId, current);
}
--
Gitblit v1.9.1