zhouli 10 months ago
parent
commit
b3b1673f95

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

@@ -9,6 +9,7 @@ import org.sky.core.log.exception.ServiceException;
 import org.sky.core.mp.base.BaseServiceImpl;
 import org.sky.core.tool.utils.BeanUtil;
 import org.sky.core.tool.utils.CollectionUtil;
+import org.sky.core.tool.utils.StringUtil;
 import org.sky.scientific.excel.CgJsbzExcel;
 import org.sky.scientific.mapper.CgJsbzMapper;
 import org.sky.scientific.mapper.XmMapper;
@@ -56,13 +57,12 @@ public class CgJsbzServiceImpl extends BaseServiceImpl<CgJsbzMapper, CgJsbzEntit
 
 	@Override
 	public boolean save(CgJsbzEntity cgJsbz) {
-		if (cgJsbz.getXmbh() != null) {
-			XmEntity dbXm = xmMapper.selectOne(Wrappers.<XmEntity>lambdaQuery().eq(XmEntity::getXmbh, cgJsbz.getXmbh()));
-			if(dbXm==null){
-				throw new ServiceException("项目编号["+cgJsbz.getXmbh()+"]不存在,导入失败,请检查数据");
+		if (!StringUtil.isAllBlank(cgJsbz.getXmbh(), cgJsbz.getXmmc())) {
+			Long xmId = xmMapper.getXmIdByXmmcOrXmbh(null, cgJsbz.getXmmc(), cgJsbz.getXmbh());
+			if (xmId == null) {
+				throw new ServiceException("项目不存在,导入失败,请检查数据");
 			}
-			cgJsbz.setXmId(dbXm != null ? dbXm.getId() : null);
-			cgJsbz.setXmmc(dbXm != null ? dbXm.getXmmc() : null);
+			cgJsbz.setXmId(xmId);
 		}
 		return super.save(cgJsbz);
 	}

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

@@ -10,6 +10,7 @@ import org.sky.core.log.exception.ServiceException;
 import org.sky.core.mp.base.BaseServiceImpl;
 import org.sky.core.tool.utils.BeanUtil;
 import org.sky.core.tool.utils.CollectionUtil;
+import org.sky.core.tool.utils.StringUtil;
 import org.sky.scientific.excel.CgKylwExcel;
 import org.sky.scientific.mapper.CgKylwMapper;
 import org.sky.scientific.mapper.XmMapper;
@@ -59,13 +60,12 @@ public class CgKylwServiceImpl extends BaseServiceImpl<CgKylwMapper, CgKylwEntit
 
 	@Override
 	public boolean save(CgKylwEntity cgKylw) {
-		if (cgKylw.getXmbh() != null) {
-			XmEntity dbXm = xmMapper.selectOne(Wrappers.<XmEntity>lambdaQuery().eq(XmEntity::getXmbh, cgKylw.getXmbh()));
-			if(dbXm==null){
-				throw new ServiceException("项目编号["+cgKylw.getXmbh()+"]不存在,导入失败,请检查数据");
+		if (!StringUtil.isAllBlank(cgKylw.getXmbh(), cgKylw.getXmmc())) {
+			Long xmId = xmMapper.getXmIdByXmmcOrXmbh(null, cgKylw.getXmmc(), cgKylw.getXmbh());
+			if (xmId == null) {
+				throw new ServiceException("项目不存在,导入失败,请检查数据");
 			}
-			cgKylw.setXmId(dbXm != null ? dbXm.getId() : null);
-			cgKylw.setXmmc(dbXm != null ? dbXm.getXmmc() : null);
+			cgKylw.setXmId(xmId);
 		}
 		return super.save(cgKylw);
 	}

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

@@ -61,17 +61,12 @@ public class CgQtServiceImpl extends BaseServiceImpl<CgQtMapper, CgQtEntity> imp
 
 	@Override
 	public boolean save(CgQtEntity cgQt) {
-		if (!StringUtil.isAllBlank(cgQt.getXmmc(), cgQt.getXmbh())) {
-			XmEntity dbXm = xmMapper.selectOne(Wrappers.<XmEntity>lambdaQuery()
-				.eq(XmEntity::getXmbh, cgQt.getXmbh())
-				.or()
-				.eq(XmEntity::getXmmc, cgQt.getXmmc()));
-			if (dbXm == null) {
-				throw new ServiceException("研发项目不存在,导入失败,请检查数据");
+		if (!StringUtil.isAllBlank(cgQt.getXmbh(), cgQt.getXmmc())) {
+			Long xmId = xmMapper.getXmIdByXmmcOrXmbh(null, cgQt.getXmmc(), cgQt.getXmbh());
+			if (xmId == null) {
+				throw new ServiceException("项目不存在,导入失败,请检查数据");
 			}
-			cgQt.setXmId(dbXm.getId());
-			cgQt.setXmmc(dbXm.getXmmc());
-			cgQt.setXmbh(dbXm.getXmbh());
+			cgQt.setXmId(xmId);
 		}
 		return super.save(cgQt);
 	}

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

@@ -9,6 +9,7 @@ import org.sky.core.log.exception.ServiceException;
 import org.sky.core.mp.base.BaseServiceImpl;
 import org.sky.core.tool.utils.BeanUtil;
 import org.sky.core.tool.utils.CollectionUtil;
+import org.sky.core.tool.utils.StringUtil;
 import org.sky.scientific.excel.CgRjzzqExcel;
 import org.sky.scientific.mapper.CgRjzzqMapper;
 import org.sky.scientific.mapper.XmMapper;
@@ -59,13 +60,12 @@ public class CgRjzzqServiceImpl extends BaseServiceImpl<CgRjzzqMapper, CgRjzzqEn
 
 	@Override
 	public boolean save(CgRjzzqEntity cgRjzzq) {
-		if (cgRjzzq.getXmbh() != null) {
-			XmEntity dbXm = xmMapper.selectOne(Wrappers.<XmEntity>lambdaQuery().eq(XmEntity::getXmbh, cgRjzzq.getXmbh()));
-			if(dbXm==null){
-				throw new ServiceException("项目编号["+cgRjzzq.getXmbh()+"]不存在,导入失败,请检查数据");
+		if (!StringUtil.isAllBlank(cgRjzzq.getXmbh(), cgRjzzq.getXmmc())) {
+			Long xmId = xmMapper.getXmIdByXmmcOrXmbh(null, cgRjzzq.getXmmc(), cgRjzzq.getXmbh());
+			if (xmId == null) {
+				throw new ServiceException("项目不存在,导入失败,请检查数据");
 			}
-			cgRjzzq.setXmId(dbXm != null ? dbXm.getId() : null);
-			cgRjzzq.setXmmc(dbXm != null ? dbXm.getXmmc() : null);
+			cgRjzzq.setXmId(xmId);
 		}
 		return super.save(cgRjzzq);
 	}

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

@@ -9,6 +9,7 @@ import org.sky.core.log.exception.ServiceException;
 import org.sky.core.mp.base.BaseServiceImpl;
 import org.sky.core.tool.utils.BeanUtil;
 import org.sky.core.tool.utils.CollectionUtil;
+import org.sky.core.tool.utils.StringUtil;
 import org.sky.scientific.excel.CgZlExcel;
 import org.sky.scientific.mapper.CgZlMapper;
 import org.sky.scientific.mapper.XmMapper;
@@ -48,7 +49,7 @@ public class CgZlServiceImpl extends BaseServiceImpl<CgZlMapper, CgZlEntity> imp
 	@Override
 	public void importZl(MultipartFile file) {
 		List<CgZlExcel> data = ExcelUtil.read(file, 0, 2, CgZlExcel.class);
-		if(CollectionUtil.isEmpty(data)){
+		if (CollectionUtil.isEmpty(data)) {
 			throw new ServiceException("未能从模板中读取数据,请检查模板格式是否正确");
 		}
 		for (CgZlExcel excel : data) {
@@ -59,13 +60,12 @@ public class CgZlServiceImpl extends BaseServiceImpl<CgZlMapper, CgZlEntity> imp
 
 	@Override
 	public boolean save(CgZlEntity cgZl) {
-		if (cgZl.getXmbh() != null) {
-			XmEntity dbXm = xmMapper.selectOne(Wrappers.<XmEntity>lambdaQuery().eq(XmEntity::getXmbh, cgZl.getXmbh()));
-			if(dbXm==null){
-				throw new ServiceException("项目编号["+cgZl.getXmbh()+"]不存在,导入失败,请检查数据");
+		if (!StringUtil.isAllBlank(cgZl.getXmbh(), cgZl.getXmmc())) {
+			Long xmId = xmMapper.getXmIdByXmmcOrXmbh(null, cgZl.getXmmc(), cgZl.getXmbh());
+			if (xmId == null) {
+				throw new ServiceException("项目不存在,导入失败,请检查数据");
 			}
-			cgZl.setXmId(dbXm != null ? dbXm.getId() : null);
-			cgZl.setXmmc(dbXm != null ? dbXm.getXmmc() : null);
+			cgZl.setXmId(xmId);
 		}
 		return super.save(cgZl);
 	}