From 0a2013ac0a8356c4bdbc44ba05e622b54d9bebed Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 15 十二月 2023 17:22:38 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java |   35 ++++++++++++++++++++---------------
 1 files changed, 20 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 d5cacb0..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
@@ -4,6 +4,7 @@
 import com.zt.common.service.BaseService;
 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.itemCirculatOrder.dao.ItemCirculatOrderDao;
 import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
 import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
@@ -78,10 +79,14 @@
      * @return
      */
     public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
-        return baseDao.getList(queryFilter.getQueryParams());
+        List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams());
+        if (list.size() > 0) {
+            workflowService.getRunFlow(list, "wplz");
+        }
+        return list;
     }
 
-    /**
+    /**yi
      * 鍒犻櫎
      *
      * @param ids
@@ -91,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<>();
@@ -101,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());
@@ -134,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 {
@@ -171,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