From 1249ac088787abb46bc60a241531e2b4fcc961fe Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 13 十一月 2023 10:38:57 +0800
Subject: [PATCH] Changes

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index 0d66775..b69fe1c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -7,12 +7,15 @@
 import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
 import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
 import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zt.common.db.query.QueryFilter;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -32,6 +35,8 @@
     private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
     @Autowired
     private TestAgencyInfoService testAgencyInfoService;
+    @Autowired
+    private SysCodeRuleService sysCodeRuleService;
 
     /**
      * 鍒嗛〉鏌ヨ
@@ -59,6 +64,9 @@
         if (softwareTestOrderId != null)
             baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
         else {
+            Map<String, String> map = new HashMap<>();
+            map.put("funCode", "software_test_order");
+            softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
             baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
             softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId();
         }
@@ -90,4 +98,12 @@
         return true;
     }
 
+
+    public List<SoftwareTestOrderDeliverable> deliverableDict() {
+        return  baseDao.getdeliverableDictList();
+    }
+
+    public List<SoftwareTestOrderMeasured> MeasuredDict() {
+        return baseDao.getMeasuredDictList();
+    }
 }

--
Gitblit v1.9.1