From 193c22bae0b78d331a13d57aa046ebe44ee0c832 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 13:51:31 +0800
Subject: [PATCH] 评价校验，企业执法单记录修改
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java | 7 ++++++-
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java
index e23dbf7..56feac4 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java
@@ -100,6 +100,10 @@
if (bo.getOrderId()==null){
throw new BaseException("璇烽�夋嫨璇勪环鎵ф硶鍗曪紒");
}
+ EnforceOrder order = orderService.getById(bo.getOrderId());
+ if (order.getOrderStatus()==2){
+ throw new BaseException("璇ユ墽娉曞崟杩樻湭鎵ф硶锛屼笉鍙瘎浠凤紒");
+ }
List<EnforceEvaluateQuestion> questionList = bo.getQuestionList();
if (StringUtils.isEmpty(questionList)){
throw new BaseException("璇勪环椤逛笉鍙负绌猴紒");
@@ -112,7 +116,8 @@
for (EnforceEvaluateQuestion question : questionList) {
totalScore = NumberUtils.add(totalScore, question.getGetScore());
}
- EnforceOrder order = orderService.getById(bo.getOrderId());
+
+
EnforceEvaluateLog evaluateLog = Convert.convert(EnforceEvaluateLog.class, order);
evaluateLog.setQuestionRemark(bo.getQuestionRemark());
evaluateLog.setTotalScore(NumberUtils.divToBigDecSca2(totalScore,1));
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 5e9cf93..3cd231e 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",4);
+ qw.ge("order_status",2);
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
}
--
Gitblit v1.9.1