From 9025b9cf7ec8610003d445a31d93e35e7bd73c2e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 31 一月 2024 17:54:52 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 133 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 120 insertions(+), 13 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 5d44f0f..df8cc30 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,9 +2,19 @@
import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
+import com.zt.common.utils.UUIDUtil;
+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;
+import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit;
+import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
+import com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit;
+import com.zt.life.modules.configItemWarehouse.service.ConfigItemWarehouseService;
+import com.zt.life.modules.configItemWarehouse.service.WarehouseCmAuditService;
+import com.zt.life.modules.configItemWarehouse.service.WarehouseConfigItemService;
+import com.zt.life.modules.configItemWarehouse.service.WarehouseQaAuditService;
import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao;
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
@@ -17,6 +27,7 @@
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.oss.model.SysOss;
import com.zt.modules.oss.service.SysOssService;
import com.zt.modules.workflow.dto.FlowInfoDto;
import com.zt.modules.workflow.service.WorkflowService;
@@ -28,6 +39,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -71,6 +83,17 @@
@Autowired
private GetFilesPath getFilesPath;
+ @Autowired
+ private ConfigItemWarehouseService configItemWarehouseService;
+
+ @Autowired
+ private WarehouseCmAuditService cmAuditService;
+
+ @Autowired
+ private WarehouseQaAuditService qaAuditService;
+
+ @Autowired
+ private WarehouseConfigItemService configItemService;
/**
* 鍒嗛〉鏌ヨ
@@ -79,14 +102,20 @@
* @return
*/
public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
- List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams());
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ Long deptId = user.getDeptId();
+ queryFilter.getQueryParams().put("secretClass",secretClass);
+ queryFilter.getQueryParams().put("deptId",deptId);
+ List<ItemCirculatOrder> list = baseDao.getList(queryFilter.getQueryParams());
if (list.size() > 0) {
workflowService.getRunFlow(list, "wplz");
}
return list;
}
- /**yi
+ /**
+ * yi
* 鍒犻櫎
*
* @param ids
@@ -95,7 +124,11 @@
super.deleteLogic(ids);
}
- public Boolean save(ItemCirculatOrderDto itemCirculatOrderDto) {
+ public Long save(ItemCirculatOrderDto itemCirculatOrderDto) {
+ User user = UserContext.getUser();
+ String userName=user.getRealName();
+ String userNameId=user.getId().toString();
+ Long configItemWarehouseId = 0L;
Long circulatOrderId = itemCirculatOrderDto.getCirculatOrder().getId();
if (circulatOrderId != null)
baseDao.updateById(itemCirculatOrderDto.getCirculatOrder());
@@ -110,14 +143,16 @@
}
for (ItemCirculatOrderTechnical circulatOrderTechnical : itemCirculatOrderDto.getTechnicalList()) {
- circulatOrderTechnical.setCirculatOrderId(circulatOrderId);
- if (circulatOrderTechnical.getId() != null) {
- technicalService.update(circulatOrderTechnical);
- } else {
+ if (circulatOrderTechnical.getName() != null) {
circulatOrderTechnical.setCirculatOrderId(circulatOrderId);
- technicalService.insert(circulatOrderTechnical);
+ 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) {
@@ -133,10 +168,72 @@
if (flowInfoDto != null && flowInfoDto.getSubmitType() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
if ("tj".equals(flowInfoDto.getSubmitType())) {
workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
+ } else {
+ if ("wplz_wprk".equals(flowInfoDto.getStepIdMark()) && "bl".equals(flowInfoDto.getSubmitType())) {
+ String Code = itemCirculatOrderDto.getCirculatOrder().getCode();
+ configItemWarehouseId = UUIDUtil.generateId();
+ ConfigItemWarehouse configItemWarehouse = new ConfigItemWarehouse();
+ configItemWarehouse.setId(configItemWarehouseId);
+ configItemWarehouse.setProjectId(itemCirculatOrderDto.getProjectId());
+ configItemWarehouse.setLibraryType("1");
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "config_item_warehouse");
+ map.put("projectId", itemCirculatOrderDto.getProjectId().toString());
+ configItemWarehouse.setCode(sysCodeRuleService.getNewCode(map));
+ // insert
+ configItemWarehouseService.insert(configItemWarehouse);
+ Long WarehouseConfigItemId = 0L;
+ for (int i = 0; i < itemCirculatOrderDto.getTechnicalList().size(); i++) {
+ ItemCirculatOrderTechnical circulatOrderTechnical = itemCirculatOrderDto.getTechnicalList().get(i);
+ Long circulatOrderTechnicalId = circulatOrderTechnical.getId();
+ WarehouseConfigItemId = UUIDUtil.generateId();
+
+ WarehouseConfigItem warehouseConfigItem = new WarehouseConfigItem();
+
+ warehouseConfigItem.setId(WarehouseConfigItemId);
+ warehouseConfigItem.setProjectId(itemCirculatOrderDto.getProjectId());
+ warehouseConfigItem.setLibraryType("1");
+ warehouseConfigItem.setSrcId(circulatOrderTechnicalId);
+ warehouseConfigItem.setWarehouseId(configItemWarehouseId);
+ warehouseConfigItem.setNo(circulatOrderTechnical.getNo());
+ String itemName = circulatOrderTechnical.getName();
+ itemName = itemName.replace(Code, "");
+ warehouseConfigItem.setItemName(itemName);
+ warehouseConfigItem.setItemIdentify(circulatOrderTechnical.getName());
+ warehouseConfigItem.setVersion(circulatOrderTechnical.getVersion());
+ warehouseConfigItem.setSecretClass(circulatOrderTechnical.getSecretClass());
+ // insert
+ configItemService.insert(warehouseConfigItem);
+ List<SysOss> sysOssList = sysOssService.getSysOssByBusiIdAnd(circulatOrderTechnicalId, "circulat_order");
+ for (SysOss sysOss : sysOssList) {
+ sysOss.setId(UUIDUtil.generateId());
+ sysOss.setBusiId(WarehouseConfigItemId);
+ sysOss.setBusiType("config_item_warehouse");
+ sysOss.setBusiTypeName("閰嶇疆椤瑰叆搴�");
+ sysOss.setBusiField("config_item_warehouse");
+ sysOss.setBusiFieldName("閰嶇疆椤瑰叆搴�");
+ sysOssService.insert(sysOss);
+ }
+ }
+ List<WarehouseCmAudit> cmList = configItemWarehouseService.itemCmList("warehouse_cm_audit");
+ for (WarehouseCmAudit cmAudit : cmList) {
+ cmAudit.setWarehouseId(configItemWarehouseId);
+ cmAuditService.insert(cmAudit);
+ }
+ List<WarehouseQaAudit> qaList = configItemWarehouseService.itemQaList("warehouse_qa_audit");
+ for (WarehouseQaAudit qaAudit : qaList) {
+ qaAudit.setWarehouseId(configItemWarehouseId);
+ qaAuditService.insert(qaAudit);
+ }
+ }
+ }
+ if ("wplz_wprk".equals(flowInfoDto.getStepIdMark())){
+ itemCirculatOrderDto.getCirculatOrder().setIssueSituation("1");
+ baseDao.updateById(itemCirculatOrderDto.getCirculatOrder());
}
workflowService.approvePass(flowInfoDto.getFlowCode(), bizId, flowInfoDto.getStepIdMark());
}
- return true;
+ return configItemWarehouseId;
}
public ItemCirculatOrderDto getDto(Long projectId, Long circulatOrderId) {
@@ -192,12 +289,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);
@@ -211,6 +312,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