81041
2018-11-06 4342203d21dfac86644c6ffc0c5b872e9e79ab68
问题反馈修改
3个文件已修改
189 ■■■■ 已修改文件
gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/Deverror_record.java 121 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
@@ -26,6 +26,7 @@
        Deverror_record dev_record=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Deverror_record.class);
        User_inf uinf=(User_inf) getUser();
        dev_record.setUid(uinf.getUId());
        dev_record.setUname(uinf.getUName());
        if(file!=null&&file.size()>0){
            for (int i=0;i<file.size();i++) {
                switch (i) {
@@ -55,6 +56,29 @@
     //用户处理的结果
    public String update(){
        Deverror_record dev_record=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Deverror_record.class);
        User_inf uinf=(User_inf) getUser();
        dev_record.setSolve_uid(uinf.getUId());
        dev_record.setSolve_uname(uinf.getUName());
        if(file!=null&&file.size()>0){
            for (int i=0;i<file.size();i++) {
                switch (i) {
                case 0:
                    dev_record.setSolve_picture_one(file.get(i));
                    break;
                case 1:
                    dev_record.setSolve_picture_two(file.get(i));
                    break;
                case 2:
                    dev_record.setSolve_picture_three(file.get(i));
                    break;
                case 3:
                    dev_record.setSolve_picture_four(file.get(i));
                    break;
                default:
                    break;
                }
            }
        }
        ServiceModel model=service.update(dev_record);
        result=tojson(model);
        return SUCCESS;
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -26,14 +26,15 @@
   //用户手动添加问题
    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,picture_num ";
        String endsql=") values(?,?,?,?,?,?";
        String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,error_dispose,uid,uname,picture_num ";
        String endsql=") values(?,?,?,?,?,?,?";
        List list=new ArrayList();
        list.add(dev_record.getStationId());
        list.add(dev_record.getRecord_time());
        list.add(dev_record.getError_descript());
        list.add(dev_record.getError_dispose());
        list.add(dev_record.getUid());
        list.add(dev_record.getUname());
        list.add(dev_record.getPicture_num());
        if(dev_record.getPicture_num()>=1){
            sql+=",picture_one";
@@ -62,9 +63,34 @@
    //用户处理的结果
    public boolean update(Object obj) {
        Deverror_record dev_record=(Deverror_record) obj;
        System.out.println(dev_record);
        String sql=" update db_battinf.tb_deverror_record set error_dispose=?,error_en=? where num=? ";
        boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dev_record.getError_dispose(),dev_record.getError_en(),dev_record.getNum()});
        List list=new ArrayList();
        //System.out.println(dev_record);
        String sql=" update db_battinf.tb_deverror_record set error_dispose=?,error_en=?,solve_uid=?,solve_uname=?,record_time=? ";
        String endSql=" where num=? ";
        list.add(dev_record.getError_dispose());
        list.add(dev_record.getError_en());
        list.add(dev_record.getSolve_uid());
        list.add(dev_record.getSolve_uname());
        list.add(dev_record.getSolve_record_time());
        if (dev_record.getSolve_picture_num()>=1) {
            sql+=",solve_picture_one=? ";
            list.add(dev_record.getSolve_picture_one());
        }
        if (dev_record.getSolve_picture_num()>=2) {
            sql+=",solve_picture_two=? ";
            list.add(dev_record.getSolve_picture_two());
        }
        if (dev_record.getSolve_picture_num()>=3) {
            sql+=",solve_picture_three=? ";
            list.add(dev_record.getSolve_picture_three());
        }
        if (dev_record.getSolve_picture_num()>=4) {
            sql+=",solve_picture_four=? ";
            list.add(dev_record.getSolve_picture_four());
        }
        sql+=endSql;
        list.add(dev_record.getNum());
        boolean bl=DAOHelper.executeUpdatePicture(DBUtil.getConn(), sql,list);
        return bl;
    }
@@ -83,7 +109,7 @@
        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 " +
        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  " +
                "  ,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 " +
@@ -118,6 +144,12 @@
                        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.setUid(rs.getInt("uid"));
                        dev_record.setUname(rs.getString("uname"));
                        dev_record.setSolve_uid(rs.getInt("solve_uid"));
                        dev_record.setSolve_uname(rs.getString("solve_uname"));
                        dev_record.setSolve_picture_num(rs.getInt("solve_picture_num"));
                        dev_record.setSolve_record_time(rs.getTimestamp("solve_record_time"));
                        Page page=new Page();
                        dev_record.setPage(page);
                        list.add(dev_record);
gx_tieta/src/com/fgkj/dto/Deverror_record.java
@@ -18,22 +18,27 @@
    private Date record_time;
    private String error_descript;//问题描述
    private String error_dispose;//问题处理
    private int uid;
    private int error_en;         //问题是否解决
    private String note;
    private Page page;
    private Blob picture_one_blob;
    private Blob picture_two_blob;
    private Blob picture_three_blob;
    private Blob picture_four_blob;
    private int uid;
    private String uname;
    private File picture_one;
    private File picture_two;
    private File picture_three;
    private File picture_four;
    private int picture_num;
    private int  solve_uid;
    private String solve_uname;
    private File solve_picture_one;
    private File solve_picture_two;
    private File solve_picture_three;
    private File solve_picture_four;
    private int  solve_picture_num;
    private Date solve_record_time;
    public int getNum() {
        return num;
    }
@@ -113,30 +118,7 @@
    public void setPage(Page page) {
        this.page = page;
    }
    public Blob getPicture_one_blob() {
        return picture_one_blob;
    }
    public void setPicture_one_blob(Blob picture_one_blob) {
        this.picture_one_blob = picture_one_blob;
    }
    public Blob getPicture_two_blob() {
        return picture_two_blob;
    }
    public void setPicture_two_blob(Blob picture_two_blob) {
        this.picture_two_blob = picture_two_blob;
    }
    public Blob getPicture_three_blob() {
        return picture_three_blob;
    }
    public void setPicture_three_blob(Blob picture_three_blob) {
        this.picture_three_blob = picture_three_blob;
    }
    public Blob getPicture_four_blob() {
        return picture_four_blob;
    }
    public void setPicture_four_blob(Blob picture_four_blob) {
        this.picture_four_blob = picture_four_blob;
    }
    public File getPicture_one() {
        return picture_one;
    }
@@ -174,6 +156,60 @@
    public void setError_dispose(String error_dispose) {
        this.error_dispose = error_dispose;
    }
    public int getSolve_uid() {
        return solve_uid;
    }
    public void setSolve_uid(int solve_uid) {
        this.solve_uid = solve_uid;
    }
    public File getSolve_picture_one() {
        return solve_picture_one;
    }
    public void setSolve_picture_one(File solve_picture_one) {
        this.solve_picture_one = solve_picture_one;
    }
    public File getSolve_picture_two() {
        return solve_picture_two;
    }
    public void setSolve_picture_two(File solve_picture_two) {
        this.solve_picture_two = solve_picture_two;
    }
    public File getSolve_picture_three() {
        return solve_picture_three;
    }
    public void setSolve_picture_three(File solve_picture_three) {
        this.solve_picture_three = solve_picture_three;
    }
    public File getSolve_picture_four() {
        return solve_picture_four;
    }
    public void setSolve_picture_four(File solve_picture_four) {
        this.solve_picture_four = solve_picture_four;
    }
    public int getSolve_picture_num() {
        return solve_picture_num;
    }
    public void setSolve_picture_num(int solve_picture_num) {
        this.solve_picture_num = solve_picture_num;
    }
    public String getUname() {
        return uname;
    }
    public void setUname(String uname) {
        this.uname = uname;
    }
    public String getSolve_uname() {
        return solve_uname;
    }
    public void setSolve_uname(String solve_uname) {
        this.solve_uname = solve_uname;
    }
    public Date getSolve_record_time() {
        return solve_record_time;
    }
    public void setSolve_record_time(Date solve_record_time) {
        this.solve_record_time = solve_record_time;
    }
    @Override
    public String toString() {
        return "Deverror_record [num=" + num + ", stationId=" + stationId
@@ -182,16 +218,19 @@
                + ", stationName3=" + stationName3 + ", stationName5="
                + stationName5 + ", record_time=" + record_time
                + ", error_descript=" + error_descript + ", error_dispose="
                + error_dispose + ", uid=" + uid + ", error_en=" + error_en
                + ", note=" + note + ", page=" + page + ", picture_one_blob="
                + picture_one_blob + ", picture_two_blob=" + picture_two_blob
                + ", picture_three_blob=" + picture_three_blob
                + ", picture_four_blob=" + picture_four_blob + ", picture_one="
                + picture_one + ", picture_two=" + picture_two
                + ", picture_three=" + picture_three + ", picture_four="
                + picture_four + ", picture_num=" + picture_num + "]";
                + error_dispose + ", error_en=" + error_en + ", note=" + note
                + ", page=" + page + ", uid=" + uid + ", uname=" + uname
                + ", picture_one=" + picture_one + ", picture_two="
                + picture_two + ", picture_three=" + picture_three
                + ", picture_four=" + picture_four + ", picture_num="
                + picture_num + ", solve_uid=" + solve_uid + ", solve_uname="
                + solve_uname + ", solve_picture_one=" + solve_picture_one
                + ", solve_picture_two=" + solve_picture_two
                + ", solve_picture_three=" + solve_picture_three
                + ", solve_picture_four=" + solve_picture_four
                + ", solve_picture_num=" + solve_picture_num
                + ", solve_record_time=" + solve_record_time + "]";
    }