@ -74,7 +74,7 @@
<dependency>
<groupId>com.jfinal</groupId>
<artifactId>jfinal-undertow</artifactId>
<version>3.5</version>
<version>3.6</version>
</dependency>
@ -952,7 +952,7 @@ public class ZbdcController extends Controller {
Page<Record> list = zm.getQueryYqsb(bureauIds, year, km_code, level_filter, type_id, pbyq, page, limit);
//市直查询显示合理名称
if (area_id.equals("0")) {
if (!StrKit.isBlank(area_id)&&area_id.equals("0")) {
for (int i = 0; i < list.getList().size(); i++) {
list.getList().get(i).set("area_name", "市直");
}
@ -94,11 +94,21 @@ public class ZjcqModel {
Db.update(sql, ys_id);
/**
* 功能:获取某次验收信息
* @param ys_id
* @return
*/
public Record getYs(int ys_id) {
String sql = "select * from t_zhuanjia_record where ys_id=?";
return Db.findFirst(sql, ys_id);
* 功能:获取已抽取专家列表
public List<Record> getYsZhuanJiaList(int ys_id) {
String sql = "select t2.* from t_zhuanjia_record_detail as t1 inner join t_zhuanjia_base as t2 on t1.person_id=t2.person_id where t1.ys_id=?";
return Db.find(sql, ys_id);