diff --git a/代码/jsp/telsale_import/.idea/artifacts/2018_war_exploded.xml b/代码/jsp/telsale_import/.idea/artifacts/2018_war_exploded.xml index 08aff9c..399b4fb 100644 --- a/代码/jsp/telsale_import/.idea/artifacts/2018_war_exploded.xml +++ b/代码/jsp/telsale_import/.idea/artifacts/2018_war_exploded.xml @@ -1,13 +1,19 @@ - - $PROJECT_DIR$/out/artifacts/2018_war_exploded + + $PROJECT_DIR$/../../../../../../../应用/电销管理/exploded - + + + + + + + \ No newline at end of file diff --git a/代码/jsp/telsale_import/.idea/artifacts/telsale_management.xml b/代码/jsp/telsale_import/.idea/artifacts/telsale_management.xml new file mode 100644 index 0000000..8b33b4c --- /dev/null +++ b/代码/jsp/telsale_import/.idea/artifacts/telsale_management.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/../../../../../../../应用/电销管理/war + + + + + \ No newline at end of file diff --git a/代码/jsp/telsale_import/.idea/dataSources.local.xml b/代码/jsp/telsale_import/.idea/dataSources.local.xml index 53f6547..df1c21e 100644 --- a/代码/jsp/telsale_import/.idea/dataSources.local.xml +++ b/代码/jsp/telsale_import/.idea/dataSources.local.xml @@ -1,6 +1,6 @@ - + $# diff --git a/代码/jsp/telsale_import/.idea/deployment.xml b/代码/jsp/telsale_import/.idea/deployment.xml new file mode 100644 index 0000000..029090e --- /dev/null +++ b/代码/jsp/telsale_import/.idea/deployment.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/代码/jsp/telsale_import/.idea/libraries/commons_codec_1_10.xml b/代码/jsp/telsale_import/.idea/libraries/commons_codec_1_10.xml deleted file mode 100644 index 378c683..0000000 --- a/代码/jsp/telsale_import/.idea/libraries/commons_codec_1_10.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/代码/jsp/telsale_import/.idea/sshConfigs.xml b/代码/jsp/telsale_import/.idea/sshConfigs.xml new file mode 100644 index 0000000..59cbed2 --- /dev/null +++ b/代码/jsp/telsale_import/.idea/sshConfigs.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/代码/jsp/telsale_import/.idea/webServers.xml b/代码/jsp/telsale_import/.idea/webServers.xml new file mode 100644 index 0000000..436badd --- /dev/null +++ b/代码/jsp/telsale_import/.idea/webServers.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java b/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java index a97eef6..659afc0 100644 --- a/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java +++ b/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java @@ -41,7 +41,7 @@ public class DataImport int rowIndex = 0; int rowCount = 0; int errorCount = 0; - String errorMessage = "数据错误，请修正后重新上传！
\n"; + String errorMessage = "读取excel表格时发现错误，请修正后重新上传！
\n"; try { @@ -191,7 +191,7 @@ public class DataImport CallableStatement callStmt = null; String callProcedureSql = "{call telsale_policy_check_pkg.save_policy(?,?,?,?,?,?,?,?,?,?,?,?,?)}"; - String errorMessage = "写入oracle数据库错误，请按照提示修正后重新上传！
\n"; + String errorMessage = "写入oracle数据库时发现错误，请按照提示修正后重新上传！
\n"; //用来记录异常记录的数量 int errorCount = 0; @@ -287,7 +287,7 @@ public class DataImport PreparedStatement statement = null; int errorCount = 0; - String errorMessage = "写入数据错误，请根据提示修正后重新上传！"; + String errorMessage = "写入informix数据库时发现错误，请根据提示修正后重新上传！"; String insertSQL = "INSERT INTO dxbd_test \n" + " (bdh,\n" + @@ -354,8 +354,8 @@ public class DataImport /** * @Description: 读取excel文件，将数据写入oracle和informix数据库。 - * 数据库连接关闭自动提交，在两个数据库都写入成功后提交。 - * 只要有一个数据库写入抛出异常，回滚两个数据库的事务。 + * 数据库连接关闭自动提交，在两个数据库都写入成功后提交。 + * 只要有一个数据库写入抛出异常，回滚两个数据库的事务。 * @Param: * @return: void * @Author: 王炜 @@ -390,13 +390,14 @@ public class DataImport try { - + //关闭自动提交 oracleConnection.setAutoCommit( false ); informixConnection.setAutoCommit( false ); saveTelsalePolicyDataToOracle( oracleConnection, policyList ); saveTelsalePolicyDataToInformix( informixConnection, policyList ); + //没问题就提交 oracleConnection.commit(); informixConnection.commit(); } diff --git a/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java b/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java index 4c31fe0..d865274 100644 --- a/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java +++ b/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java @@ -39,9 +39,11 @@ public class uploadDataProcessor extends HttpServlet oracleUserName = (String) config.getServletContext().getInitParameter( "oracleUserName" ); oraclePassword = (String) config.getServletContext().getInitParameter( "oraclePassword" ); - //informix dxbd_test - //informixURL = (String) config.getServletContext().getInitParameter( "informixURL" ); - informixURL = (String) config.getServletContext().getInitParameter( "informix_url_92" ); + //informix + //生产环境 + informixURL = (String) config.getServletContext().getInitParameter( "informix_prod_url" ); + //测试环境 + //informixURL = (String) config.getServletContext().getInitParameter( "informix_url_92" ); telsalePolicyOperatorListTableName = (String) config.getServletContext() .getInitParameter( "telsalePolicyOperatorListTableName" ); } diff --git a/代码/oracle/项目/电销保单信息管理.dsk b/代码/oracle/项目/电销保单信息管理.dsk index f5f6222..9c125ac 100644 --- a/代码/oracle/项目/电销保单信息管理.dsk +++ b/代码/oracle/项目/电销保单信息管理.dsk @@ -1,53 +1,43 @@ PL/SQL Developer Project Desktop [Desktop] -SavePath=D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\ Index=1 -Filename=D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\telsale_policy_check_pkg.pck -VCSDBObject=0 -Connection=271145534323418944714289409142133087477745794477439133453099306130553049344348614855459331633157337533853395 -DPI=96 -Left=0 -Top=0 -Width=1550 -Height=719 -State=0 -Type=3 -ChildListIndex=1 -Pinned=0 - -Index=2 -Filename=D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\Ϣ.sql -Connection=228750254923504546234889507549414071444946675045492738813667372537513777391545654559423337633757384738573867 -DPI=96 -Left=0 -Top=0 -Width=1474 -Height=636 -State=0 -Type=1 -ChildListIndex=3 -Pinned=0 - -Index=3 Filename=D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\ѯ.sql -Connection=206849344704482648524670472845943724416649604602477237263992395439484070356842184212446240564050401240224032 +Connection=244247965046494447145012484649683842385250145008442633163310327232823292 DPI=96 Left=0 Top=0 -Width=1550 +Width=1275 Height=719 State=0 Type=1 ChildListIndex=2 Pinned=0 +Index=2 +Filename=D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\telsale_policy_check_pkg.pck +VCSDBObject=0 +Connection=216549034801466750134767469748193565357547374763498140633577401940294039 +DPI=96 +Left=0 +Top=0 +Width=1275 +Height=719 +State=0 +Type=3 +ChildListIndex=1 +Pinned=0 + +Index=3 +Filename= +Connection=257344154185430743334119420940753205321541214115455734473441314731573167 + [Files] [MRU] -1,D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\ѯ.sql 1,D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\Ϣ.sql +1,D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\ѯ.sql 3,D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\telsale_policy_check_pkg.pck 1,D:\develop\projects_win\2018\telsale_management_2017\\oracle\Ŀ\\Ϣ¼־.sql diff --git a/数据/测试数据/有空行，有保单号错误 - 副本.xls b/数据/测试数据/有空行，有保单号错误 - 副本.xls index 1bcbc3c..90b8451 100644 Binary files a/数据/测试数据/有空行，有保单号错误 - 副本.xls and b/数据/测试数据/有空行，有保单号错误 - 副本.xls differ diff --git a/数据/测试数据/经办人错误.xls b/数据/测试数据/经办人错误.xls index 04e7a54..0fb05b6 100644 Binary files a/数据/测试数据/经办人错误.xls and b/数据/测试数据/经办人错误.xls differ