Changes

jinlin

2023-11-24 c041523ff100a6a43ebc4411125a3e566e19f193

 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java

@@ -6,6 +6,7 @@
import com.zt.core.sys.dto.DictLeafDto;
import com.zt.life.export.dto.WordFile;
import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao;
import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderTechnicalDao;
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
@@ -14,6 +15,7 @@
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.project.service.SoftwareTestOrderService;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
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.service.SysOssService;
@@ -101,6 +103,7 @@
                circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
                technicalService.insert(circulatOrderTechnical);
            }
            sysOssConfigService.updateOss(circulatOrderTechnical.getId(), circulatOrderTechnical.getFiles());// 保存附件
        }

        if (itemCirculatOrderDto.getTestAgencyInfo().getId() == 10000) {
@@ -109,7 +112,6 @@
        } else {
            testAgencyInfoService.update(itemCirculatOrderDto.getTestAgencyInfo());
        }
        sysOssConfigService.updateOss(itemCirculatOrderDto.getId(), itemCirculatOrderDto.getFiles());// 保存附件
        return true;
    }

@@ -130,10 +132,9 @@
        } else {
            ItemCirculatOrder itemCirculatOrder =new ItemCirculatOrder();
            data.setCirculatOrder(itemCirculatOrder);
            List<?> resultList = baseDao.itemList(projectId);
            List<?> resultList = technicalService.itemList(projectId);
            List<?> technicalList = resultList;
            data.setTechnicalList((List<ItemCirculatOrderTechnical>) technicalList);

        }

        if (projectId != null) {