Browse Source

000000012

zhoulisky 6 months ago
parent
commit
5679ea94e8

+ 2 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/excel/YsWtwbyjkffyExcel.java

@@ -27,10 +27,10 @@ public class YsWtwbyjkffyExcel implements Serializable {
  	@ExcelProperty(index = 1, value = "受托单位名称")
 	private String stdwmc;
 
- 	@ExcelProperty(index = 2, value = "工作内容")
+ 	@ExcelProperty(index = 3, value = "工作内容")
 	private String zznr;
 
- 	@ExcelProperty(index = 3, value ="委外费用/万元")
+ 	@ExcelProperty(index = 4, value ="委外费用/万元")
 	private Double wwfy;
 
 }

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

@@ -87,6 +87,9 @@ public class YsQtfyServiceImpl extends BaseServiceImpl<YsQtfyMapper, YsQtfyEntit
 			entity.setXmId(xmId);
 			entity.setFynr(excel.getFynr());
 			entity.setYsje(excel.getYsje());
+			if(excel.getYsje()!=null){
+				entity.setYsje(excel.getYsje()*10000);
+			}
 			insertList.add(entity);
 
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {
@@ -107,6 +110,9 @@ public class YsQtfyServiceImpl extends BaseServiceImpl<YsQtfyMapper, YsQtfyEntit
 
 		for (YsQtfyVO temp : list) {
 			temp.setXh(index.getAndIncrement() + "");
+			if(temp.getYsje()!=null){
+				temp.setYsje(temp.getYsje()/10000);
+			}
 		}
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/预算编制/其他费用.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)

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

@@ -87,6 +87,9 @@ public class YsSjfyServiceImpl extends BaseServiceImpl<YsSjfyMapper, YsSjfyEntit
 			entity.setXmId(xmId);
 			entity.setSjnr(excel.getSjnr());
 			entity.setYsje(excel.getYsje());
+			if(excel.getYsje()!=null){
+				entity.setYsje(excel.getYsje()*10000);
+			}
 
 			insertList.add(entity);
 
@@ -107,6 +110,9 @@ public class YsSjfyServiceImpl extends BaseServiceImpl<YsSjfyMapper, YsSjfyEntit
 		AtomicInteger index = new AtomicInteger(1);
 		for (YsSjfyVO temp : list) {
 			temp.setXh(index.getAndIncrement() + "");
+			if(temp.getYsje()!=null){
+				temp.setYsje(temp.getYsje()/10000);
+			}
 		}
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/预算编制/设计费用.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)

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

@@ -83,6 +83,9 @@ public class YsWtwbyjkffyServiceImpl extends BaseServiceImpl<YsWtwbyjkffyMapper,
 			entity.setXmId(xmId);
 
 			BeanUtil.copyProperties(excel, entity);
+			if(entity.getWwfy()!=null){
+				entity.setWwfy(entity.getWwfy()*10000);
+			}
 			insertList.add(entity);
 
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {
@@ -103,6 +106,9 @@ public class YsWtwbyjkffyServiceImpl extends BaseServiceImpl<YsWtwbyjkffyMapper,
 
 		for (YsWtwbyjkffyVO temp : list) {
 			temp.setXh(index.getAndIncrement() + "");
+			if(temp.getWwfy()!=null){
+				temp.setWwfy(temp.getWwfy()/10000);
+			}
 		}
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/预算编制/委托外部研究开发费.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)

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

@@ -81,8 +81,9 @@ public class YsZbtsysyfyServiceImpl extends BaseServiceImpl<YsZbtsysyfyMapper, Y
 			YsZbtsysyfyEntity entity = new YsZbtsysyfyEntity();
 			entity.setXmId(xmId);
 			entity.setFyje(excel.getFyje());
-			entity.setYsje(excel.getYsje());
-
+			if(excel.getYsje()!=null){
+				entity.setYsje(excel.getYsje()*10000);
+			}
 			insertList.add(entity);
 
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {
@@ -103,6 +104,9 @@ public class YsZbtsysyfyServiceImpl extends BaseServiceImpl<YsZbtsysyfyMapper, Y
 
 		for (YsZbtsysyfyVO temp : list) {
 			temp.setXh(index.getAndIncrement() + "");
+			if(temp.getYsje()!=null){
+				temp.setYsje(temp.getYsje()/10000);
+			}
 		}
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/预算编制/装备调试费用与试验费用.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)

BIN
kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/其他费用.xls