Browse Source

00000003356666

zhoulisky 5 months ago
parent
commit
fbfffa8fe7
20 changed files with 84 additions and 68 deletions
  1. 1 1
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/YsZjfyycqdtfyEntity.java
  2. 1 1
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/XmSummary.java
  3. 2 1
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/XmYszbVO.java
  4. 7 8
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmServiceImpl.java
  5. 8 10
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsQtfyServiceImpl.java
  6. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsRyrgfyServiceImpl.java
  7. 4 9
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsSjfyServiceImpl.java
  8. 10 11
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsWtwbyjkffyServiceImpl.java
  9. 8 2
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsWxzctxfyServiceImpl.java
  10. 10 10
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsZjfyycqdtfyServiceImpl.java
  11. 32 14
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsZjtrfyServiceImpl.java
  12. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/人员人工费用.xls
  13. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/其他费用.xls
  14. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/委托外部研究开发费.xls
  15. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/折旧费用与长期待摊费用.xls
  16. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/无形资产摊销费用.xls
  17. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/直接投入费用.xls
  18. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/研发项目经费预算表.xls
  19. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/装备调试费用与试验费用.xls
  20. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/设计费用.xls

+ 1 - 1
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/YsZjfyycqdtfyEntity.java

@@ -57,6 +57,6 @@ public class YsZjfyycqdtfyEntity extends TenantEntity {
 	private String cqdtfymc;
 
 	@Schema(description = "长期待摊费用预算金额")
-	private Double cqdtfyysje;
+	private BigDecimal cqdtfyysje;
 
 }

+ 1 - 1
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/XmSummary.java

@@ -72,7 +72,7 @@ public class XmSummary {
 	private BigDecimal zyswcl;
 
 	@Schema(description = "本年度预算")
-	private Double xmyszeCurrentYear;
+	private BigDecimal xmyszeCurrentYear;
 
 	@Schema(description = "年度已归集研发费用(万元)")
 	private BigDecimal ndygjyffy;

+ 2 - 1
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/XmYszbVO.java

@@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -52,7 +53,7 @@ public class XmYszbVO implements Serializable {
 	private String xmjssjStr;
 
 	@Schema(description = "项目预算总额")
-	private Double xmysze;
+	private BigDecimal xmysze;
 
 	@Schema(description = "项目预算明细", hidden = true)
 	@JsonIgnore

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

@@ -213,12 +213,12 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
 
 			List<JSONObject> xmysmx = JSON.parseArray(xmVO.getXmyszemx(), JSONObject.class);
 			//预算总额
-			xmVO.setXmysze(BigDecimal.valueOf(xmysmx.stream().mapToDouble(item -> JSONObject.parseObject(item.toString()).getDoubleValue("amount")).sum()));
+ 			xmVO.setXmysze(xmysmx.stream().map(item -> item.getBigDecimal("amount")).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.UP));
 
 			//本年度预算
 			for (JSONObject o : xmysmx) {
 				if (o.getInteger("year") == year) {
-					xmVO.setXmyszeCurrentYear(o.getDouble("amount"));
+					xmVO.setXmyszeCurrentYear(o.getBigDecimal("amount").setScale(2, RoundingMode.UP));
 					break;
 				}
 			}
@@ -229,9 +229,10 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
 			xmVO.setQzqygj(BigDecimal.valueOf(qzqygj).multiply(BigDecimal.valueOf(0.0001)).setScale(2, RoundingMode.HALF_UP));
 			//总预算完成率(%)
 			if (xmVO.getQzqygj() == null || xmVO.getQzqygj().compareTo(BigDecimal.ZERO) <= 0 || xmVO.getXmysze() == null || xmVO.getXmysze().compareTo(BigDecimal.ZERO) <= 0) {
-				xmVO.setZyswcl(BigDecimal.ZERO);
+				xmVO.setZyswcl(BigDecimal.valueOf(0.00));
 			} else {
-				xmVO.setZyswcl(xmVO.getQzqygj().divide(xmVO.getXmysze(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
+//				xmVO.setZyswcl(xmVO.getQzqygj().divide(xmVO.getXmysze(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP));
+				xmVO.setZyswcl(xmVO.getQzqygj().multiply(BigDecimal.valueOf(100)).divide(xmVO.getXmysze(), 2, RoundingMode.HALF_UP));
 			}
 
 			//本年度已归集研发费用(万元)
@@ -239,10 +240,10 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
 			//元->万元
 			xmVO.setNdygjyffy(BigDecimal.valueOf(ndygjyffy).multiply(BigDecimal.valueOf(0.0001)).setScale(2, RoundingMode.HALF_UP));
 			//年度已归集金额/年度预算(%)xmyszeCurrentYear
-			if (xmVO.getNdygjyffy() == null || xmVO.getNdygjyffy().compareTo(BigDecimal.ZERO) <= 0 || xmVO.getXmyszeCurrentYear() == null || xmVO.getXmyszeCurrentYear() <= 0) {
+			if (xmVO.getNdygjyffy() == null || xmVO.getNdygjyffy().compareTo(BigDecimal.ZERO) <= 0 || xmVO.getXmyszeCurrentYear() == null) {
 				xmVO.setNdygjjel(BigDecimal.ZERO);
 			} else {
-				xmVO.setNdygjjel(xmVO.getNdygjyffy().divide(BigDecimal.valueOf(xmVO.getXmyszeCurrentYear()), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
+				xmVO.setNdygjjel(xmVO.getNdygjyffy().divide(xmVO.getXmyszeCurrentYear(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
 			}
 		}
 		return page.setRecords(xmList);
@@ -298,8 +299,6 @@ 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);

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

@@ -58,16 +58,16 @@ public class YsQtfyServiceImpl extends BaseServiceImpl<YsQtfyMapper, YsQtfyEntit
 		return baseMapper.physicalDeleteByIds(ids) > 0;
 	}
 
-    @Override
-    public boolean saveQtfy(YsQtfyEntity ysQtfy) {
-		if(baseMapper.selectCount(Wrappers.<YsQtfyEntity>lambdaQuery().eq(YsQtfyEntity::getFynr, ysQtfy.getFynr())) > 0){
+	@Override
+	public boolean saveQtfy(YsQtfyEntity ysQtfy) {
+		if (baseMapper.selectCount(Wrappers.<YsQtfyEntity>lambdaQuery().eq(YsQtfyEntity::getFynr, ysQtfy.getFynr())) > 0) {
 			throw new ServiceException("费用内容已存在 ");
 		}
 		ysQtfy.setYsje(ysQtfy.getYsje() * 10000);
-        return save(ysQtfy);
-    }
+		return save(ysQtfy);
+	}
 
-    @Override
+	@Override
 	public boolean updateQtfy(YsQtfyEntity ysQtfy) {
 		if (ysQtfy.getXmId() == null) {
 			throw new ServiceException("请选择科研项目");
@@ -93,7 +93,7 @@ public class YsQtfyServiceImpl extends BaseServiceImpl<YsQtfyMapper, YsQtfyEntit
 			.headRowNumber(3) // 重要:设置表头行数(0-based)
 			.doRead();
 		List<Object> dataList = listener.getDataList();
- 		if (Func.isEmpty(dataList)) {
+		if (Func.isEmpty(dataList)) {
 			throw new ServiceException("读取导入数据失败,请检查数据");
 		}
 
@@ -125,9 +125,7 @@ public class YsQtfyServiceImpl extends BaseServiceImpl<YsQtfyMapper, YsQtfyEntit
 
 		for (YsQtfyVO temp : list) {
 			temp.setXh(index.getAndIncrement() + "");
-			if(temp.getYsje()!=null){
-				temp.setYsje(temp.getYsje()/ 10000);
-			}
+			temp.setYsje(temp.getYsje() / 10000);
 		}
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/预算编制/其他费用.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)

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

@@ -63,7 +63,7 @@ public class YsRyrgfyServiceImpl extends BaseServiceImpl<YsRyrgfyMapper, YsRyrgf
 			if (Func.notNull(vo.getTechnician())) {
 				vo.getTechnician().setForeign(!"在职".equals(vo.getTechnician().getNature()));
 			}
-			vo.setPjrgfy(vo.getPjrgfy() / 10000);
+//			vo.setPjrgfy(vo.getPjrgfy() / 10000);
 		}
 		return page.setRecords(dataList);
 	}

+ 4 - 9
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsSjfyServiceImpl.java

@@ -51,9 +51,6 @@ public class YsSjfyServiceImpl extends BaseServiceImpl<YsSjfyMapper, YsSjfyEntit
 	@Override
 	public IPage<YsSjfyVO> selectYsSjfyPage(IPage<YsSjfyVO> page, YsSjfyVO ysSjfy) {
 		List<YsSjfyVO> vos = baseMapper.selectYsSjfyPage(page, ysSjfy);
-//		for (YsSjfyVO vo : vos) {
-//			vo.setYsje(vo.getYsje() / 10000);
-//		}
 		return page.setRecords(vos);
 	}
 
@@ -64,10 +61,10 @@ public class YsSjfyServiceImpl extends BaseServiceImpl<YsSjfyMapper, YsSjfyEntit
 
 	@Override
 	public boolean saveSjfy(YsSjfyEntity ysSjfy) {
-		if(baseMapper.selectCount(Wrappers.<YsSjfyEntity>lambdaQuery().eq(YsSjfyEntity::getSjnr, ysSjfy.getSjnr())) > 0){
+		if (baseMapper.selectCount(Wrappers.<YsSjfyEntity>lambdaQuery().eq(YsSjfyEntity::getSjnr, ysSjfy.getSjnr())) > 0) {
 			throw new ServiceException("设计内容或详情已存在");
 		}
-		ysSjfy.setYsje(ysSjfy.getYsje()*10000);
+		ysSjfy.setYsje(ysSjfy.getYsje() * 10000);
 		return save(ysSjfy);
 	}
 
@@ -98,7 +95,7 @@ public class YsSjfyServiceImpl extends BaseServiceImpl<YsSjfyMapper, YsSjfyEntit
 			.headRowNumber(3) // 重要:设置表头行数(0-based)
 			.doRead();
 		List<Object> dataList = listener.getDataList();
- 		if (Func.isEmpty(dataList)) {
+		if (Func.isEmpty(dataList)) {
 			throw new ServiceException("读取导入数据失败,请检查数据");
 		}
 
@@ -129,9 +126,7 @@ 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);
-			}
+			temp.setYsje(temp.getYsje() / 10000);
 		}
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/预算编制/设计费用.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)

+ 10 - 11
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsWtwbyjkffyServiceImpl.java

@@ -57,17 +57,18 @@ public class YsWtwbyjkffyServiceImpl extends BaseServiceImpl<YsWtwbyjkffyMapper,
 		return baseMapper.physicalDeleteByIds(ids) > 0;
 	}
 
-    @Override
-    public boolean saveWtwbyjkffy(YsWtwbyjkffyEntity ysWtwbyjkffy) {
+	@Override
+	public boolean saveWtwbyjkffy(YsWtwbyjkffyEntity ysWtwbyjkffy) {
 		ysWtwbyjkffy.setWwfy(ysWtwbyjkffy.getWwfy() * 10000);
-        return save(ysWtwbyjkffy);
-    }
+		return save(ysWtwbyjkffy);
+	}
 
-    @Override
+	@Override
 	public boolean updateWtwbyjkffy(YsWtwbyjkffyEntity ysWtwbyjkffy) {
 		if (ysWtwbyjkffy.getXmId() == null) {
 			throw new ServiceException("请选择科研项目");
 		}
+		ysWtwbyjkffy.setWwfy(ysWtwbyjkffy.getWwfy() * 10000);
 		return this.updateById(ysWtwbyjkffy);
 	}
 
@@ -84,19 +85,19 @@ public class YsWtwbyjkffyServiceImpl extends BaseServiceImpl<YsWtwbyjkffyMapper,
 			.headRowNumber(3) // 重要:设置表头行数(0-based)
 			.doRead();
 		List<Object> dataList = listener.getDataList();
- 		if (Func.isEmpty(dataList)) {
+		if (Func.isEmpty(dataList)) {
 			throw new ServiceException("读取导入数据失败,请检查数据");
 		}
 
 		List<YsWtwbyjkffyEntity> insertList = new ArrayList<>();
 		int batchCount = 20;
-		for ( Object o: dataList) {
+		for (Object o : dataList) {
 			YsWtwbyjkffyExcel excel = (YsWtwbyjkffyExcel) o;
 			YsWtwbyjkffyEntity entity = new YsWtwbyjkffyEntity();
 			entity.setXmId(xmId);
 
 			BeanUtil.copyProperties(excel, entity);
-  			insertList.add(entity);
+			insertList.add(entity);
 
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {
 				insertList.clear();
@@ -116,9 +117,7 @@ public class YsWtwbyjkffyServiceImpl extends BaseServiceImpl<YsWtwbyjkffyMapper,
 
 		for (YsWtwbyjkffyVO temp : list) {
 			temp.setXh(index.getAndIncrement() + "");
-			if(temp.getWwfy()!=null){
-				temp.setWwfy(temp.getWwfy()/10000);
-			}
+			temp.setWwfy(temp.getWwfy() / 10000);
 		}
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/预算编制/委托外部研究开发费.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)

+ 8 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsWxzctxfyServiceImpl.java

@@ -170,8 +170,14 @@ public class YsWxzctxfyServiceImpl extends BaseServiceImpl<YsWxzctxfyMapper, YsW
 			obj.put("xh", index.getAndIncrement() + "");
 			obj.put("zcmc", Func.notNull(asset) ? asset.getZcmc() : "");
 			obj.put("zzsc", temp.getZzsc());
-			obj.put("yzje", Func.notNull(asset) ? asset.getYzje() : BigDecimal.ZERO);
-			obj.put("ysje", Func.notNull(asset) ? asset.getYzje().multiply(BigDecimal.valueOf(temp.getZzsc())) : BigDecimal.ZERO);
+
+ 			if(asset.getYzje()!=null) {
+				asset.setYzje(asset.getYzje().divide(BigDecimal.valueOf(10000)));
+			} else {
+				asset.setYzje(BigDecimal.ZERO);
+ 			}
+			obj.put("yzje", asset.getYzje());
+			obj.put("ysje", asset.getYzje().multiply(BigDecimal.valueOf(temp.getZzsc())));
 			results.add(obj);
 		}
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/预算编制/无形资产摊销费用.xls");

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

@@ -36,6 +36,7 @@ import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -74,15 +75,14 @@ public class YsZjfyycqdtfyServiceImpl extends BaseServiceImpl<YsZjfyycqdtfyMappe
 		if(!Func.equals(AssetStatusEnum.正常.getCode(),dbAsset.getStatus())){
 			throw new ServiceException("资产状态非正常");
 		}
+		if(entity.getCqdtfyysje()!=null){
+			entity.setCqdtfyysje(entity.getCqdtfyysje().multiply(BigDecimal.valueOf(10000)));
+		}
 		List<YsZjfyycqdtfyEntity> dbList = baseMapper.selectList(Wrappers.<YsZjfyycqdtfyEntity>lambdaQuery().eq(YsZjfyycqdtfyEntity::getXmId, entity.getXmId()));
 		if(Func.isEmpty(dbList)){
 			return this.saveOrUpdate( entity);
 		}
 
-		if(entity.getCqdtfyysje() != null){
-			entity.setCqdtfyysje(entity.getCqdtfyysje() * 10000);
-		}
-
 		if(entity.getId() == null){
 			//新增
 			List<Long> dbAssetIdList = dbList.stream().map(YsZjfyycqdtfyEntity::getAssetId).toList();
@@ -99,9 +99,6 @@ public class YsZjfyycqdtfyServiceImpl extends BaseServiceImpl<YsZjfyycqdtfyMappe
 				}
 			}
 		}
-		if(entity.getCqdtfyysje()!=null){
-			entity.setCqdtfyysje(entity.getCqdtfyysje() * 10000);
-		}
 		return this.saveOrUpdate(entity);
 	}
 
@@ -170,9 +167,6 @@ public class YsZjfyycqdtfyServiceImpl extends BaseServiceImpl<YsZjfyycqdtfyMappe
 			BeanUtil.copyProperties(excel, entity);
 			entity.setAssetId(list.get(0));
 
-			if(entity.getCqdtfyysje()!=null){
-				entity.setCqdtfyysje(entity.getCqdtfyysje() / 10000);
-			}
 			insertList.add(entity);
 
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {
@@ -193,7 +187,13 @@ public class YsZjfyycqdtfyServiceImpl extends BaseServiceImpl<YsZjfyycqdtfyMappe
 
 		for (YsZjfyycqdtfyVO temp : list) {
 			temp.setXh(index.getAndIncrement() + "");
+			if(temp.getYzje()!=null){
+				temp.setYzje(temp.getYzje().divide(BigDecimal.valueOf(10000), 4, RoundingMode.UP));
+			}
 			temp.setZichanTotal(BigDecimal.valueOf(temp.getZzsc()).multiply(temp.getYzje()));
+			if(temp.getCqdtfyysje()!=null){
+				temp.setCqdtfyysje(temp.getCqdtfyysje().divide(BigDecimal.valueOf(10000), 4, RoundingMode.UP));
+			}
 		}
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/预算编制/折旧费用与长期待摊费用.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)

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

@@ -9,7 +9,6 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.sky.core.log.exception.ServiceException;
@@ -60,10 +59,13 @@ public class YsZjtrfyServiceImpl extends BaseServiceImpl<YsZjtrfyMapper, YsZjtrf
 		if (isDuplicate(ysZjtrfy)) {
 			throw new ServiceException("物资名称已存在");
 		}
-		if(ysZjtrfy.getYsje() != null){
+		if (ysZjtrfy.getDanJia() != null) {
+			ysZjtrfy.setDanJia(ysZjtrfy.getDanJia() * 10000);
+		}
+		if (ysZjtrfy.getYsje() != null) {
 			ysZjtrfy.setYsje(ysZjtrfy.getYsje() * 10000);
 		}
-		if(ysZjtrfy.getZlfyys() != null){
+		if (ysZjtrfy.getZlfyys() != null) {
 			ysZjtrfy.setZlfyys(ysZjtrfy.getZlfyys() * 10000);
 		}
 
@@ -71,7 +73,11 @@ public class YsZjtrfyServiceImpl extends BaseServiceImpl<YsZjtrfyMapper, YsZjtrf
 	}
 
 	private boolean isDuplicate(YsZjtrfyEntity entity) {
-		List<YsZjtrfyEntity> list = baseMapper.selectList(Wrappers.<YsZjtrfyEntity>lambdaQuery().eq(YsZjtrfyEntity::getXmId, entity.getXmId()));
+//		LambdaQueryWrapper<YsZjtrfyEntity> ew = Wrappers.<YsZjtrfyEntity>lambdaQuery()
+//			.eq(YsZjtrfyEntity::getXmId, entity.getXmId())
+//			.eq(YsZjtrfyEntity::getWzmc, entity.getWzmc());
+//		List<YsZjtrfyEntity> list = baseMapper.selectList(ew);
+
 		return false;
 	}
 
@@ -85,10 +91,13 @@ public class YsZjtrfyServiceImpl extends BaseServiceImpl<YsZjtrfyMapper, YsZjtrf
 		if (ysZjtrfy.getXmId() == null) {
 			throw new ServiceException("请选择科研项目");
 		}
-		if(ysZjtrfy.getYsje() != null){
+		if (ysZjtrfy.getDanJia() != null) {
+			ysZjtrfy.setDanJia(ysZjtrfy.getDanJia() * 10000);
+		}
+		if (ysZjtrfy.getYsje() != null) {
 			ysZjtrfy.setYsje(ysZjtrfy.getYsje() * 10000);
 		}
-		if(ysZjtrfy.getZlfyys() != null){
+		if (ysZjtrfy.getZlfyys() != null) {
 			ysZjtrfy.setZlfyys(ysZjtrfy.getZlfyys() * 10000);
 		}
 		return this.updateById(ysZjtrfy);
@@ -106,7 +115,7 @@ public class YsZjtrfyServiceImpl extends BaseServiceImpl<YsZjtrfyMapper, YsZjtrf
 			throw new ServiceException("研发项目不存在");
 		}
 		YsZjtrfyImportListener listener = new YsZjtrfyImportListener();
- 		EasyExcel.read(new BufferedInputStream(file.getInputStream()))
+		EasyExcel.read(new BufferedInputStream(file.getInputStream()))
 			.registerReadListener(listener)
 			.sheet(0)
 			.headRowNumber(3) // 重要:设置表头行数(0-based)
@@ -119,12 +128,7 @@ 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);
-//			}
+
 			insertList.add(entity);
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {
 				insertList.clear();
@@ -143,8 +147,22 @@ public class YsZjtrfyServiceImpl extends BaseServiceImpl<YsZjtrfyMapper, YsZjtrf
 		AtomicInteger index = new AtomicInteger(1);
 		for (YsZjtrfyVO temp : list) {
 			temp.setXh(index.getAndIncrement() + "");
+			if (temp.getDanJia() == null) {
+				temp.setDanJia(0.00);
+			}
+			temp.setDanJia(temp.getDanJia() / 10000);
+			if (temp.getYongLiang() == null) {
+				temp.setYongLiang(0);
+			}
 			temp.setWuziTotal(BigDecimal.valueOf(temp.getYongLiang() * temp.getDanJia()));
-			temp.setYsje(temp.getYsje()/10000);
+			if(temp.getYsje()!=null){
+				temp.setYsje(temp.getYsje() / 10000);
+			}
+			if(temp.getZlfyys()!=null){
+				temp.setZlfyys(temp.getZlfyys() / 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


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


BIN
kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/委托外部研究开发费.xls


BIN
kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/折旧费用与长期待摊费用.xls


BIN
kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/无形资产摊销费用.xls


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


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


BIN
kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/装备调试费用与试验费用.xls


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