检查冲突

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

@@ -479,7 +479,7 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
                                 if (fieldName.contains("LateMins") || fieldName.contains("EarlyMins")) {
                                     fieldValue = rs.getString(lsCascadekey.get(i));
                                 } else {
-                                fieldValue = getFieldValueByUnitType(rs.getString(lsCascadekey.get(i)), kqReportFieldComInfo.getUnittype(fieldid));
+                                    fieldValue = getFieldValueByUnitType(rs.getString(lsCascadekey.get(i)), kqReportFieldComInfo.getUnittype(fieldid));
                                 }
                             } else {
                                 fieldValue = "0";
@@ -747,7 +747,7 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
                     if (kqReportFieldComInfo.getFieldname().contains("LateMins") || kqReportFieldComInfo.getFieldname().contains("EarlyMins")) {
                         title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()) + "(分钟)");
                     } else {
-                    title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()) + "(" + KQReportBiz.getUnitType(kqReportFieldComInfo, user) + ")");
+                        title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()) + "(" + KQReportBiz.getUnitType(kqReportFieldComInfo, user) + ")");
                     }
                     title.put("width", 30 * 256);
                     titleList.add(title);