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 | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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 f6e32bf..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
@@ -53,6 +53,7 @@
private final IEnforceComplaintLogService complaintLogService;
private final IEnforceEvaluateLogService evaluateLogService;
private final YPSmsService smsService;
+ private final EnforceOrderMapper orderMapper;
/**
* 閫氱敤鍒楄〃-鏃犳潈闄�
@@ -67,6 +68,11 @@
return Convert.toList(EnforceOrderVo.class , list);
}
+ @Override
+ public Integer getDistinctCompanyNum() {
+ return orderMapper.getDistinctCompanyNum();
+ }
+
/**
* 浼佷笟鎵ф硶鍗曞垪琛�
* @param bo 鍙傛暟
@@ -76,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);
}
@@ -120,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);
}
@@ -171,12 +177,14 @@
if (one!=null){
String questionStatic = one.getQuestionStatic();
if (StringUtils.isNotEmpty(questionStatic)){
+ EnforceEvaluateVo evaluateVo = Convert.convert(EnforceEvaluateVo.class, one);
try {
- EnforceEvaluateVo evaluateVo = JsonUtils.jsonToPojo(questionStatic, EnforceEvaluateVo.class);
- vo.setEvaluateVo(evaluateVo);
+ List<EnforceEvaluateQuestion> questions = JsonUtils.jsonToList(questionStatic, EnforceEvaluateQuestion.class);
+ evaluateVo.setQuestionList(questions);
} catch (Exception e) {
throw new BaseException("璇勪环闂埜瑙ｆ瀽寮傚父锛�");
}
+ vo.setEvaluateVo(evaluateVo);
}
}
}
@@ -297,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());
@@ -318,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())
@@ -326,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())
);
}
@@ -343,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());
@@ -444,6 +461,8 @@
qw.eq(bo.getIsShow() != null, "is_show", bo.getIsShow());
qw.eq(bo.getIsEva() != null, "is_eva", bo.getIsEva());
qw.eq(bo.getTotalScore() != null, "total_score", bo.getTotalScore());
+ qw.ge(StringUtils.isNotEmpty(bo.getBeginTime()), "in_time", bo.getBeginTime());
+ qw.le(StringUtils.isNotEmpty(bo.getEndTime()), "in_time", bo.getEndTime());
if (StringUtils.isNotEmpty(bo.getIsAsc()) && StringUtils.isNotEmpty(bo.getOrderByColumn())){
if ("acs".equals(bo.getIsAsc())) {
qw.orderByAsc(bo.getOrderByColumn());
--
Gitblit v1.9.1