From 1a7af6fff5185bb257c16b0445140c93263a3331 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 15 一月 2024 11:18:17 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 66 +++++++++++++++++++++-----------
1 files changed, 43 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 43ad94b..d8a3bfd 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
@@ -2,6 +2,8 @@
import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
+import com.zt.core.context.User;
+import com.zt.core.context.UserContext;
import com.zt.life.export.dto.WordFile;
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse;
@@ -79,12 +81,18 @@
* @return
*/
public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
- List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams());
- workflowService.getRunFlow(list,"pzxrk");
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ queryFilter.getQueryParams().put("secretClass",secretClass);
+ List<ItemCirculatOrder> list = baseDao.getList(queryFilter.getQueryParams());
+ if (list.size() > 0) {
+ workflowService.getRunFlow(list, "wplz");
+ }
return list;
}
/**
+ * yi
* 鍒犻櫎
*
* @param ids
@@ -94,8 +102,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<>();
@@ -104,22 +112,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());
@@ -137,19 +147,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 {
@@ -174,7 +184,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");
@@ -190,12 +200,16 @@
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 depositPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getDepositorId()));
+ dataObj.getCirculatOrder().setDepositor(depositPath);
+ String detectAcceptorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getDetectAcceptorId()));
+ dataObj.getCirculatOrder().setDetectAcceptor(detectAcceptorPath);
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
String itemRequireStr = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getItemRequire(), "is_or_not", false);
dataObj.getCirculatOrder().setItemRequireStr(itemRequireStr);
@@ -209,6 +223,12 @@
String issueSituationStr = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getIssueSituation(), "is_or_not", false);
dataObj.getCirculatOrder().setIssueSituationStr(issueSituationStr);
+ String depositSituation = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getDepositSituation(), "is_or_not", false);
+ dataObj.getCirculatOrder().setDepositSituation(depositSituation);
+
+ String detectAcceptSituation = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getDetectAcceptSituation(), "is_or_not", false);
+ dataObj.getCirculatOrder().setDetectAcceptSituation(detectAcceptSituation);
+
for (ItemCirculatOrderTechnical technical : dataObj.getTechnicalList()) {
String value = technical.getSecretClass();
String secretClassStr = getShowDictList.getShowDictList(value, "secret_class", false);
--
Gitblit v1.9.1