导出拆分

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/BusinessReminderCardController.java

@@ -375,25 +375,25 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                         .replace(",newPhone3+"," ").replace(",newPhone4+"," ").replace(",newPhone5+"," "));
             }
             //判研结果
-            if (StringUtils.isNotBlank(reminderCard.getNumberResults())){
-                String[] split = reminderCard.getNumberResults().split(",");
-                StringBuilder str = new StringBuilder();
-                for (String s : split) {
-                    if (s.equals("1")){
-                        str.append("非高危");
-                    }
-                    if (s.equals("2")){
-                        str.append("上报关停");
-                    }
-                    if (s.equals("3")){
-                        str.append("上报蓝名单");
-                    }
-                    if (s.equals("4")){
-                        str.append("上报紫名单");
-                    }
-                }
-                reminderCard.setNumberResults(str.toString());
-            }
+//            if (StringUtils.isNotBlank(reminderCard.getNumberResults())){
+//                String[] split = reminderCard.getNumberResults().split(",");
+//                StringBuilder str = new StringBuilder();
+//                for (String s : split) {
+//                    if (s.equals("1")){
+//                        str.append("非高危");
+//                    }
+//                    if (s.equals("2")){
+//                        str.append("上报关停");
+//                    }
+//                    if (s.equals("3")){
+//                        str.append("上报蓝名单");
+//                    }
+//                    if (s.equals("4")){
+//                        str.append("上报紫名单");
+//                    }
+//                }
+//                reminderCard.setNumberResults(str.toString());
+//            }
             if ( reminderCard.getCreateTime()!=null){
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -499,6 +499,9 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         }
 
         List<BusinessReminderCardVo> exportListNew = new ArrayList<>();
+        List<Map<String, String>> orgName = businessReminderCardService.getOrgName();
+        Map<String, Map<String, String>> orgCode = orgName.stream().collect(Collectors.toMap(v -> v.get("orgCode"), Function.identity(), (o, n) -> o));
+
         for (BusinessReminderCard card : exportList) {
             String[] split = card.getNewPhone().split(",");
             if (split.length>1){
@@ -512,16 +515,28 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                             businessReminderCard1.setCurrent(businessReminderCard1.getBusinessAddress());
                         }
                         if (businessReminderCard1.getStatus().equals("1")){
+                            Map<String, String> stringStringMap = orgCode.get(businessReminderCard1.getSysOrgCode().substring(0, 3));
                             businessReminderCard1.setUpStatus("已报分公司");
-                            businessReminderCard1.setCurrent("已报分公司");
+                            businessReminderCard1.setCurrent("已报"+stringStringMap.get("departName"));
                         }
                         if (businessReminderCard1.getStatus().equals("2")){
                             businessReminderCard1.setUpStatus("上报成功");
                             businessReminderCard1.setCurrent("已完成");
                         }
                     }
+                    String[] split1 = businessReminderCard1.getNumberResults().split(",");
+                    if (split1.length>1){
+                        for (String string : split1) {
+                            BusinessReminderCardVo businessReminderCardVo = new BusinessReminderCardVo();
+                            BeanUtils.copyProperties(businessReminderCard1 ,businessReminderCardVo);
+                            businessReminderCardVo.setNumberResults(NumberResultsEnum.findNameByValue(string));
+                            exportListNew.add(businessReminderCardVo);
+                        }
+                    }else {
+                        businessReminderCard1.setNumberResults(NumberResultsEnum.findNameByValue(businessReminderCard1.getNumberResults()));
+                        exportListNew.add(businessReminderCard1);
+                    }
 
-                    exportListNew.add(businessReminderCard1);
                 }
             }else{
                 BusinessReminderCardVo businessReminderCard1 = new BusinessReminderCardVo();
@@ -532,15 +547,27 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                         businessReminderCard1.setCurrent(businessReminderCard1.getBusinessAddress());
                     }
                     if (businessReminderCard1.getStatus().equals("1")){
+                        Map<String, String> stringStringMap = orgCode.get(businessReminderCard1.getSysOrgCode().substring(0, 3));
                         businessReminderCard1.setUpStatus("已报分公司");
-                        businessReminderCard1.setCurrent("已报分公司");
+                        businessReminderCard1.setCurrent("已报"+stringStringMap.get("departName"));
                     }
                     if (businessReminderCard1.getStatus().equals("2")){
                         businessReminderCard1.setUpStatus("上报成功");
                         businessReminderCard1.setCurrent("已完成");
                     }
                 }
-                exportListNew.add(businessReminderCard1);
+                String[] split1 = businessReminderCard1.getNumberResults().split(",");
+                if (split1.length>1){
+                    for (String string : split1) {
+                        BusinessReminderCardVo businessReminderCardVo = new BusinessReminderCardVo();
+                        BeanUtils.copyProperties(businessReminderCard1 ,businessReminderCardVo);
+                        businessReminderCardVo.setNumberResults(NumberResultsEnum.findNameByValue(string));
+                        exportListNew.add(businessReminderCardVo);
+                    }
+                }else {
+                    businessReminderCard1.setNumberResults(NumberResultsEnum.findNameByValue(businessReminderCard1.getNumberResults()));
+                    exportListNew.add(businessReminderCard1);
+                }
             }
         }
          return getModelAndView(exportListNew,"入网信息业务",BusinessReminderCardVo.class);

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/BusinessReminderCardVo.java

@@ -215,9 +215,7 @@ public class BusinessReminderCardVo {
     private String current;
     @Excel(name = "上报状态", width = 15)
     private String upStatus;
-    @ApiModelProperty(value = "当前处理部门")
-    @Excel(name = "当前处理部门", width = 15)
-    private String currentDept;
+
 
 
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/NumberResultsEnum.java

@@ -0,0 +1,50 @@
+package org.jeecg.modules.smscheck.entity;
+
+import org.jeecg.modules.smscheck.enums.PhoneType;
+
+public enum NumberResultsEnum {
+
+    FeiGaoWei("非高危","1"),
+    GuanTing("上报关停","2"),
+    LanMingDan("上报蓝名单","3"),
+    ZiMingDan("上报紫名单","4");
+
+
+    /* renamed from: e */
+    private String name;
+
+    /* renamed from: f */
+    private String value;
+
+    NumberResultsEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /* renamed from: b */
+    public static String findNameByValue(String value) {
+        NumberResultsEnum[] a;
+        for (NumberResultsEnum base : NumberResultsEnum.values()) {
+            if (base.value.equals(value)) {
+                return base.name;
+            }
+        }
+        return null;
+    }
+}