From 8d457ce5268f64b43d747c8facdaae620ce14975 Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Mon, 9 Nov 2020 11:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BC=E5=84=BF=E8=AF=84=E4=BC=B0-=E5=9B=BE?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/benyi/assessmentstudy/index.vue | 4 ++--
.../benyi/controller/ByAssessmentcontentController.java | 3 ++-
.../resources/mybatis/benyi/ByAssessmentcontentMapper.xml | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue b/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue
index 7da0f74c5..3ef3510a3 100644
--- a/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-row :gutter="20">
- <el-col :span="4" :xs="24">
+ <el-col :span="8" :xs="24">
<div class="head-container">
<el-input
v-model="name"
@@ -24,7 +24,7 @@
/>
</div>
</el-col>
- <el-col :span="20" :xs="24">
+ <el-col :span="16" :xs="24">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span class="box-card-title">{{ title }}</span>
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java
index c0c815afa..705040f79 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java
@@ -151,8 +151,9 @@ public class ByAssessmentcontentController extends BaseController {
AjaxResult ajaxResult = AjaxResult.success();
String[] strArr = new String[]{"健康", "语言", "社会", "科学", "艺术"};
List<Double> douArr = new ArrayList<Double>();
+ ByAssessmentcontent byAssessmentcontent = null;
for (int i = 0; i < strArr.length; i++) {
- ByAssessmentcontent byAssessmentcontent = new ByAssessmentcontent();
+ byAssessmentcontent = new ByAssessmentcontent();
byAssessmentcontent.setScope(scope);
byAssessmentcontent.setName(strArr[i]);
//获取{"健康", "语言", "社会", "科学", "艺术"} 对应的值
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
index 3f6f42df5..b69009751 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
@@ -24,7 +24,8 @@
<include refid="selectByAssessmentcontentVo"/>
<where>
<if test="parentId != null ">and parentId = #{parentId}</if>
- <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <!--<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>-->
+ <if test="name != null and name != ''">and name = #{name}</if>
<if test="iselement != null and iselement != ''">and iselement = #{iselement}</if>
<if test="scope != null and scope != ''">and scope = #{scope}</if>
</where>