From 4172b0bdc098d4a8055bdb0b1bfb4cbf866e47a0 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 24 六月 2024 10:09:51 +0800
Subject: [PATCH] 响应
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 1 +
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 9 +++++++--
project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java | 15 +--------------
project-report/src/main/resources/mapper/report/ReportMapper.xml | 13 ++++++++-----
4 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
index e47ca72..3e7842c 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
@@ -109,6 +109,7 @@
.set(EnforceComplaintLog::getInId,loginUser.getUserId())
.set(EnforceComplaintLog::getInUser,loginUser.getNickName())
.set(EnforceComplaintLog::getInTime, DateUtils.getNowDate())
+ .set(EnforceComplaintLog::getComplaintStatus, 1)
.eq(EnforceComplaintLog::getId, bo.getId())
);
}
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..cbeb807 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);
}
@@ -305,6 +305,9 @@
public Boolean doScanOrder(Long orderId)
{
EnforceOrder order = this.getById(orderId);
+ if (order.getOrderStatus()!=2){
+ throw new BaseException("鎵ф硶鍗曡繕鏈鎵癸紒");
+ }
order.setOrderStatus(3);
SysUser user = SecurityUtils.getLoginUser().getUser();
order.setExecuteId(user.getUserId());
@@ -326,7 +329,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())
@@ -351,6 +353,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());
diff --git a/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java b/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
index 67d2fad..2023958 100644
--- a/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
+++ b/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
@@ -99,20 +99,7 @@
@Override//浼佷笟琚墽娉曟鏁板垎甯�
public List<KeyVal> getCompanyCount(ReportQueryBo bo)
{
- List<KeyVal> list = reportMapper.getCompanyCount(bo);
- Map<String, Object> resultMap = list.stream().collect(Collectors.toMap(KeyVal::getK, KeyVal::getV));
-
- List<SysCompany> companies = companyService.list(companyService.lq().eq(SysCompany::getCompanyStatus, 0));
-
- return companies.stream().map(e -> {
- KeyVal keyVal;
- if (resultMap.get(e.getCompanyId().toString()) == null) {
- keyVal = new KeyVal(e.getCompanyName(), 0);
- } else {
- keyVal = new KeyVal(e.getCompanyName(), resultMap.get(e.getCompanyId().toString()));
- }
- return keyVal;
- }).collect(Collectors.toList());
+ return reportMapper.getCompanyCount(bo);
}
@Override//鎵ф硶绫诲瀷
diff --git a/project-report/src/main/resources/mapper/report/ReportMapper.xml b/project-report/src/main/resources/mapper/report/ReportMapper.xml
index 2032c8d..b541a58 100644
--- a/project-report/src/main/resources/mapper/report/ReportMapper.xml
+++ b/project-report/src/main/resources/mapper/report/ReportMapper.xml
@@ -47,16 +47,19 @@
<select id="getCompanyCount"
parameterType="com.project.report.domain.bo.query.ReportQueryBo"
resultType="com.project.common.vo.KeyVal">
+
select
- company_id AS k,
- IFNULL(count(order_id),0) as v
- from enforce_order
+ sc.company_name AS k,
+ IFNULL(count(eo.order_id),0) as v
+ from sys_company sc
+ left join enforce_order eo on sc.company_id=eo.company_id
where 1=1
+ and sc.check_status=2
<if test="beginTime!=null and beginTime!=''">
- AND apply_time >= #{beginTime}
+ AND eo.apply_time >= #{beginTime}
</if>
<if test="endTime!=null and endTime!=''">
- AND apply_time <= #{endTime}
+ AND eo.apply_time <= #{endTime}
</if>
GROUP BY k order by v desc
</select>
--
Gitblit v1.9.1