Browse Source

0000000335

zhoulisky 5 months ago
parent
commit
0dc932fba7

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/excel/YsZjtrfyExcel.java

@@ -29,7 +29,7 @@ public class YsZjtrfyExcel implements Serializable {
 	private String wzmc;
 
 	@Schema(description = "用量")
-	private Integer yongLiang;
+	private Double yongLiang;
 //
 	@Schema(description = "计量单位")
 	private String unit;

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/excel/listener/YsQtfyImportListener.java

@@ -38,7 +38,7 @@ public class YsQtfyImportListener extends BaseReadListener {
 		excel.setXh(data.get(0));
 		excel.setFynr(data.get(1));
 
-		String ysje = data.get(2);
+		String ysje = data.get(4);
 		if(Func.isNotBlank(ysje)){
 			excel.setYsje(ValidationUtils.safeParseDouble(ysje));
 			if (Func.isNull(excel.getYsje())) {

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/excel/listener/YsSjfyImportListener.java

@@ -38,7 +38,7 @@ public class YsSjfyImportListener extends BaseReadListener {
 		excel.setXh(data.get(0));
 		excel.setSjnr(data.get(1));
 
-		String ysje = data.get(2);
+		String ysje = data.get(3);
 		if(Func.isNotBlank(ysje)){
 			excel.setYsje(ValidationUtils.safeParseDouble(ysje));
 			if (Func.isNull(excel.getYsje())) {

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

@@ -37,9 +37,9 @@ public class YsWtwbyjkffyImportListener extends BaseReadListener {
 		YsWtwbyjkffyExcel excel = new YsWtwbyjkffyExcel();
 		excel.setXh(data.get(0));
 		excel.setStdwmc(data.get(1));
-		excel.setZznr(data.get(2));
+		excel.setZznr(data.get(3));
 
-		String wwfy = data.get(3);
+		String wwfy = data.get(4);
 		if(Func.isNotBlank(wwfy)){
 			excel.setWwfy(ValidationUtils.safeParseDouble(wwfy));
 			if (Func.isNull(excel.getWwfy())) {

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/excel/listener/YsZbtsysyfyImportListener.java

@@ -37,7 +37,7 @@ public class YsZbtsysyfyImportListener extends BaseReadListener {
 		YsZbtsysyfyExcel excel = new YsZbtsysyfyExcel();
 		excel.setXh(data.get(0));
 		excel.setFyje(data.get(1));
-		String ysje = data.get(2);
+		String ysje = data.get(3);
 		if(Func.isNotBlank(ysje)){
 			excel.setYsje(ValidationUtils.safeParseDouble(ysje));
 			if (Func.isNull(excel.getYsje())) {

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/excel/listener/YsZjtrfyImportListener.java

@@ -39,7 +39,7 @@ public class YsZjtrfyImportListener extends BaseReadListener {
 		excel.setWzmc(data.get(1));
 		String yongliang = data.get(2);
 		if(Func.isNotBlank(yongliang)){
-			excel.setYongLiang(ValidationUtils.safeParseInteger(yongliang));
+			excel.setYongLiang(ValidationUtils.safeParseDouble(yongliang));
 			if (Func.isNull(excel.getYongLiang())) {
 				errors.add("用量数据格式错误");
 			}

+ 2 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmServiceImpl.java

@@ -298,6 +298,8 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
 			throw new ServiceException("请选择研发项目");
 		}
 		XmYszbVO vo = baseMapper.selectYszb(xmId);
+		//元 转换万元,其他字段在前端转换
+		vo.setRyrgfy(vo.getRyrgfy() / 10000.00);
 		vo.setTotal(vo.getRyrgfy() + vo.getZjtrfy() + vo.getZjfyycqdtfy() + vo.getWxzctxfy() + vo.getSjfy() + vo.getZbtsysyfy() + vo.getWtwbyjkffy() + vo.getQtfy());
 		if (vo.getTotal() == 0) {
 			vo.setRyrgfyRate(0.00);

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

@@ -104,7 +104,7 @@ public class YsQtfyServiceImpl extends BaseServiceImpl<YsQtfyMapper, YsQtfyEntit
 			YsQtfyEntity entity = new YsQtfyEntity();
 			entity.setXmId(xmId);
 			entity.setFynr(excel.getFynr());
-			entity.setYsje(excel.getYsje() * 10000);
+			entity.setYsje(excel.getYsje());
 			insertList.add(entity);
 
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {

+ 1 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsSjfyServiceImpl.java

@@ -109,8 +109,7 @@ public class YsSjfyServiceImpl extends BaseServiceImpl<YsSjfyMapper, YsSjfyEntit
 			YsSjfyEntity entity = new YsSjfyEntity();
 			entity.setXmId(xmId);
 			entity.setSjnr(excel.getSjnr());
-			entity.setYsje(excel.getYsje()*10000);
-
+			entity.setYsje(excel.getYsje());
 			insertList.add(entity);
 
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {

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

@@ -99,7 +99,7 @@ public class YsZbtsysyfyServiceImpl extends BaseServiceImpl<YsZbtsysyfyMapper, Y
 			YsZbtsysyfyEntity entity = new YsZbtsysyfyEntity();
 			entity.setXmId(xmId);
 			entity.setFyje(excel.getFyje());
-			entity.setYsje(excel.getYsje() / 10000);
+			entity.setYsje(excel.getYsje());
  			insertList.add(entity);
 
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {

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

@@ -119,12 +119,12 @@ public class YsZjtrfyServiceImpl extends BaseServiceImpl<YsZjtrfyMapper, YsZjtrf
 			YsZjtrfyEntity entity = new YsZjtrfyEntity();
 			entity.setXmId(xmId);
 			BeanUtil.copyProperties(excel, entity);
- 			if(entity.getYsje() != null){
-				entity.setYsje(entity.getYsje() / 10000);
-			}
-			if(entity.getZlfyys() != null){
-				entity.setZlfyys(entity.getZlfyys() / 10000);
-			}
+// 			if(entity.getYsje() != null){
+//				entity.setYsje(entity.getYsje() / 10000);
+//			}
+//			if(entity.getZlfyys() != null){
+//				entity.setZlfyys(entity.getZlfyys() / 10000);
+//			}
 			insertList.add(entity);
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {
 				insertList.clear();