From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 28 十一月 2023 09:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
index b81f694..02e6a98 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -52,14 +52,6 @@
private SoftwareTestOrderService softwareTestOrderService;
@Autowired
- private ProjectService projectService;
- @Autowired
- private SoftwareTestOrderDeliverableService softwareTestOrderDeliverableService;
- @Autowired
- private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
- @Autowired
- private TestAgencyInfoService testAgencyInfoService;
- @Autowired
private SysCodeRuleService sysCodeRuleService;
@Autowired
@@ -102,12 +94,9 @@
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), AddGroup.class, DefaultGroup.class);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
- String year = sdf.format(new Date());
Map<String, String> map = new HashMap<>();
map.put("funCode", "software_test_order");
- map.put("year",year);
- softwareTestOrderDto.getSoftwareTestOrder().setYear(year);
+ map.put("projectId",softwareTestOrderDto.getProjectId().toString());
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = softwareTestOrderService.save(softwareTestOrderDto);
return Result.ok();
--
Gitblit v1.9.1