From 39f2e9b35977420ba8afc64151cb9c424f4d26c7 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 06 十二月 2023 16:42:08 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
index 3f0dff6..f07502a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
@@ -20,6 +20,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
+
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
@@ -30,11 +31,11 @@
/**
* test_check_order
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-12-05
*/
@Service
-public class TestCheckOrderService extends BaseService<TestCheckOrderDao, TestCheckOrder> {
+public class TestCheckOrderService extends BaseService<TestCheckOrderDao, TestCheckOrder> {
@Autowired
private TestCheckOrderListService checkOrderListService;
@@ -65,7 +66,7 @@
}
- public CheckOrderDto getDto(Long checkId, Long projectId,String pageCode) {
+ public CheckOrderDto getDto(Long checkId, Long projectId, String pageCode) {
CheckOrderDto data = new CheckOrderDto();
data.setPageCode(pageCode);
if (checkId != null) {
@@ -82,7 +83,7 @@
} else {
TestCheckOrder checkOrder = new TestCheckOrder();
data.setCheckOrder(checkOrder);
- List<TestCheckOrderList> checkOrderList = checkOrderListService.itemList(pageCode+"_check_item");
+ List<TestCheckOrderList> checkOrderList = checkOrderListService.itemList(pageCode + "_check_item");
data.setCheckOrderList(checkOrderList);
}
if (projectId != null) {
@@ -92,13 +93,14 @@
return data;
}
- public Boolean save(CheckOrderDto checkOrderDto) {
+ public Long save(CheckOrderDto checkOrderDto) {
Long checkId = checkOrderDto.getCheckOrder().getId();
if (checkId != null)
baseDao.updateById(checkOrderDto.getCheckOrder());
else {
Map<String, String> map = new HashMap<>();
- map.put("funCode", "test_check_order");
+ String pagecode = checkOrderDto.getPageCode();
+ map.put("funCode", "test_check_order_" + pagecode);
map.put("projectId", checkOrderDto.getProjectId().toString());
checkOrderDto.getCheckOrder().setProjectId(checkOrderDto.getProjectId());
checkOrderDto.getCheckOrder().setCode(sysCodeRuleService.getNewCode(map));
@@ -115,6 +117,6 @@
checkOrderListService.insert(checkOrderList);
}
}
- return true;
+ return checkId;
}
}
--
Gitblit v1.9.1