From a4f932c6ca705feb3bee3b7d7bbe0ee5c0c85515 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 29 十二月 2023 09:41:11 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 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 74bd644..d00575c 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
@@ -79,14 +79,15 @@
* @return
*/
public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
- List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams());
+ List<ItemCirculatOrder> list = baseDao.getList(queryFilter.getQueryParams());
if (list.size() > 0) {
workflowService.getRunFlow(list, "wplz");
}
return list;
}
- /**yi
+ /**
+ * yi
* 鍒犻櫎
*
* @param ids
@@ -96,8 +97,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 +107,24 @@
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);
- if (circulatOrderTechnical.getId() != null) {
- technicalService.update(circulatOrderTechnical);
- } else {
- circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
- technicalService.insert(circulatOrderTechnical);
+ if (circulatOrderTechnical.getName() != null) {
+ circulatOrderTechnical.setCirculatOrderId(circulatOrderId);
+ if (circulatOrderTechnical.getId() != null) {
+ technicalService.update(circulatOrderTechnical);
+ } else {
+ circulatOrderTechnical.setCirculatOrderId(circulatOrderId);
+ technicalService.insert(circulatOrderTechnical);
+ }
+ sysOssConfigService.updateOss(circulatOrderTechnical.getId(), circulatOrderTechnical.getFiles());// 淇濆瓨闄勪欢
}
- 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 +142,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 +179,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");
@@ -192,11 +195,11 @@
try {
ItemCirculatOrderDto dataObj = this.getDto(null, id);
- String acceptorPath = "鏂囦欢鍥剧墖:"+ getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getItemAcceptorId()));
+ String acceptorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getItemAcceptorId()));
dataObj.getCirculatOrder().setItemAcceptor(acceptorPath);
- String detectorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getCalibratDetectorId()));
+ String detectorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getCalibratDetectorId()));
dataObj.getCirculatOrder().setCalibratDetector(detectorPath);
- String issuerPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getItemIssuerId()));
+ String issuerPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getItemIssuerId()));
dataObj.getCirculatOrder().setItemIssuer(issuerPath);
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
String itemRequireStr = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getItemRequire(), "is_or_not", false);
--
Gitblit v1.9.1