Browse Source

000000008

zhoulisky 7 months ago
parent
commit
c24c3c71b6
91 changed files with 80 additions and 47 deletions
  1. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/AttendanceController.java
  2. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/SalaryController.java
  3. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/XmController.java
  4. 4 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/TechnicianMapper.java
  5. 4 4
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/AssetServiceImpl.java
  6. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/CgJsbzServiceImpl.java
  7. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/CgKylwServiceImpl.java
  8. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/CgQtServiceImpl.java
  9. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/CgRjzzqServiceImpl.java
  10. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/CgZlServiceImpl.java
  11. 35 6
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/DepartmentServiceImpl.java
  12. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/SalaryServiceImpl.java
  13. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/SubjectServiceImpl.java
  14. 8 8
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/TechnicianServiceImpl.java
  15. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmCostDetailsServiceImpl.java
  16. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmCqdtfyServiceImpl.java
  17. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmDesignCostServiceImpl.java
  18. 2 2
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmDirectCostServiceImpl.java
  19. 4 4
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmFixedAssetServiceImpl.java
  20. 2 2
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmGoodsServiceImpl.java
  21. 2 2
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmIntangibleAssetServiceImpl.java
  22. 2 2
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmLeaseServiceImpl.java
  23. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmOtherCostServiceImpl.java
  24. 2 2
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmServiceImpl.java
  25. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmWwxmCostServiceImpl.java
  26. BIN
      kd-service/kd-scientific/src/main/resources/export-template/企业会计科目.xls
  27. BIN
      kd-service/kd-scientific/src/main/resources/export-template/技术人员花名册.xls
  28. BIN
      kd-service/kd-scientific/src/main/resources/export-template/基础资源管理/企业科研资产清单.xls
  29. BIN
      kd-service/kd-scientific/src/main/resources/export-template/辅助核算项目.xls
  30. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/107-1.xlsx
  31. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/107-2.xlsx
  32. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/A107012.xlsx
  33. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/A107041.xlsx
  34. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/三口径-研发项目清单.xls
  35. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/会计口径-研发支出辅助明细账.xls
  36. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/会计口径-研发支出辅助账汇总表.xls
  37. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/加计扣除-研发支出辅助明细账.xls
  38. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/加计扣除-研发支出辅助汇总表.xls
  39. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/火炬发展年报.xlsx
  40. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/高新口径-研发支出辅助明细账.xls
  41. BIN
      kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/高新口径-研发支出辅助账汇总表.xls
  42. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月研发工时记录表.xls
  43. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月研发人员人工分配表.xls
  44. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月考勤信息.xls
  45. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月工资信息.xls
  46. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月研发工时分配表.xls
  47. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/项目变更清单.xls
  48. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月研发项目人工分配汇总表.xls
  49. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发费用管理-其他费用.xls
  50. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发费用管理-委托外部研究开发费用.xls
  51. BIN
      kd-service/kd-scientific/src/main/resources/export-template/仪器设备折旧费用分配表.xls
  52. BIN
      kd-service/kd-scientific/src/main/resources/export-template/在用建筑物折旧费用分配表.xls
  53. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月长期待摊费用分配表.xls
  54. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发费用管理-折旧费用、长期待摊费用、无形资产摊销费用汇总表.xls
  55. BIN
      kd-service/kd-scientific/src/main/resources/export-template/无形资产摊销费用分配表.xls
  56. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月直接投入费用.xls
  57. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月租赁资产费用分配表.xls
  58. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月租赁资产费用明细.xls
  59. BIN
      kd-service/kd-scientific/src/main/resources/export-template/直接投入费用汇总表P081.xls
  60. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发动力消耗单.xls
  61. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发燃料消耗单.xls
  62. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发领料单.xls
  63. BIN
      kd-service/kd-scientific/src/main/resources/export-template/科研资产台账.xls
  64. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发支出明细账P098.xls
  65. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发费用汇总表P0040.xls
  66. BIN
      kd-service/kd-scientific/src/main/resources/export-template/设计费用、装备调试费用与试验费用.xls
  67. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月仪器设备明细.xls
  68. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月在用建筑物明细.xls
  69. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月无形资产明细.xls
  70. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/委外项目.xls
  71. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/研发项目汇总表.xls
  72. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/项目变更.doc
  73. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/项目变更.xls
  74. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/项目实施-阶段性报告.doc
  75. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/项目实施.xls
  76. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/项目成果.xls
  77. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/人员人工费用.xls
  78. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/折旧费用与长期待摊费用.xls
  79. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/直接投入费用.xls
  80. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/预算编制/研发项目经费预算表.xls
  81. BIN
      kd-service/kd-scientific/src/main/resources/export-template/研发领料燃料动力明细清单.xls
  82. BIN
      kd-service/kd-scientific/src/main/resources/export-template/参研人员花名册.xls
  83. BIN
      kd-service/kd-scientific/src/main/resources/export-template/年度高新科技人员汇总表.xls
  84. BIN
      kd-service/kd-scientific/src/main/resources/export-template/每月实际参研人员名单.xls
  85. BIN
      kd-service/kd-scientific/src/main/resources/export-template/项目参研人员汇总表.xls
  86. BIN
      kd-service/kd-scientific/src/main/resources/export-template/科研成果-专利成果.xls
  87. BIN
      kd-service/kd-scientific/src/main/resources/export-template/科研成果-其他成果.xls
  88. BIN
      kd-service/kd-scientific/src/main/resources/export-template/科研成果-技术标准.xls
  89. BIN
      kd-service/kd-scientific/src/main/resources/export-template/科研成果-科研论文.xls
  90. BIN
      kd-service/kd-scientific/src/main/resources/export-template/科研成果-软件著作.xls
  91. BIN
      kd-service/kd-scientific/src/main/resources/export-template/表78-科研无形资产摊销费用分配表.xlsx

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/AttendanceController.java

@@ -69,7 +69,7 @@ public class AttendanceController extends KdController {
 //		if (Func.isEmpty(list)) {
 //			ExportUtil.processWithNoData(response);
 //		} else {
-			ExportUtil.processWithData(response, "每月考勤信息.xls");
+			ExportUtil.processWithData(response, "每月研发人员出勤.xls");
 			service.exportAttendance(response.getOutputStream(), list, dto.getYearAndMonth());
 //		}
 	}

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/SalaryController.java

@@ -91,7 +91,7 @@ public class SalaryController extends KdController {
 		if (Func.isEmpty(list)) {
 			ExportUtil.processWithNoData(response);
 		}else {
-			ExportUtil.processWithData(response, "每月工资信息.xls");
+			ExportUtil.processWithData(response, "每月研发人员工资.xls");
 			service.exportSalary(response.getOutputStream(), list, dto.getYearAndMonth());
 		}
 	}

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/XmController.java

@@ -101,7 +101,7 @@ public class XmController extends KdController {
 	public void exportSummary(@RequestBody XmDTO dto, HttpServletResponse response) {
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
-		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("研发项目汇总表.xls", Charsets.UTF_8));
+		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("研发项目进度总览.xls", Charsets.UTF_8));
 		try {
 			service.exportSummary(response.getOutputStream(), dto);
 		} catch (IOException e) {

+ 4 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/TechnicianMapper.java

@@ -4,6 +4,7 @@ package org.sky.scientific.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 import org.sky.core.tenant.annotation.TenantIgnore;
 import org.sky.scientific.pojo.dto.TechnicianDTO;
 import org.sky.scientific.pojo.entity.TechnicianEntity;
@@ -60,4 +61,7 @@ public interface TechnicianMapper extends BaseMapper<TechnicianEntity> {
 
 	@TenantIgnore
 	String getMaxUnicode();
+
+	@Update("update kd_technician set department = #{departmentName} where department_id = #{departmentId}")
+	int updateDepartment(@Param("departmentId") Long departmentId, @Param("departmentName") String departmentName);
 }

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

@@ -224,10 +224,10 @@ public class AssetServiceImpl extends BaseServiceImpl<AssetMapper, AssetEntity>
 			temp.setStatusStr(assetStatusEnum.getName());
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研资产台账.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/基础资源管理/企业科研资产清单.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
-		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("科研资产台账.xls", Charsets.UTF_8));
+		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("企业科研资产清单.xls", Charsets.UTF_8));
 		ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream())
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)
@@ -271,7 +271,7 @@ public class AssetServiceImpl extends BaseServiceImpl<AssetMapper, AssetEntity>
 			temp.setXh(index.getAndIncrement() + "");
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用汇总表P0040.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/研发费用汇总表P0040.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("研发费用汇总表.xls", Charsets.UTF_8));
@@ -458,7 +458,7 @@ public class AssetServiceImpl extends BaseServiceImpl<AssetMapper, AssetEntity>
 		list.forEach(temp -> {
 			temp.setXh(index.getAndIncrement() + "");
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理-折旧费用、长期待摊费用、无形资产摊销费用汇总表.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/折旧费用长期待摊费用无形资产摊销费用/研发费用管理-折旧费用、长期待摊费用、无形资产摊销费用汇总表.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("研发费用管理-折旧费用、长期待摊费用、无形资产摊销费用汇总表.xls", Charsets.UTF_8));

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

@@ -112,7 +112,7 @@ public class CgJsbzServiceImpl extends BaseServiceImpl<CgJsbzMapper, CgJsbzEntit
 			excel.setSsrqStr(Func.notNull(temp.getSsrq()) ? DateUtil.format(temp.getSsrq(), DateUtil.PATTERN_DATE) : null);
 			results.add(excel);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研成果-技术标准.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研成果管理/科研成果-技术标准.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)

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

@@ -64,7 +64,7 @@ public class CgKylwServiceImpl extends BaseServiceImpl<CgKylwMapper, CgKylwEntit
 			excel.setFbrqStr(Func.notNull(temp.getFbrq())?DateUtil.format(temp.getFbrq(), DateUtil.PATTERN_DATE):null);
 			results.add(excel);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研成果-科研论文.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研成果管理/科研成果-科研论文.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)

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

@@ -152,7 +152,7 @@ public class CgQtServiceImpl extends BaseServiceImpl<CgQtMapper, CgQtEntity> imp
 			excel.setShouquanRqStr(Func.notNull(temp.getShouquanRq()) ? DateUtil.format(temp.getShouquanRq(), DateUtil.PATTERN_DATE) : null);
 			results.add(excel);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研成果-其他成果.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研成果管理/科研成果-其他成果.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)

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

@@ -131,7 +131,7 @@ public class CgRjzzqServiceImpl extends BaseServiceImpl<CgRjzzqMapper, CgRjzzqEn
 			excel.setDjpzrqStr(Func.notNull(temp.getDjpzrq()) ? DateUtil.format(temp.getDjpzrq(), DateUtil.PATTERN_DATE) : null);
 			results.add(excel);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研成果-软件著作.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研成果管理/科研成果-软件著作.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)

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

@@ -130,7 +130,7 @@ public class CgZlServiceImpl extends BaseServiceImpl<CgZlMapper, CgZlEntity> imp
 			excel.setShouquanRqStr(Func.notNull(temp.getShouquanRq()) ? DateUtil.format(temp.getShouquanRq(), DateUtil.PATTERN_DATE) : null);
 			results.add(excel);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研成果-专利成果.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科研成果管理/科研成果-专利成果.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)

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

@@ -9,6 +9,7 @@ import org.sky.core.secure.utils.SecureUtil;
 import org.sky.core.tool.utils.DateUtil;
 import org.sky.core.tool.utils.Func;
 import org.sky.scientific.mapper.DepartmentMapper;
+import org.sky.scientific.mapper.TechnicianMapper;
 import org.sky.scientific.pojo.entity.DepartmentEntity;
 import org.sky.scientific.service.IDepartmentService;
 import org.springframework.stereotype.Service;
@@ -24,9 +25,11 @@ import java.util.List;
  */
 @Service
 @AllArgsConstructor
-public class DepartmentServiceImpl  implements IDepartmentService {
+public class DepartmentServiceImpl implements IDepartmentService {
 
 	private final DepartmentMapper mapper;
+	private final TechnicianMapper technicianMapper;
+
 	@Override
 	@Transactional
 	public Boolean fetchLastYearData(DepartmentEntity department) {
@@ -63,15 +66,22 @@ public class DepartmentServiceImpl  implements IDepartmentService {
 	}
 
 	@Override
+	@Transactional
 	public boolean submit(DepartmentEntity department) {
 		if (Func.isBlank(department.getYearAndMonth())) {
 			throw new ServiceException("参数yearAndMonth不能为空");
 		}
-
+		DepartmentEntity dbEntity = mapper.selectById(department.getId());
+		if(Func.isNull(dbEntity)){
+			throw new ServiceException("数据不存在");
+		}
+		if(Func.equals(dbEntity.getName(), department.getName())){
+			return true;
+		}
 		LambdaQueryWrapper<DepartmentEntity> wrapper = Wrappers.<DepartmentEntity>lambdaQuery()
 			.eq(DepartmentEntity::getName, department.getName())
 			.eq(DepartmentEntity::getYearAndMonth, department.getYearAndMonth());
-		DepartmentEntity dbEntity = mapper.selectOne(wrapper);
+		dbEntity = mapper.selectOne(wrapper);
 		if (department.getId() == null) {
 			//新增
 			if (dbEntity != null) {
@@ -80,10 +90,29 @@ public class DepartmentServiceImpl  implements IDepartmentService {
 			return mapper.insert(department) == 1;
 		} else {
 			//修改
-			if (dbEntity!=null && Func.equals(department.getName(), dbEntity.getName()) && !Func.equals(dbEntity.getId(), department.getId())) {
+			if (dbEntity != null && Func.equals(department.getName(), dbEntity.getName()) && !Func.equals(dbEntity.getId(), department.getId())) {
 				throw new ServiceException("名称[" + department.getName() + "]已存在");
 			}
-			return mapper.updateById(department) == 1;
+ 			if(mapper.updateById(department) > 0){
+				//因冗余设计,需修改技术人员名单的部门名称字段
+				if (department.getParentId() == 0L) {
+					//修改的是一级部门,那么对应的二级部门都要修改
+					//查询二级部门id,批量修改
+					List<DepartmentEntity> childrenList = mapper.selectList(Wrappers.<DepartmentEntity>lambdaQuery().eq(DepartmentEntity::getParentId, department.getId()));
+					if (Func.isNotEmpty(childrenList)) {
+						List<Long> idList = childrenList.stream().map(DepartmentEntity::getId).toList();
+						for (Long departmentId : idList) {
+							String fullNameById = mapper.getFullNameById(departmentId);
+							technicianMapper.updateDepartment(departmentId, fullNameById);
+						}
+					}
+				} else {
+					//修改的是二级部门
+					String fullNameById = mapper.getFullNameById(department.getId());
+					technicianMapper.updateDepartment(department.getId(), fullNameById);
+				}
+			}
+			return  true;
 		}
 	}
 
@@ -101,6 +130,6 @@ public class DepartmentServiceImpl  implements IDepartmentService {
 				throw new ServiceException("请先删除下级部门");
 			}
 		}
-		return  mapper.deleteByIds(ids) > 0;
+		return mapper.deleteByIds(ids) > 0;
 	}
 }

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

@@ -105,7 +105,7 @@ public class SalaryServiceImpl extends BaseServiceImpl<SalaryMapper, SalaryEntit
 			}
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月工资信息.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/人员人工费用/每月研发人员工资.xls");
 
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))

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

@@ -163,7 +163,7 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
 			results.add(obj);
 		}
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/企业会计科目.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/基础资源管理/企业会计科目.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("企业会计科目.xls", Charsets.UTF_8));

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

@@ -141,10 +141,10 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 			temp.setXh(i.getAndIncrement() + "");
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/技术人员花名册.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/基础资源管理/企业技术人员名单.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
-		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("技术人员花名册.xls", Charsets.UTF_8));
+		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("企业技术人员名单.xls", Charsets.UTF_8));
 		ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream())
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)
@@ -367,7 +367,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 			temp.setXh(i.getAndIncrement() + "");
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月实际参研人员名单.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科技人员管理/每月实际参研人员名单.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("每月实际参研人员名单.xls", Charsets.UTF_8));
@@ -566,7 +566,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 			temp.setTotal(temp.getAverageMonthlySalaryRate().add(temp.getTotalInsuranceRate()).add(temp.getProvidentFundRate()).add(temp.getBonusRate()).add(temp.getBenefitRate()).add(temp.getPensionInsuranceBcRate()).add(temp.getMedicalInsuranceBcRate()));
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月研发人员人工分配表.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/人员人工费用/每月研发人员人工分配表.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)
@@ -626,7 +626,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 			temp.setTotal(temp.getAverageMonthlySalary().add(temp.getTotalInsurance()).add(temp.getProvidentFund()).add(temp.getBonus()).add(temp.getBenefit()).add(temp.getPensionInsuranceBc()).add(temp.getMedicalInsuranceBc()));
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月研发项目人工分配汇总表.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/人员人工费用/每月研发项目人工分配汇总表.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("每月研发项目人工分配汇总表.xls", Charsets.UTF_8));
@@ -680,7 +680,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 			map.put("hoursByMonth", hours1.stream().reduce(BigDecimal.ZERO, BigDecimal::add));
 			resultList.add(map);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/参研人员花名册.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科技人员管理/参研人员花名册.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)
@@ -701,7 +701,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 	@SneakyThrows
 	@Override
 	public void exportXmcyryhzb(OutputStream os, List<XmTechnicianSummary> list, String yearAndMonth) {
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/项目参研人员汇总表.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科技人员管理/项目参研人员汇总表.xls");
 
 		List<XmcyryhzmExcel> dataList = new ArrayList<>();
 		AtomicInteger i = new AtomicInteger(1);
@@ -788,7 +788,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 		list.forEach(temp -> {
 			temp.setXh(i.getAndIncrement() + "");
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/年度高新科技人员汇总表.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/科技人员管理/年度高新科技人员汇总表.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)

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

@@ -192,7 +192,7 @@ public class XmCostDetailsServiceImpl extends BaseServiceImpl<XmCostDetailsMappe
 			temp.setName(temp.getESubjectName());
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发支出明细账P098.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/研发支出明细账P098.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("研发支出明细账.xls", Charsets.UTF_8));

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

@@ -129,7 +129,7 @@ public class XmCqdtfyServiceImpl extends BaseServiceImpl<XmCqdtfyMapper, XmCqdtf
 			temp.setXh(index.getAndIncrement() + "");
 			temp.setYftxe(temp.getYtxe().multiply(temp.getSyzb()));
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月长期待摊费用分配表.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/折旧费用与长期待摊费用/每月长期待摊费用分配表.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)

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

@@ -123,7 +123,7 @@ public class XmDesignCostServiceImpl extends BaseServiceImpl<XmDesignCostMapper,
 			temp.setRecordDateStr(Func.notNull(temp.getRecordDate()) ? DateUtil.format(temp.getRecordDate(), DateUtil.PATTERN_DATE) : null);
 
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/设计费用、装备调试费用与试验费用.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/设计费用装备调试费用与试验费用/设计费用、装备调试费用与试验费用.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)

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

@@ -64,7 +64,7 @@ public class XmDirectCostServiceImpl extends BaseServiceImpl<XmDirectCostMapper,
 			String typeStr = DictCache.getValue("zhitoufeiyong_lx", temp.getType());
 			temp.setType(typeStr);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月直接投入费用.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/直接投入费用/每月直接投入费用.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)
@@ -165,7 +165,7 @@ public class XmDirectCostServiceImpl extends BaseServiceImpl<XmDirectCostMapper,
 			temp.setXh(index.getAndIncrement() + "");
 			temp.setTotal(temp.getCailiaofy().add(temp.getRanliaofy()).add(temp.getDonglify()).add(temp.getYiqishebeify()).add(temp.getFawuzulinfy()).add(temp.getFy6()).add(temp.getFy7()).add(temp.getFy8()));
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/直接投入费用汇总表P081.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/直接投入费用/直接投入费用汇总表P081.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("直接投入费用汇总表.xls", Charsets.UTF_8));

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

@@ -285,7 +285,7 @@ public class XmFixedAssetServiceImpl extends BaseServiceImpl<XmFixedAssetMapper,
 			data.put("yanfazhejiu", BigDecimal.valueOf(temp.getYanfaFenTanLv()).multiply(temp.getAsset().getYzje()));
 			results.add(data);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/仪器设备折旧费用分配表.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/折旧费用与长期待摊费用/仪器设备折旧费用分配表.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os).withTemplate((templateFileName)).excelType(ExcelTypeEnum.XLS).build();
 		WriteSheet writeSheet = EasyExcel.writerSheet().build();
 		FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
@@ -342,7 +342,7 @@ public class XmFixedAssetServiceImpl extends BaseServiceImpl<XmFixedAssetMapper,
 
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/在用建筑物折旧费用分配表.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/折旧费用与长期待摊费用/在用建筑物折旧费用分配表.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os).withTemplate((templateFileName)).excelType(ExcelTypeEnum.XLS).build();
 
 		WriteSheet writeSheet = EasyExcel.writerSheet().build();
@@ -386,7 +386,7 @@ public class XmFixedAssetServiceImpl extends BaseServiceImpl<XmFixedAssetMapper,
 			results.add(data);
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月仪器设备明细.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发资产管理/每月仪器设备明细.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("每月仪器设备明细.xls", Charsets.UTF_8));
@@ -434,7 +434,7 @@ public class XmFixedAssetServiceImpl extends BaseServiceImpl<XmFixedAssetMapper,
 			results.add(data);
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月在用建筑物明细.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发资产管理/每月在用建筑物明细.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("每月在用建筑物明细.xls", Charsets.UTF_8));

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

@@ -59,7 +59,7 @@ public class XmGoodsServiceImpl extends BaseServiceImpl<XmGoodsMapper, XmGoodsEn
 	@SneakyThrows
 	@Override
 	public void exportXmGoods(OutputStream os, List<XmGoodsVO> list, String yearAndMonth) {
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发领料燃料动力明细清单.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/直接投入费用/研发领料燃料动力明细清单.xls");
 		AtomicInteger index = new AtomicInteger(1);
 		List<XmGoodsExcel> resultList = new ArrayList<>();
 		for (XmGoodsVO vo : list) {
@@ -245,7 +245,7 @@ public class XmGoodsServiceImpl extends BaseServiceImpl<XmGoodsMapper, XmGoodsEn
 			excel.setAmount(BigDecimal.valueOf(excel.getUseQuantity()).multiply(excel.getUnitPrice()));
 			results.add(excel);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/" + templateName);
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/直接投入费用/" + templateName);
 
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))

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

@@ -284,7 +284,7 @@ public class XmIntangibleAssetServiceImpl extends BaseServiceImpl<XmIntangibleAs
 			results.add(data);
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月无形资产明细.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发资产管理/每月无形资产明细.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("每月无形资产明细.xls", Charsets.UTF_8));
@@ -352,7 +352,7 @@ public class XmIntangibleAssetServiceImpl extends BaseServiceImpl<XmIntangibleAs
 			data.put("yanfaTanXiao", temp.getYanfaTanXiao());
 			results.add(data);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/无形资产摊销费用分配表.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/无形资产摊销费用/无形资产摊销费用分配表.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)

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

@@ -96,7 +96,7 @@ public class XmLeaseServiceImpl extends BaseServiceImpl<XmLeaseMapper, XmLeaseEn
 			excel.setAmount(BigDecimal.valueOf(temp.getQuantity()).multiply(temp.getUnitPrice()));
 			results.add(excel);
 		}
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月租赁资产费用明细.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/直接投入费用/每月租赁资产费用明细.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)
@@ -197,7 +197,7 @@ public class XmLeaseServiceImpl extends BaseServiceImpl<XmLeaseMapper, XmLeaseEn
 			excel.setAmount(BigDecimal.valueOf(temp.getQuantity()).multiply(temp.getUnitPrice()));
 			results.add(excel);
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/每月租赁资产费用分配表.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/直接投入费用/每月租赁资产费用分配表.xls");
 
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))

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

@@ -156,7 +156,7 @@ public class XmOtherCostServiceImpl extends BaseServiceImpl<XmOtherCostMapper, X
 			excel.setRecordDateStr(Func.notNull(temp.getRecordDate()) ? DateUtil.format(temp.getRecordDate(), DateUtil.PATTERN_DATE) : null);
 			results.add(excel);
 		}
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理-其他费用.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/其他费用/研发费用管理-其他费用.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.XLS)

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

@@ -240,7 +240,7 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
 	@Override
 	public void exportSummary(OutputStream os, XmDTO dto) {
 		try {
-			InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/研发项目汇总表.xls");
+			InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发项目管理/研发项目进度总览.xls");
 
 
 			Query query = new Query().setCurrent(1).setSize(Integer.MAX_VALUE);
@@ -360,7 +360,7 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
 			temp.put("xh", index.getAndIncrement() + "");
 		});
 
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/辅助核算项目.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/基础资源管理/辅助核算项目.xls");
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding("utf-8");
 		response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("辅助核算项目.xls", Charsets.UTF_8));

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

@@ -162,7 +162,7 @@ public class XmWwxmCostServiceImpl extends BaseServiceImpl<XmWwxmCostMapper, XmW
 			temp.setPayDateStr(Func.notNull(temp.getPayDate()) ? DateUtil.format(temp.getPayDate(), DateUtil.PATTERN_DATE) : null);
 
 		});
-		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理-委托外部研究开发费用.xls");
+		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/研发费用管理/委托外部研究开发费用/研发费用管理-委托外部研究开发费用.xls");
 		ExcelWriter excelWriter = EasyExcel.write(os)
 			.withTemplate((templateFileName))
 			.excelType(ExcelTypeEnum.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/对外报表管理/107-1.xlsx


BIN
kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/107-2.xlsx


BIN
kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/A107012.xlsx


BIN
kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/A107041.xlsx


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/对外报表管理/火炬发展年报.xlsx


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


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


BIN
kd-service/kd-scientific/src/main/resources/export-template/每月租赁资产费用明细.xls


BIN
kd-service/kd-scientific/src/main/resources/export-template/直接投入费用汇总表P081.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/研发支出明细账P098.xls


BIN
kd-service/kd-scientific/src/main/resources/export-template/研发费用汇总表P0040.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/研发项目管理/项目变更.doc


BIN
kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/项目变更.xls


BIN
kd-service/kd-scientific/src/main/resources/export-template/研发项目管理/项目实施-阶段性报告.doc


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


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/表78-科研无形资产摊销费用分配表.xlsx