main
黄海 2 years ago
parent fd7148efe2
commit 1c9a9ddf9a

@ -1,7 +1,5 @@
package com.dsideal.FengHuang.Yp.Controller; package com.dsideal.FengHuang.Yp.Controller;
import cn.hutool.captcha.CaptchaUtil;
import cn.hutool.captcha.LineCaptcha;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.dsideal.FengHuang.Interceptor.EmptyInterface; import com.dsideal.FengHuang.Interceptor.EmptyInterface;
import com.dsideal.FengHuang.Interceptor.IsNumericInterface; 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.plugin.activerecord.Record;
import com.jfinal.upload.UploadFile; import com.jfinal.upload.UploadFile;
import javax.servlet.ServletOutputStream;
import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;

@ -28,7 +28,7 @@ public class YpModel {
* *
*/ */
public List<Record> getTaskLimit(int task_id) { 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); return Db.find(sql, task_id);
} }

@ -10,6 +10,6 @@
#end #end
#sql("listTask") #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
#end #end
Loading…
Cancel
Save