From 1c9a9ddf9ad585f00ffa640b4b269859228dddc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Sun, 23 Apr 2023 15:22:04 +0800
Subject: [PATCH] 'commit'

---
 .../com/dsideal/FengHuang/Yp/Controller/YpController.java    | 5 -----
 src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java    | 2 +-
 target/classes/Sql/yp.sql                                    | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java
index 667849f..2dfeb6b 100644
--- a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java
+++ b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java
@@ -1,7 +1,5 @@
 package com.dsideal.FengHuang.Yp.Controller;
 
-import cn.hutool.captcha.CaptchaUtil;
-import cn.hutool.captcha.LineCaptcha;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.FengHuang.Interceptor.EmptyInterface;
 import com.dsideal.FengHuang.Interceptor.IsNumericInterface;
@@ -21,10 +19,7 @@ import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.upload.UploadFile;
 
-import javax.servlet.ServletOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 
diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java
index 3596334..d2135c0 100644
--- a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java
@@ -28,7 +28,7 @@ public class YpModel {
      * 功能：获取指定任务的开启班型及人数限制
      */
     public List<Record> getTaskLimit(int task_id) {
-        String sql = "select * from t_yp_task_bx_limit where task_id=?";
+        String sql = "select t1.*,t2.bx_name from t_yp_task_bx_limit as t1 inner join t_yp_bx as t2 on t1.bx_id=t2.bx_id where t1.task_id=?";
         return Db.find(sql, task_id);
     }
 
diff --git a/target/classes/Sql/yp.sql b/target/classes/Sql/yp.sql
index c8998b0..038dc46 100644
--- a/target/classes/Sql/yp.sql
+++ b/target/classes/Sql/yp.sql
@@ -10,6 +10,6 @@
   #end
 
   #sql("listTask")
-    select * from t_yp_task where b_use=1 order by task_id desc
+    select task_id,task_name,date_format(create_time,'%Y-%m-%d') as create_time,b_use,is_run from t_yp_task where b_use=1 order by task_id desc
   #end
 #end
\ No newline at end of file