zouxuan 4 tahun lalu
induk
melakukan
0295dfb1ab

+ 6 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/FinancialExpenditureServiceImpl.java

@@ -110,6 +110,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
 						}else {
 							objectMap.put("amount", row.get(s));
 						}
+						continue;
 					}
 					if (columnValue.equals("organName") && StringUtils.isNotEmpty(row.get(s).toString())) {
 						Integer integer = organMap.get(row.get(s));
@@ -119,6 +120,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
 						}else {
 							objectMap.put("organId", integer);
 						}
+						continue;
 					}
 					if (columnValue.equals("cooperationOrganName") && StringUtils.isNotEmpty(row.get(s).toString())) {
 						Integer integer = cooperationOrganMap.get(row.get(s));
@@ -127,6 +129,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
 						}else {
 							objectMap.put("cooperationOrganId", integer);
 						}
+						continue;
 					}
 					if (columnValue.equals("paymentTime") && StringUtils.isNotEmpty(row.get(s).toString())) {
 						String toString = row.get(s).toString();
@@ -134,8 +137,11 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
 							Date date = DateUtil.stringToDate(toString, DateUtil.DEFAULT_PATTERN);
 							if(date == null){
 								throw new BizException("导入数据错误  付款时间格式错误");
+							}else {
+								objectMap.put(columnValue, DateUtil.format(date,DateUtil.DEFAULT_PATTERN));
 							}
 						}
+						continue;
 					}
 					objectMap.put(columnValue, row.get(s));
 				}

+ 1 - 3
mec-im/src/main/java/com/ym/common/ErrorEnum.java

@@ -36,9 +36,7 @@ public enum ErrorEnum {
     ERR_OVER_MAX_COUNT(31, "Over max count"),
     ERR_TEACHER_EXIST_IN_ROOM(32, "Teacher exist in room"),
     ERR_DOWNGRADE_ROLE(33, "Can't downgrade role"),
-    ERR_CHANGE_ROLE(34, "Only change student to teacher"),
-
-    ;
+    ERR_CHANGE_ROLE(34, "Only change student to teacher");
 
     private @Getter int errCode;
     private @Getter String errMsg;

TEMPAT SAMPAH
mec-web/src/main/resources/excelTemplate/财务支出导入模板.xls