Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 gx_tieta/src/com/fgkj/dao/impl/User_ChartImpl.java

@@ -53,7 +53,10 @@
      list.add(uchart.getChart_dev_alarm());

      list.add(uchart.getChart_pre_charge());

      list.add(uchart.getChart_online_charge());

      String sql="insert into web_site.tb_user_Chart(chart_name,chart_file,Chart_logo,Chart_normal,Chart_behind,Chart_warn,Chart_timeout,Chart_nuclear_cap,Chart_dev_alarm,Chart_pre_charge,Chart_online_charge) values(?,?,?,?,?,?,?,?,?,?,?)";

      list.add(uchart.getChart_poff());

      list.add(uchart.getChart_install());

      list.add(uchart.getChart_xuhang());

      String sql="insert into web_site.tb_user_Chart(chart_name,chart_file,Chart_logo,Chart_normal,Chart_behind,Chart_warn,Chart_timeout,Chart_nuclear_cap,Chart_dev_alarm,Chart_pre_charge,Chart_online_charge,Chart_poff,Chart_install,Chart_xuhang) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";

      boolean bl=DAOHelper.executeUpdatePicture(DBUtil.getConn(), sql, list);

      return bl;

   }

@@ -143,11 +146,37 @@
         list.add(uchart.getChart_online_charge());

         sql+=online_chargeSql;

      }

      //Chart_poff图片

      String poffSql=" Chart_poff=? ";

      if(uchart.getChart_poff()!=null&&uchart.getChart_poff().length()>0){

         if(list.size()>0){

            sql+=",";

         }

         list.add(uchart.getChart_poff());

         sql+=poffSql;

      }

      //Chart_install图片

      String installSql=" Chart_install=? ";

      if(uchart.getChart_install()!=null&&uchart.getChart_install().length()>0){

         if(list.size()>0){

            sql+=",";

         }

         list.add(uchart.getChart_install());

         sql+=installSql;

      }

      //Chart_xuhang图片

      String xuhangSql=" Chart_xuhang=? ";

      if(uchart.getChart_xuhang()!=null&&uchart.getChart_xuhang().length()>0){

         if(list.size()>0){

            sql+=",";

         }

         list.add(uchart.getChart_xuhang());

         sql+=xuhangSql;

      }

      //endSql

      String endSql=" where chart_file=?";

      String endSql=" where chart_file=? ";

      list.add(uchart.getChart_file());

      sql+=endSql;

      //System.out.println(list.size()+"  "+sql);

      boolean bl=DAOHelper.executeUpdatePicture(DBUtil.getConn(), sql, list);

      return bl;

   }