From ecb9e24d7d2d12d5938050223cdcd88030181b2f Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 17:46:59 +0800
Subject: [PATCH] 考试查询修改,新增缴费状态查询
---
src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 3 +++
src/main/resources/application-test.yml | 2 +-
src/main/java/org/springblade/common/utils/HttpClientUtils.java | 4 ++--
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/common/utils/HttpClientUtils.java b/src/main/java/org/springblade/common/utils/HttpClientUtils.java
index ac23e65..883a2bb 100644
--- a/src/main/java/org/springblade/common/utils/HttpClientUtils.java
+++ b/src/main/java/org/springblade/common/utils/HttpClientUtils.java
@@ -570,7 +570,8 @@
CloseableHttpClient httpClient = HttpClients.createDefault();
try {
BasicResponseHandler handler = new BasicResponseHandler();
- StringEntity entity = new StringEntity(json, "utf-8");//解决中文乱码问题
+ //解决中文乱码问题
+ StringEntity entity = new StringEntity(json, "utf-8");
entity.setContentEncoding("UTF-8");
entity.setContentType("application/json");
httpPost.setEntity(entity);
@@ -578,7 +579,6 @@
return result;
} catch (Exception e) {
e.printStackTrace();
-
} finally {
try {
httpClient.close();
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java
index ef9ce98..86359c4 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java
@@ -128,7 +128,7 @@
//查询该vip 用户的 vip 库,从该120题中取出题目
VipTopic vipTopic = new VipTopic();
vipTopic.setUserId(Long.parseLong(score.getUserId()));
- vipTopic.setApplyId(score.getApplyId());
+// vipTopic.setApplyId(score.getApplyId());
VipTopic topic = vipTopicService.getOne(Condition.getQueryWrapper(vipTopic));
if (null!=topic){
List<String> list = Arrays.asList(topic.getTopicIds().split(","));
diff --git a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
index f147539..5f71333 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -50,6 +50,9 @@
<if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
and sr.audit_status = #{trainingRegistration.auditStatus}
</if>
+ <if test="trainingRegistration.vipStatus!=null and trainingRegistration.vipStatus!=0">
+ and sr.vip_status = #{trainingRegistration.vipStatus}
+ </if>
<if test="trainingRegistration.deptName!=null and trainingRegistration.deptName!=''">
and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
</if>
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index e3ec27c..ccd85d1 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -50,7 +50,7 @@
jsonUrl: D:\\anbao\\
username: root
password: ZHba@0112
- qfqkBaseApiUrl : http://localhost:83
+ qfqkBaseApiUrl : http://192.168.0.110:83
#第三方登陆
social:
--
Gitblit v1.9.3