From b4b2b63345961884c8a9dd95ca1f32c0ea1123e5 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 24 六月 2024 20:31:27 +0800
Subject: [PATCH] 多机构
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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 5497118..76e9893 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
@@ -82,7 +82,7 @@
public List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
- qw.ge("order_status",2);
+ qw.ge("order_status",4);
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
}
@@ -126,12 +126,12 @@
{
SysUser loginUser = SecurityUtils.getLoginUser().getUser();
bo.setCheckIds(loginUser.getPhonenumber());
- List<Long> deptIds = deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId());
- if (StringUtils.isNotEmpty(deptIds)){
- bo.setApplyDeptIds(deptIds);
- } else {
- bo.setApplyDeptIds(null);
- }
+// List<Long> deptIds = deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId());
+// if (StringUtils.isNotEmpty(deptIds)){
+// bo.setApplyDeptIds(deptIds);
+// } else {
+// bo.setApplyDeptIds(null);
+// }
return this.baseMapper.selectCheckList(bo);
}
@@ -305,11 +305,17 @@
public Boolean doScanOrder(Long orderId)
{
EnforceOrder order = this.getById(orderId);
+ if (order.getOrderStatus()<2){
+ throw new BaseException("鎵ф硶鍗曡繕鏈鎵癸紒");
+ }
+ if (order.getOrderStatus()>2){
+ throw new BaseException("鎵ф硶鍗曞凡纭鎵ф硶锛�");
+ }
order.setOrderStatus(3);
SysUser user = SecurityUtils.getLoginUser().getUser();
order.setExecuteId(user.getUserId());
order.setExecuteUser(user.getNickName());
- order.setExecutePhone(user.getRecommendPhone());
+ order.setExecutePhone(user.getPhonenumber());
order.setExecuteDeptId(user.getDeptId());
order.setExecuteDeptName(deptService.getDeptAllName(user.getDeptId()));
order.setInTime(DateUtils.getNowDate());
@@ -326,7 +332,6 @@
if (StringUtils.isEmpty(resultBo.getRegionReason())){
throw new BaseException("璇峰～鍐欐墽娉曠粨鏋滆鏄�");
}
-
return this.update(lu()
.set(resultBo.getRegionStatus()!=null, EnforceOrder::getRegionStatus, resultBo.getRegionStatus())
.set(StringUtils.isNotEmpty(resultBo.getRegionReason()), EnforceOrder::getRegionReason, resultBo.getRegionReason())
@@ -334,6 +339,7 @@
.set(StringUtils.isNotEmpty(resultBo.getRegionVideos()), EnforceOrder::getRegionVideos, resultBo.getRegionVideos())
.set( EnforceOrder::getOrderStatus, 4)
.set( EnforceOrder::getExecuteTime, DateUtils.getNowDate())
+ .eq( EnforceOrder::getOrderId, resultBo.getOrderId())
);
}
@@ -351,6 +357,9 @@
throw new BaseException("璇峰～鍐欐姇璇夊唴瀹癸紒");
}
EnforceOrder order = this.getById(bo.getOrderId());
+ if (order.getOrderStatus()!=4){
+ throw new BaseException("鎵ф硶鍗曟湭涓婃姤鎵ф硶缁撴灉锛�");
+ }
//娣诲姞鎶曡瘔璁板綍
EnforceComplaintLogBo complaintLogBo = Convert.convert(EnforceComplaintLogBo.class, order);
complaintLogBo.setComplaintType(bo.getComplaintType());
--
Gitblit v1.9.1