From de9269bd1c4e89175fafb4b68c9b501d5a39a934 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期一, 24 十二月 2018 11:14:46 +0800
Subject: [PATCH] 用户问题描述加问题类型
---
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
index b9031f6..92e01e1 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -26,7 +26,7 @@
//鐢ㄦ埛鎵嬪姩娣诲姞闂
public boolean add(Object obj) {
Deverror_record dev_record=(Deverror_record) obj;
- String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,error_dispose,uid,uname,picture_num ";
+ String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,error_dispose,uid,uname,picture_num,error_state ";
String endsql=") values(?,?,?,?,?,?,?";
List list=new ArrayList();
list.add(dev_record.getStationId());
@@ -36,6 +36,7 @@
list.add(dev_record.getUid());
list.add(dev_record.getUname());
list.add(dev_record.getPicture_num());
+ list.add(dev_record.getError_state());
if(dev_record.getPicture_num()>=1){
sql+=",picture_one";
endsql+=",? ";
@@ -110,11 +111,19 @@
Page p=binf.getPage();
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,error_dispose,picture_num,solve_uid,solve_picture_num,uid,uname,solve_uname,solve_record_time " +
+ String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,error_dispose,picture_num,error_state,solve_uid,solve_picture_num,uid,uname,solve_uname,solve_record_time " +
" ,db_battinf.tb_battinf.stationname,stationname1,stationname2,stationname3,stationname5 " +
" from db_battinf.tb_deverror_record,db_battinf.tb_battinf " +
" where tb_deverror_record.stationid=tb_battinf.stationid " +
" and tb_deverror_record.stationid like ? and stationname1 like ? and stationname2 like ? and stationname5 like ? " ;
+ //闂绫诲瀷
+ String errSqlT=" and error_state!=?";
+ String errSqlF=" and error_state=?";
+ if(binf.getMonCount()==-1) {
+ sql+=errSqlT;
+ }else {
+ sql+=errSqlF;
+ }
//鐢ㄦ埛绠＄悊
String userSql=" and db_battinf.tb_battinf.StationId in(" +
" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=? "+
@@ -126,7 +135,7 @@
String limitSql=" limit ?,? ";
sql+=limitSql;
List<Deverror_record> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationId()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
- ,binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()}, new CallBack() {
+ ,binf.getMonCount(),binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -145,6 +154,7 @@
dev_record.setError_en(rs.getInt("error_en"));
dev_record.setError_dispose(rs.getString("error_dispose"));
dev_record.setPicture_num(rs.getInt("picture_num"));
+ dev_record.setError_state(rs.getInt("error_state"));
dev_record.setUid(rs.getInt("uid"));
dev_record.setUname(rs.getString("uname"));
dev_record.setSolve_uid(rs.getInt("solve_uid"));
@@ -203,6 +213,7 @@
binf.setStationName3("");
binf.setStationName5("");
binf.setStationId("");
+ binf.setMonCount(-1);
Page p=new Page();
p.setPageCurr(1);
p.setPageSize(10);
--
Gitblit v1.9.1