入离职工时加上考勤报表问题修复

src/com/engine/kq/cmd/report/ExportExcelCmd.java

@@ -993,7 +993,7 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
             "    a.resourceid, " +
             "    SUM(tiaoxiuamount) AS tiaoxiuamounts, " +
             "	 SUM(usedamount) AS usedamounts, " +
-            "	 GREATEST( sum(extraamount) + SUM(tiaoxiuamount) - SUM(usedamount), 0.00000) AS difference_amounts, " +
+            "	 GREATEST( SUM(COALESCE(extraamount, 0)) + SUM(COALESCE(tiaoxiuamount, 0)) - SUM(COALESCE(usedamount, 0)), 0.00000) AS difference_amounts, " +
             "    COALESCE(datetype, b.changetype) AS grouping_date, " +
             "    CASE " +
             "        WHEN datetype IS NOT NULL THEN datetype " +
@@ -1051,7 +1051,7 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
             "    a.resourceid, " +
             "    SUM(tiaoxiuamount) AS tiaoxiuamounts, " +
             "	 SUM(usedamount) AS usedamounts, " +
-            "	 GREATEST( sum(extraamount) + SUM(tiaoxiuamount) - SUM(usedamount), 0.00000) AS difference_amounts, " +
+            "	 GREATEST( SUM(COALESCE(extraamount, 0)) + SUM(COALESCE(tiaoxiuamount, 0)) - SUM(COALESCE(usedamount, 0)), 0.00000) AS difference_amounts, " +
             "    COALESCE(datetype, b.changetype) AS grouping_date, " +
             "    CASE " +
             "        WHEN datetype IS NOT NULL THEN datetype " +

src/com/engine/kq/cmd/report/GetKQReportCmd.java

@@ -1225,9 +1225,7 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
 		Map<String, Object> result = new HashMap<String, Object>();
 		String acqSql = "SELECT " +
 				"    a.resourceid, " +
-				"    SUM(tiaoxiuamount) AS tiaoxiuamounts, " +
+				"	 GREATEST( SUM(COALESCE(extraamount, 0)) + SUM(COALESCE(tiaoxiuamount, 0)) - SUM(COALESCE(usedamount, 0)), 0.00000) AS difference_amounts, " +
-				"	 SUM(usedamount) AS usedamounts, " +
-				"	 GREATEST( sum(extraamount) + SUM(tiaoxiuamount) - SUM(usedamount), 0.00000) AS difference_amounts, " +
 				"    COALESCE(datetype, b.changetype) AS grouping_date, " +
 				"    CASE " +
 				"        WHEN datetype IS NOT NULL THEN datetype " +
@@ -1288,7 +1286,7 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
 				"    a.resourceid, " +
 				"    SUM(tiaoxiuamount) AS tiaoxiuamounts, " +
 				"	 SUM(usedamount) AS usedamounts, " +
-				"	 GREATEST( sum(extraamount) + SUM(tiaoxiuamount) - SUM(usedamount), 0.00000) AS difference_amounts, " +
+				"	 GREATEST( SUM(COALESCE(extraamount, 0)) + SUM(COALESCE(tiaoxiuamount, 0)) - SUM(COALESCE(usedamount, 0)), 0.00000) AS difference_amounts, " +
 				"    COALESCE(datetype, b.changetype) AS grouping_date, " +
 				"    CASE " +
 				"        WHEN datetype IS NOT NULL THEN datetype " +

src/weaver/interfaces/sskj/action/OverTimeBatchAction.java

@@ -70,6 +70,12 @@ public class OverTimeBatchAction implements Action {
 
             bb.writeLog("detailInfos: " + detailInfos);
 
+            String sql = "select tiaoxiuid from kq_flow_overtime where requetsid = ?";
+            rs.executeQuery(sql);
+
+            int flag = 0;
+            //1
+
             for ( Map<String, Object> di: detailInfos) {
                 Integer res = Util.getIntValue( Util.null2String( di.get("resourceId")));
                 String fromDate = Util.null2String( di.get("fromDate"));