From 2cf47388b765be947805a51ece7608b27e47650b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 22 十二月 2023 17:02:21 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
index 2c1cd9a..5d44f0f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
@@ -81,12 +81,12 @@
public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams());
if (list.size() > 0) {
- workflowService.getRunFlow(list, "pzxrk");
+ workflowService.getRunFlow(list, "wplz");
}
return list;
}
- /**
+ /**yi
* 鍒犻櫎
*
* @param ids
@@ -96,8 +96,8 @@
}
public Boolean save(ItemCirculatOrderDto itemCirculatOrderDto) {
- Long circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId();
- if (circulatOrderid != null)
+ Long circulatOrderId = itemCirculatOrderDto.getCirculatOrder().getId();
+ if (circulatOrderId != null)
baseDao.updateById(itemCirculatOrderDto.getCirculatOrder());
else {
Map<String, String> map = new HashMap<>();
@@ -106,22 +106,22 @@
itemCirculatOrderDto.getCirculatOrder().setProjectId(itemCirculatOrderDto.getProjectId());
itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(itemCirculatOrderDto.getCirculatOrder());
- circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId();
+ circulatOrderId = itemCirculatOrderDto.getCirculatOrder().getId();
}
for (ItemCirculatOrderTechnical circulatOrderTechnical : itemCirculatOrderDto.getTechnicalList()) {
- circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
+ circulatOrderTechnical.setCirculatOrderId(circulatOrderId);
if (circulatOrderTechnical.getId() != null) {
technicalService.update(circulatOrderTechnical);
} else {
- circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
+ circulatOrderTechnical.setCirculatOrderId(circulatOrderId);
technicalService.insert(circulatOrderTechnical);
}
sysOssConfigService.updateOss(circulatOrderTechnical.getId(), circulatOrderTechnical.getFiles());// 淇濆瓨闄勪欢
}
if (itemCirculatOrderDto.getTestAgencyInfo().getId() == 10000) {
- itemCirculatOrderDto.getTestAgencyInfo().setId(circulatOrderid);
+ itemCirculatOrderDto.getTestAgencyInfo().setId(circulatOrderId);
testAgencyInfoService.insert(itemCirculatOrderDto.getTestAgencyInfo());
} else {
testAgencyInfoService.update(itemCirculatOrderDto.getTestAgencyInfo());
@@ -139,19 +139,19 @@
return true;
}
- public ItemCirculatOrderDto getDto(Long projectId, Long circulatOrderid) {
+ public ItemCirculatOrderDto getDto(Long projectId, Long circulatOrderId) {
ItemCirculatOrderDto data = new ItemCirculatOrderDto();
- if (circulatOrderid != null) {
- data.setId(circulatOrderid);
- ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderid);
+ if (circulatOrderId != null) {
+ data.setId(circulatOrderId);
+ ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderId);
data.setCirculatOrder(itemCirculatOrder);
if (projectId == null) {
projectId = itemCirculatOrder.getProjectId();
}
- data.setTestAgencyInfo(testAgencyInfoService.get(circulatOrderid));
+ data.setTestAgencyInfo(testAgencyInfoService.get(circulatOrderId));
- List<ItemCirculatOrderTechnical> technicalList = technicalService.getList(circulatOrderid);
+ List<ItemCirculatOrderTechnical> technicalList = technicalService.getList(circulatOrderId);
data.setTechnicalList(technicalList);
} else {
@@ -176,7 +176,7 @@
}
if (data.getTestAgencyInfo() == null)
data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
- if (circulatOrderid != null) {
+ if (circulatOrderId != null) {
for (ItemCirculatOrderTechnical technical : data.getTechnicalList()) {
Long technicalId = technical.getId();
OssDto ossDto = sysOssConfigService.getOssByBusiType(technicalId, "circulat_order");
--
Gitblit v1.9.1