From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte

---
 force-app/main/default/classes/LexConsumableOrderManageController.cls |  685 ++++++++++++++++++++++++++------------------------------
 1 files changed, 320 insertions(+), 365 deletions(-)

diff --git a/force-app/main/default/classes/LexConsumableOrderManageController.cls b/force-app/main/default/classes/LexConsumableOrderManageController.cls
index 6f82bf0..81e1a82 100644
--- a/force-app/main/default/classes/LexConsumableOrderManageController.cls
+++ b/force-app/main/default/classes/LexConsumableOrderManageController.cls
@@ -5,376 +5,331 @@
  *
  */
 public without sharing class LexConsumableOrderManageController {
-  public static Consumable_order__c coc { get; set; }
-  public static String agencyProType { get; set; }
-  public static String category1 { get; set; }
-  public static String baseUrl { get; private set; }
-  private static String[] columus = new List<String>{ 'Product2__c.Name' };
-  public static List<SelectOption> provinceOpts { get; set; }
-  public static List<CusOption> provinceCusOpts;
-  private static String accountid = null;
-  public static List<String> title { get; private set; }
-  public static List<String> column;
-  public static List<List<String>> columns { get; private set; }
-  public static List<Consumable_order__c> raesList { get; private set; }
-  private static String userWorkLocation;
-  public static Boolean hasHop { get; set; }
-  public static Boolean hasSpecial { get; set; }
-  public LexConsumableOrderManageController() {
-    baseUrl = URL.getSalesforceBaseUrl().toExternalForm();
-  }
-
-  @AuraEnabled
-  public static Results init1() {
-    Results results = new Results();
-    results.isNoteStay = LexUtility.getIsNoteStay();
-    try {
-      String userId = UserInfo.getUserId();
-      // String userId = '0050l000007CAieAAG';
-      List<user> Useracc = new List<user>();
-      Useracc = [
-        SELECT accountid, Work_Location__c, UserPro_Type__c
-        FROM user
-        WHERE id = :userId
-      ];
-      accountid = Useracc[0].accountid;
-      agencyProType = Useracc[0].UserPro_Type__c;
-      if (String.isBlank(Useracc[0].UserPro_Type__c)) {
-        agencyProType = 'ET';
-      }
-      userWorkLocation = Useracc[0].Work_Location__c;
-      coc = new Consumable_order__c();
-      // 鑾峰緱璁㈠崟涓�瑙�
-      Map<String, Schema.FieldSet> fsMap = Schema.getGlobalDescribe()
-        .get('Consumable_order__c')
-        .getDescribe()
-        .fieldSets.getMap();
-      Schema.FieldSet fs = fsMap.get('order_view');
-      // 鑾峰緱璁㈠崟涓殑鎵�鏈夐」鐩�
-      List<FieldSetMember> fsmList = fs.getFields();
-      // 鑾峰緱瀛楁鏍囩鍜屽瓧娈靛悕
-      title = new List<String>();
-      column = new List<String>();
-      columns = new List<List<String>>();
-      List<CusCol> cols = new List<CusCol>();
-      for (FieldSetMember fsm : fsmList) {
-        //add by Link
-        if (
-          fsm.getFieldPath() == 'Order_ForHospital__c' &&
-          agencyProType == 'ET'
-        ) {
-        } else {
-          CusCol col = new CusCol();
-          col.label = fsm.getLabel();
-          col.fieldName = fsm.getFieldPath();
-          col.hideDefaultActions = true;
-          // col.sortable = true;
-          col.wrapText = true;
-          if (fsm.getFieldPath() == 'Order_ForHospital__c') {
-            col.type = 'url';
-            col.fieldName = 'hosUrl';
-            TypeAttr typeAttributes1 = new TypeAttr();
-            CusLable cusLabel = new CusLable();
-            cusLabel.fieldName = 'hosName';
-            typeAttributes1.label = cusLabel;
-            typeAttributes1.target = '_blank';
-            col.typeAttributes = typeAttributes1;
-          }
-          if (fsm.getFieldPath() == 'Name') {
-            col.type = 'url';
-            col.fieldName = 'nameUrl';
-            TypeAttr typeAttributes1 = new TypeAttr();
-            CusLable cusLabel = new CusLable();
-            cusLabel.fieldName = 'Name';
-            typeAttributes1.label = cusLabel;
-            typeAttributes1.target = '_blank';
-            col.typeAttributes = typeAttributes1;
-          }
-          cols.add(col);
-        }
-        //update by rentx 2020-12-22 start
-        if (
-          fsm.getLabel() == '鍖婚櫌' &&
-          agencyProType != null &&
-          agencyProType == 'ET'
-        ) {
-        } else {
-          title.add(fsm.getLabel());
-        }
-        if (
-          fsm.getFieldPath() == 'Order_ForHospital__c' &&
-          agencyProType != null &&
-          agencyProType == 'ET'
-        ) {
-        } else {
-          column.add(fsm.getFieldPath());
-          columns.add(fsm.getFieldPath().split('\\.'));
-        }
-      }
-      provinceOpts = new List<SelectOption>();
-      provinceOpts.add(new SelectOption('', '-鏃�-'));
-      provinceOpts.add(new SelectOption('鑽夋涓�', '鑽夋涓�'));
-      provinceOpts.add(new SelectOption('宸叉彁浜�', '宸叉彁浜�'));
-      provinceOpts.add(new SelectOption('鎵瑰噯', '鎵瑰噯'));
-      provinceOpts.add(new SelectOption('椹冲洖', '椹冲洖'));
-      //閽堝lwc鐨勮嚜瀹氫箟option
-      provinceCusOpts = new List<CusOption>();
-      provinceCusOpts.add(new CusOption('-鏃�-', ''));
-      provinceCusOpts.add(new CusOption('鑽夋涓�', '鑽夋涓�'));
-      provinceCusOpts.add(new CusOption('宸叉彁浜�', '宸叉彁浜�'));
-      provinceCusOpts.add(new CusOption('鎵瑰噯', '鎵瑰噯'));
-      provinceCusOpts.add(new CusOption('椹冲洖', '椹冲洖'));
-      // 鑾峰緱鏄剧ず鏁版嵁
-      raesList = new List<Consumable_order__c>();
-      String soql = 'select Id';
-      for (String s : column) {
-        soql += ',' + s;
-      }
-      soql +=
-        ',Order_ForHospital__r.Name from Consumable_order__c where Order_type__c = \'' +
-        '璁㈠崟' +
-        '\'';
-      soql += ' and RecordtypeId = \'' + System.Label.RT_ConOrder_Order + '\'';
-      soql += ' and Order_Owner_WorkLocal__c = \'' + userWorkLocation + '\'';
-      soql += ' and Order_ProType__c =\'' + agencyProType + '\' ';
-      soql +=
-        ' and Dealer_Info__c =\'' +
-        accountid +
-        '\' order by Order_status__c ';
-      System.debug('====soql====' + soql);
-      raesList = Database.query(soql);
-      //add by rentx 2021-3-10 start
-      //涓� hasHop 璧嬪�� 鍒ゆ柇褰撳墠缁忛攢鍟嗕笅鏄惁鏈夌壒浠峰尰闄�
-      List<hospitalprice__c> hopList = [
-        SELECT id, hospital__c
-        FROM hospitalprice__c
-        WHERE account__c = :accountid
-      ];
-      if (hopList == null || hopList.size() == 0) {
-        hasHop = false;
-      } else {
-        hasHop = true;
-      }
-      //涓� hasSpecial 璧嬪�� 鍒ゆ柇褰撳墠缁忛攢鍟嗕笅鏄惁鏈変績閿�鍟嗗搧
-      //鏌ヨ褰撳墠缁忛攢鍟嗕笅鐨勬湁鏁堝悎鍚�
-      List<Account> contractList = [
-        SELECT Id, Name, RecordType.DeveloperName
-        FROM Account
-        WHERE
-          RecordType.DeveloperName = 'AgencyContract'
-          AND Contact_Type__c LIKE :agencyProType
-          AND Agent_Ref__c = :accountid
-      ];
-      List<Id> dealIds = new List<Id>();
-      if (contractList != null && contractList.size() > 0) {
-        for (Account acc : contractList) {
-          dealIds.add(acc.Id);
-        }
-        List<Dealer_Product__c> deList = [
-          SELECT id
-          FROM Dealer_Product__c
-          WHERE Dealer_Contact__c IN :dealIds
-        ];
-        if (deList == null || deList.size() == 0) {
-          hasSpecial = false;
-        } else {
-          hasSpecial = true;
-        }
-      } else {
-        hasSpecial = false;
-      }
-      results.result = 'Success';
-      results.provinceOpts = provinceCusOpts;
-      results.raesList = raesList;
-      results.agencyProType = agencyProType;
-      results.userWorkLocation = userWorkLocation;
-      results.accountid = accountid;
-      results.hasHop = hasHop;
-      results.hasSpecial = hasSpecial;
-      results.title = title;
-      results.cols = cols;
-    } catch (Exception e) {
-      results.result = 'Fail';
-      results.raesList = new List<Consumable_order__c>();
-      results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
-    }
-    return results;
-  }
-
-  @AuraEnabled
-  public static Results searchConsumableorderdetails(
-    String categoryStr,
-    Date orderDate,
-    String orderStatus,
-    String accountidStr,
-    String agencyProTypeStr,
-    String userWorkLocationStr
-  ) {
-    Results results = new Results();
-    agencyProType = agencyProTypeStr;
-    userWorkLocation = userWorkLocationStr;
-    accountid = accountidStr;
-    if (String.isBlank(categoryStr)) {
-      category1 = null;
-    } else {
-      category1 = categoryStr;
-    }
-    coc = new Consumable_order__c();
-    if (String.isBlank(orderStatus)) {
-      coc.Order_status__c = null;
-    } else {
-      coc.Order_status__c = orderStatus;
-    }
-    coc.Order_date__c = orderDate;
-    try {
-      Date cate2 = coc.Order_date__c;
-      String cate3 = coc.Order_status__c;
-      // 鑾峰緱璁㈠崟涓�瑙�
-      Map<String, Schema.FieldSet> fsMap = Schema.getGlobalDescribe()
-        .get('Consumable_order__c')
-        .getDescribe()
-        .fieldSets.getMap();
-      Schema.FieldSet fs = fsMap.get('order_view');
-      // 鑾峰緱璁㈠崟涓殑鎵�鏈夐」鐩�
-      List<FieldSetMember> fsmList = fs.getFields();
-      // 鑾峰緱瀛楁鏍囩鍜屽瓧娈靛悕
-      title = new List<String>();
-      column = new List<String>();
-      columns = new List<List<String>>();
-      for (FieldSetMember fsm : fsmList) {
-        //update by rentx 2020-12-22 start
-        if (
-          fsm.getLabel() == '鍖婚櫌' &&
-          agencyProType != null &&
-          agencyProType == 'ET'
-        ) {
-        } else {
-          title.add(fsm.getLabel());
-        }
-        if (
-          fsm.getFieldPath() == 'Order_ForHospital__c' &&
-          agencyProType != null &&
-          agencyProType == 'ET'
-        ) {
-        } else {
-          column.add(fsm.getFieldPath());
-          columns.add(fsm.getFieldPath().split('\\.'));
-        }
-      }
-      // 鑾峰緱鏄剧ず鏁版嵁
-      raesList = new List<Consumable_order__c>();
-      String soql = 'select Id';
-      for (String s : column) {
-        soql += ',' + s;
-      }
-      soql +=
-        ',Order_ForHospital__r.Name from Consumable_order__c where Order_type__c = \'' +
-        '璁㈠崟' +
-        '\' and RecordtypeId = \'' +
-        System.Label.RT_ConOrder_Order +
-        '\' and Dealer_Info__c =\'' +
-        accountid +
-        '\' ';
-      soql += ' and Order_Owner_WorkLocal__c = \'' + userWorkLocation + '\' ';
-      soql += ' and Order_ProType__c =\'' + agencyProType + '\' ';
-      if (!String.isBlank(category1)) {
-        soql +=
-          ' and Name like \'%' +
-          String.escapeSingleQuotes(category1.replaceAll('%', '\\%')) +
-          '%\' ';
-      }
-      if (cate2 != null) {
-        soql += ' and Order_date__c = :cate2';
-      }
-      if (cate3 != null) {
-        soql += ' and Order_status__c = :cate3 ';
-      }
-      soql += ' order by Order_status__c ';
-      system.debug('====soql:' + soql);
-      raesList = Database.query(soql);
-      system.debug('====raesList:' + raesList);
-      if (raesList.size() > 0) {
-        results.result = 'Success';
-        results.raesList = raesList;
-        results.errorMsg = '鍏辨湁' + raesList.size() + '涓鍗�';
-      } else {
-        results.result = 'Fail';
-        results.raesList = new List<Consumable_order__c>();
-        results.errorMsg = '娌℃湁鎼滅储鍒扮浉鍏宠鍗�';
-      }
-    } catch (Exception e) {
-      results.result = 'Fail';
-      results.raesList = new List<Consumable_order__c>();
-      results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
-    }
-    return results;
-  }
-
-  public class Results {
-    @AuraEnabled
-    public String result;
-    @AuraEnabled
-    public String errorMsg;
-    @AuraEnabled
-    public List<CusOption> provinceOpts;
-    @AuraEnabled
-    public List<String> title;
-    @AuraEnabled
-    public String accountid;
-    @AuraEnabled
-    public String agencyProType;
-    @AuraEnabled
-    public String userWorkLocation;
-    @AuraEnabled
-    public Boolean hasHop;
-    @AuraEnabled
-    public Boolean hasSpecial;
-    @AuraEnabled
-    public List<Consumable_order__c> raesList;
-    @AuraEnabled
-    public List<CusCol> cols;
-    @AuraEnabled
-    public Boolean isNoteStay;
-  }
-
-  public class CusOption {
-    CusOption(String label, String value) {
-      this.label = label;
-      this.value = value;
+    public static Consumable_order__c coc { get; set; }
+    public static String agencyProType { get; set; }
+    public static String category1 { get; set; }
+    public static String baseUrl { get; private set; }
+    private static String[] columus = new List<String>{ 'Product2__c.Name' };
+    public static List<SelectOption> provinceOpts { get; set; }
+    public static List<CusOption> provinceCusOpts;
+    private static String accountid = null;
+    public static List<String> title { get; private set; }
+    public static List<String> column;
+    public static List<List<String>> columns { get; private set; }
+    public static List<Consumable_order__c> raesList { get; private set; }
+    private static String userWorkLocation;
+    public static Boolean hasHop { get; set; }
+    public static Boolean hasSpecial { get; set; }
+    public LexConsumableOrderManageController() {
+        baseUrl = URL.getSalesforceBaseUrl().toExternalForm();
     }
 
     @AuraEnabled
-    public String label;
-    @AuraEnabled
-    public String value;
-  }
+    public static Results init1() {
+        Results results = new Results();
+        results.isNoteStay = LexUtility.getIsNoteStay();
+        try {
+            String userId = UserInfo.getUserId();
+            // String userId = '0050l000007CAieAAG';
+            List<user> Useracc = new List<user>();
+            Useracc = [
+                SELECT accountid, Work_Location__c, UserPro_Type__c
+                FROM user
+                WHERE id = :userId
+            ];
+            accountid = Useracc[0].accountid;
+            agencyProType = Useracc[0].UserPro_Type__c;
+            if (String.isBlank(Useracc[0].UserPro_Type__c)) {
+                agencyProType = 'ET';
+            }
+            userWorkLocation = Useracc[0].Work_Location__c;
+            coc = new Consumable_order__c();
+            // 鑾峰緱璁㈠崟涓�瑙�
+            Map<String, Schema.FieldSet> fsMap = Schema.getGlobalDescribe().get('Consumable_order__c').getDescribe().fieldSets.getMap();
+            Schema.FieldSet fs = fsMap.get('order_view');
+            // 鑾峰緱璁㈠崟涓殑鎵�鏈夐」鐩�
+            List<FieldSetMember> fsmList = fs.getFields();
+            // 鑾峰緱瀛楁鏍囩鍜屽瓧娈靛悕
+            title = new List<String>();
+            column = new List<String>();
+            columns = new List<List<String>>();
+            List<CusCol> cols = new List<CusCol>();
+            for (FieldSetMember fsm : fsmList) {
+                //add by Link
+                if (fsm.getFieldPath() == 'Order_ForHospital__c' && agencyProType == 'ET') {
+                } else {
+                    CusCol col = new CusCol();
+                    col.label = fsm.getLabel();
+                    col.fieldName = fsm.getFieldPath();
+                    col.hideDefaultActions = true;
+                    // col.sortable = true;
+                    col.wrapText = true;
+                    if (fsm.getFieldPath() == 'Order_ForHospital__c') {
+                        col.type = 'url';
+                        col.fieldName = 'hosUrl';
+                        TypeAttr typeAttributes1 = new TypeAttr();
+                        CusLable cusLabel = new CusLable();
+                        cusLabel.fieldName = 'hosName';
+                        typeAttributes1.label = cusLabel;
+                        typeAttributes1.target = '_blank';
+                        col.typeAttributes = typeAttributes1;
+                    }
+                    if (fsm.getFieldPath() == 'Name') {
+                        col.type = 'url';
+                        col.fieldName = 'nameUrl';
+                        TypeAttr typeAttributes1 = new TypeAttr();
+                        CusLable cusLabel = new CusLable();
+                        cusLabel.fieldName = 'Name';
+                        typeAttributes1.label = cusLabel;
+                        typeAttributes1.target = '_blank';
+                        col.typeAttributes = typeAttributes1;
+                    }
+                    cols.add(col);
+                }
+                //update by rentx 2020-12-22 start
+                if (fsm.getLabel() == '鍖婚櫌' && agencyProType != null && agencyProType == 'ET') {
+                } else {
+                    title.add(fsm.getLabel());
+                }
+                if (fsm.getFieldPath() == 'Order_ForHospital__c' && agencyProType != null && agencyProType == 'ET') {
+                } else {
+                    column.add(fsm.getFieldPath());
+                    columns.add(fsm.getFieldPath().split('\\.'));
+                }
+            }
+            provinceOpts = new List<SelectOption>();
+            provinceOpts.add(new SelectOption('', '-鏃�-'));
+            provinceOpts.add(new SelectOption('鑽夋涓�', '鑽夋涓�'));
+            provinceOpts.add(new SelectOption('宸叉彁浜�', '宸叉彁浜�'));
+            provinceOpts.add(new SelectOption('鎵瑰噯', '鎵瑰噯'));
+            provinceOpts.add(new SelectOption('椹冲洖', '椹冲洖'));
+            //閽堝lwc鐨勮嚜瀹氫箟option
+            provinceCusOpts = new List<CusOption>();
+            provinceCusOpts.add(new CusOption('-鏃�-', ''));
+            provinceCusOpts.add(new CusOption('鑽夋涓�', '鑽夋涓�'));
+            provinceCusOpts.add(new CusOption('宸叉彁浜�', '宸叉彁浜�'));
+            provinceCusOpts.add(new CusOption('鎵瑰噯', '鎵瑰噯'));
+            provinceCusOpts.add(new CusOption('椹冲洖', '椹冲洖'));
+            // 鑾峰緱鏄剧ず鏁版嵁
+            raesList = new List<Consumable_order__c>();
+            String soql = 'select Id';
+            for (String s : column) {
+                soql += ',' + s;
+            }
+            soql += ',Order_ForHospital__r.Name from Consumable_order__c where Order_type__c = \'' + '璁㈠崟' + '\'';
+            soql += ' and RecordtypeId = \'' + System.Label.RT_ConOrder_Order + '\'';
+            soql += ' and Order_Owner_WorkLocal__c = \'' + userWorkLocation + '\'';
+            soql += ' and Order_ProType__c =\'' + agencyProType + '\' ';
+            soql += ' and Dealer_Info__c =\'' + accountid + '\' order by Order_status__c ';
+            System.debug('====soql====' + soql);
+            raesList = Database.query(soql);
+            //add by rentx 2021-3-10 start
+            //涓� hasHop 璧嬪�� 鍒ゆ柇褰撳墠缁忛攢鍟嗕笅鏄惁鏈夌壒浠峰尰闄�
+            List<hospitalprice__c> hopList = [SELECT id, hospital__c FROM hospitalprice__c WHERE account__c = :accountid];
+            if (hopList == null || hopList.size() == 0) {
+                hasHop = false;
+            } else {
+                hasHop = true;
+            }
+            //涓� hasSpecial 璧嬪�� 鍒ゆ柇褰撳墠缁忛攢鍟嗕笅鏄惁鏈変績閿�鍟嗗搧
+            //鏌ヨ褰撳墠缁忛攢鍟嗕笅鐨勬湁鏁堝悎鍚�
+            List<Account> contractList = [
+                SELECT Id, Name, RecordType.DeveloperName
+                FROM Account
+                WHERE RecordType.DeveloperName = 'AgencyContract' AND Contact_Type__c LIKE :agencyProType AND Agent_Ref__c = :accountid
+            ];
+            List<Id> dealIds = new List<Id>();
+            if (contractList != null && contractList.size() > 0) {
+                for (Account acc : contractList) {
+                    dealIds.add(acc.Id);
+                }
+                List<Dealer_Product__c> deList = [SELECT id FROM Dealer_Product__c WHERE Dealer_Contact__c IN :dealIds];
+                if (deList == null || deList.size() == 0) {
+                    hasSpecial = false;
+                } else {
+                    hasSpecial = true;
+                }
+            } else {
+                hasSpecial = false;
+            }
+            results.result = 'Success';
+            results.provinceOpts = provinceCusOpts;
+            results.raesList = raesList;
+            results.agencyProType = agencyProType;
+            results.userWorkLocation = userWorkLocation;
+            results.accountid = accountid;
+            results.hasHop = hasHop;
+            results.hasSpecial = hasSpecial;
+            results.title = title;
+            results.cols = cols;
+        } catch (Exception e) {
+            results.result = 'Fail';
+            results.raesList = new List<Consumable_order__c>();
+            results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
+        }
+        return results;
+    }
 
-  public class CusCol {
     @AuraEnabled
-    public String label;
-    @AuraEnabled
-    public String fieldName;
-    @AuraEnabled
-    public String type;
-    @AuraEnabled
-    public Boolean sortable;
-    @AuraEnabled
-    public Boolean wrapText;
-    @AuraEnabled
-    public Boolean hideDefaultActions;
-    @AuraEnabled
-    public TypeAttr typeAttributes;
-  }
+    public static Results searchConsumableorderdetails(
+        String categoryStr,
+        Date orderDate,
+        String orderStatus,
+        String accountidStr,
+        String agencyProTypeStr,
+        String userWorkLocationStr
+    ) {
+        Results results = new Results();
+        agencyProType = agencyProTypeStr;
+        userWorkLocation = userWorkLocationStr;
+        accountid = accountidStr;
+        if (String.isBlank(categoryStr)) {
+            category1 = null;
+        } else {
+            category1 = categoryStr;
+        }
+        coc = new Consumable_order__c();
+        if (String.isBlank(orderStatus)) {
+            coc.Order_status__c = null;
+        } else {
+            coc.Order_status__c = orderStatus;
+        }
+        coc.Order_date__c = orderDate;
+        try {
+            Date cate2 = coc.Order_date__c;
+            String cate3 = coc.Order_status__c;
+            // 鑾峰緱璁㈠崟涓�瑙�
+            Map<String, Schema.FieldSet> fsMap = Schema.getGlobalDescribe().get('Consumable_order__c').getDescribe().fieldSets.getMap();
+            Schema.FieldSet fs = fsMap.get('order_view');
+            // 鑾峰緱璁㈠崟涓殑鎵�鏈夐」鐩�
+            List<FieldSetMember> fsmList = fs.getFields();
+            // 鑾峰緱瀛楁鏍囩鍜屽瓧娈靛悕
+            title = new List<String>();
+            column = new List<String>();
+            columns = new List<List<String>>();
+            for (FieldSetMember fsm : fsmList) {
+                //update by rentx 2020-12-22 start
+                if (fsm.getLabel() == '鍖婚櫌' && agencyProType != null && agencyProType == 'ET') {
+                } else {
+                    title.add(fsm.getLabel());
+                }
+                if (fsm.getFieldPath() == 'Order_ForHospital__c' && agencyProType != null && agencyProType == 'ET') {
+                } else {
+                    column.add(fsm.getFieldPath());
+                    columns.add(fsm.getFieldPath().split('\\.'));
+                }
+            }
+            // 鑾峰緱鏄剧ず鏁版嵁
+            raesList = new List<Consumable_order__c>();
+            String soql = 'select Id';
+            for (String s : column) {
+                soql += ',' + s;
+            }
+            soql +=
+                ',Order_ForHospital__r.Name from Consumable_order__c where Order_type__c = \'' +
+                '璁㈠崟' +
+                '\' and RecordtypeId = \'' +
+                System.Label.RT_ConOrder_Order +
+                '\' and Dealer_Info__c =\'' +
+                accountid +
+                '\' ';
+            soql += ' and Order_Owner_WorkLocal__c = \'' + userWorkLocation + '\' ';
+            soql += ' and Order_ProType__c =\'' + agencyProType + '\' ';
+            if (!String.isBlank(category1)) {
+                soql += ' and Name like \'%' + String.escapeSingleQuotes(category1.replaceAll('%', '\\%')) + '%\' ';
+            }
+            if (cate2 != null) {
+                soql += ' and Order_date__c = :cate2';
+            }
+            if (cate3 != null) {
+                soql += ' and Order_status__c = :cate3 ';
+            }
+            soql += ' order by Order_status__c ';
+            system.debug('====soql:' + soql);
+            raesList = Database.query(soql);
+            system.debug('====raesList:' + raesList);
+            if (raesList.size() > 0) {
+                results.result = 'Success';
+                results.raesList = raesList;
+                results.errorMsg = '鍏辨湁' + raesList.size() + '涓鍗�';
+            } else {
+                results.result = 'Fail';
+                results.raesList = new List<Consumable_order__c>();
+                results.errorMsg = '娌℃湁鎼滅储鍒扮浉鍏宠鍗�';
+            }
+        } catch (Exception e) {
+            results.result = 'Fail';
+            results.raesList = new List<Consumable_order__c>();
+            results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
+        }
+        return results;
+    }
 
-  public class TypeAttr {
-    @AuraEnabled
-    public CusLable label;
-    @AuraEnabled
-    public String target;
-  }
+    public class Results {
+        @AuraEnabled
+        public String result;
+        @AuraEnabled
+        public String errorMsg;
+        @AuraEnabled
+        public List<CusOption> provinceOpts;
+        @AuraEnabled
+        public List<String> title;
+        @AuraEnabled
+        public String accountid;
+        @AuraEnabled
+        public String agencyProType;
+        @AuraEnabled
+        public String userWorkLocation;
+        @AuraEnabled
+        public Boolean hasHop;
+        @AuraEnabled
+        public Boolean hasSpecial;
+        @AuraEnabled
+        public List<Consumable_order__c> raesList;
+        @AuraEnabled
+        public List<CusCol> cols;
+        @AuraEnabled
+        public Boolean isNoteStay;
+    }
 
-  public class CusLable {
-    @AuraEnabled
-    public String fieldName;
-  }
+    public class CusOption {
+        CusOption(String label, String value) {
+            this.label = label;
+            this.value = value;
+        }
+
+        @AuraEnabled
+        public String label;
+        @AuraEnabled
+        public String value;
+    }
+
+    public class CusCol {
+        @AuraEnabled
+        public String label;
+        @AuraEnabled
+        public String fieldName;
+        @AuraEnabled
+        public String type;
+        @AuraEnabled
+        public Boolean sortable;
+        @AuraEnabled
+        public Boolean wrapText;
+        @AuraEnabled
+        public Boolean hideDefaultActions;
+        @AuraEnabled
+        public TypeAttr typeAttributes;
+    }
+
+    public class TypeAttr {
+        @AuraEnabled
+        public CusLable label;
+        @AuraEnabled
+        public String target;
+    }
+
+    public class CusLable {
+        @AuraEnabled
+        public String fieldName;
+    }
 }

--
Gitblit v1.9.1