sunyize преди 2 години
родител
ревизия
dc241ced32

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

@@ -322,15 +322,15 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         // 数据翻译
         for (BusinessReminderCard reminderCard : exportList) {
             // 营业厅地址
-            if (StringUtils.isNotBlank(reminderCard.getSysBusinessHall())){
-                List<String> list = resultData(null, reminderCard.getSysBusinessHall());
-                reminderCard.setSysBusinessHall(list.get(0));
-            }
+//            if (StringUtils.isNotBlank(reminderCard.getSysBusinessHall())){
+//                List<String> list = resultData(null, reminderCard.getSysBusinessHall());
+//                reminderCard.setSysBusinessHall(list.get(0));
+//            }
             // 营业厅地址
-            if (StringUtils.isNotBlank(reminderCard.getNewBusinessAddress())){
-                List<String> list = resultData(null, reminderCard.getNewBusinessAddress());
-                reminderCard.setNewBusinessAddress(list.get(0));
-            }
+//            if (StringUtils.isNotBlank(reminderCard.getNewBusinessAddress())){
+//                List<String> list = resultData(null, reminderCard.getNewBusinessAddress());
+//                reminderCard.setNewBusinessAddress(list.get(0));
+//            }
             //办理电话
             if (StringUtils.isNotBlank(reminderCard.getNewPhone())){
 

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

@@ -206,10 +206,10 @@ public class BusinessReminderCardVo {
     private String status;
 
     private String userId;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "上报时间")
-    @Excel(name = "上报时间", width = 15)
+    @Excel(name = "上报时间", width = 1,format = "yyyy-MM-dd HH:mm:ss")
     private Date upTime;
     @Excel(name = "当前处理部门", width = 15)
     private String current;