From 484bc1f21e7d29b480005f9c7077b03c64d8f86e Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 20:14:11 +0800
Subject: [PATCH] 审批，投诉，报表修改
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 be7bdf0..5497118 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;
/**
* 閫氱敤鍒楄〃-鏃犳潈闄�
@@ -65,6 +66,11 @@
QueryWrapper<EnforceOrder> qw = getQw(bo);
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
+ }
+
+ @Override
+ public Integer getDistinctCompanyNum() {
+ return orderMapper.getDistinctCompanyNum();
}
/**
@@ -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);
}
}
}
--
Gitblit v1.9.1