Browse Source

Merge branch 'kd-dev' of https://gitee.com/zhoulisky/kd-cloud into kd-dev

zhoulisky 4 weeks ago
parent
commit
c4129f9b99

+ 5 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/AssetServiceImpl.java

@@ -123,8 +123,12 @@ public class AssetServiceImpl extends BaseServiceImpl<AssetMapper, AssetEntity>
 				throw new ServiceException("状态错误,请重新选择");
 			}
 			asset.setStatus(optional.get().getCode());
+			try {
+				this.save(asset);
+			} catch (Exception e) {
+				throw new ServiceException("序号为[" + excel1.getXh() + "]的数据错误");
+			}
 
-			this.save(asset);
 		}
 	}
 

+ 5 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/CgKylwServiceImpl.java

@@ -105,7 +105,11 @@ public class CgKylwServiceImpl extends BaseServiceImpl<CgKylwMapper, CgKylwEntit
 			if(isDuplicate(kylwDTO)){
 				throw new ServiceException("论文名称已存在");
 			}
-			this.save(kylwDTO);
+			try {
+				this.save(kylwDTO);
+			} catch (Exception e) {
+				throw new ServiceException("序号为[" + excel.getXh() + "]的数据错误");
+			}
 		}
 	}
 

+ 5 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/CgQtServiceImpl.java

@@ -79,7 +79,11 @@ public class CgQtServiceImpl extends BaseServiceImpl<CgQtMapper, CgQtEntity> imp
 			if(isDuplicate(qtDTO)){
 				throw new ServiceException("成果编号/成果名称已存在");
 			}
-			this.save(qtDTO);
+			try {
+				this.save(qtDTO);
+			} catch (Exception e) {
+				throw new ServiceException("序号为[" + excel.getXh() + "]的数据错误");
+			}
 		}
 	}
 

+ 7 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/CgRjzzqServiceImpl.java

@@ -72,7 +72,13 @@ public class CgRjzzqServiceImpl extends BaseServiceImpl<CgRjzzqMapper, CgRjzzqEn
 				}
 				entity.setXmId(xmId);
 			}
-			this.save(entity);
+			try {
+				this.save(entity);
+			} catch (Exception e) {
+				throw new ServiceException("序号为[" + excel.getXh() + "]的数据错误");
+			}
+
+
 		}
 	}
 

+ 6 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/CgZlServiceImpl.java

@@ -83,7 +83,12 @@ public class CgZlServiceImpl extends BaseServiceImpl<CgZlMapper, CgZlEntity> imp
 				}
 				zlDTO.setXmId(xmId);
 			}
-			this.save(zlDTO);
+			try {
+				this.save(zlDTO);
+			} catch (Exception e) {
+				throw new ServiceException("序号为[" + excel.getXh() + "]的数据错误");
+			}
+
 		}
 	}
 

+ 6 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/TechnicianServiceImpl.java

@@ -235,7 +235,12 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 				unicode = generateUnicode();
 			}
 			technician.setUnicode(unicode);
-			this.save(technician);
+			try {
+				this.save(technician);
+			} catch (Exception e) {
+				throw new ServiceException("序号为[" + excel.getXh() + "]的数据错误");
+			}
+
 		}
 	}