From b33ec77c0da920c50c1d3e34d2a370f5a6fffbed Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 24 七月 2023 16:58:08 +0800
Subject: [PATCH] 质量巡检添加页面优化

---
 igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java |   57 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java b/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
index 4841801..9b7272b 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
@@ -12,15 +12,15 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 /**
  * 璐ㄩ噺杩芥函绠＄悊
- * 
- * @author: chen
  *
+ * @author: chen
  */
 @Component
 public class QualityManagerPR {
@@ -32,23 +32,36 @@
 
     /**
      * 妫�楠岀被鍒�
-     *
+     * <p>
      * ${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
      *
      * @return
      */
+//    @DataProvider
+//    public List<DicTrigger> triggerType() {
+//        List<DicTrigger> list = new ArrayList<DicTrigger>();
+//        list.add(new DicTrigger("01", "婊′粨鍒濇"));
+//        list.add(new DicTrigger("02", "鍑轰粨妫�楠�"));
+//        list.add(new DicTrigger("03", "鏈堝害鏅"));
+//        return list;
+//    }
     @DataProvider
     public List<DicTrigger> triggerType() {
         List<DicTrigger> list = new ArrayList<DicTrigger>();
-        list.add(new DicTrigger("01", "婊′粨鍒濇"));
+        list.add(new DicTrigger("01", "鍏ヤ粨楠屾敹"));
         list.add(new DicTrigger("02", "鍑轰粨妫�楠�"));
-        list.add(new DicTrigger("03", "鏈堝害鏅"));
+        list.add(new DicTrigger("03", "3鏈堟湯鏅"));
+        list.add(new DicTrigger("04", "9鏈堟湯鏅"));
+        list.add(new DicTrigger("05", "鍏ュ簱鍒濇"));
+        list.add(new DicTrigger("06", "鏈堝害妫�鏌�"));
+        list.add(new DicTrigger("07", "3鏈堟湯搴撳唴鏅煡"));
+        list.add(new DicTrigger("08", "9鏈堟湯搴撳唴鏅煡"));
         return list;
     }
 
     /**
-     * 妫�楠屼緷鎹�
-     *
+     * 鎸囨爣绫诲埆
+     * <p>
      * ${dorado.getDataProvider("qualityManagerPR#triggerStandard").getResult()}
      *
      * @return
@@ -64,8 +77,26 @@
     }
 
     /**
-     * 鍒嗛〉鑾峰彇璐ㄩ噺宸℃璁板綍淇℃伅
+     * 妫�楠屼緷鎹�
+     * <p>
+     * ${dorado.getDataProvider("qualityManagerPR#triggerMetrics").getResult()}
      *
+     * @return
+     */
+    @DataProvider
+    public List<DicTrigger> triggerMetrics() {
+        List<DicTrigger> list = new ArrayList<DicTrigger>();
+
+        list.add(new DicTrigger("1", "璐ㄩ噺鎸囨爣妫�楠�"));
+        list.add(new DicTrigger("2", "鍌ㄥ瓨鍝佽川妫�楠�"));
+        list.add(new DicTrigger("3", "椋熷搧瀹夊叏妫�楠�"));
+
+        return list;
+    }
+
+    /**
+     * 鍒嗛〉鑾峰彇璐ㄩ噺宸℃璁板綍淇℃伅
+     * <p>
      * qualityManagerPR#listQuality
      *
      * @param page
@@ -73,7 +104,7 @@
      * @throws Exception
      */
     @DataProvider
-    public void listQuality(Page<MQuality> page, Map<String, Object> param) throws Exception{
+    public void listQuality(Page<MQuality> page, Map<String, Object> param) throws Exception {
         qualityManageService.listQuality(page, param);
     }
 
@@ -84,16 +115,16 @@
      * @param data
      */
     @DataResolver
-    public void saveQuality(MQuality data){
+    public void saveQuality(MQuality data) {
         String id = "";
-        if(StringUtils.isEmpty(data.getId())){
+        if (StringUtils.isEmpty(data.getId())) {
             id = ManageUtil.createQualityId(data.getType());
         }
         qualityManageService.saveQuality(id, data);
 
         //淇濆瓨妫�娴嬬殑鍖栭獙椤逛俊鎭�
         if (null != data.getCheckItems()) {
-            checkStandardManager.updateCheckItems(id,null,data.getCheckItems());
+            checkStandardManager.updateCheckItems(id, null, data.getCheckItems());
         }
     }
 
@@ -104,7 +135,7 @@
      * @return
      */
     @Expose
-    public String delQuality(MQuality data){
+    public String delQuality(MQuality data) {
         return qualityManageService.delQuality(data);
     }
 

--
Gitblit v1.9.3