Merge remote-tracking branch 'origin/dev' into dev

src/main/java/org/rcisoft/sys/visit/entity/VisitInfoMation.java

@@ -90,7 +90,7 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
      */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "访问日期", orderNum = "6", width = 20)
+    @Excel(name = "访问日期", orderNum = "6", width = 20,exportFormat = "yyyy-MM-dd HH:mm:ss")
     private Date visitDate;
 
     /**
@@ -109,6 +109,11 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
     @Excel(name = "访问状态（0 未到访 1 已访问）", orderNum = "8", width = 20)
     private String visitStatus;
 
+    @Transient
+    @TableField(exist = false)
+    @Excel(name = "访客姓名", orderNum = "9", width = 20)
+    String userArry;
+
     @Transient
     @TableField(exist = false)
     @JsonFormat(pattern ="yyyy-MM-dd",timezone ="GMT+8")
@@ -138,7 +143,7 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
     @TableField(exist = false)
     private char sort;
 
-    /**0-未来一周 1-未来三天 2-近三天 3-近一周 4-近一个月**/
+    /** 0-未来一周 1-未来三天 2-近三天 3-近一周 4-近一个月**/
     @Transient
     @TableField(exist = false)
     private char selectTime;

src/main/java/org/rcisoft/sys/visit/service/impl/VisitInfomationServiceImpl.java

@@ -169,8 +169,16 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
      */
     @Override
     public List<VisitInfoMation> findAll(VisitInfoMation visitInfomation) {
-        return baseMapper.queryVisitList(visitInfomation);
-
+        List<VisitInfoMation> visitInfomationList =baseMapper.queryVisitList(visitInfomation);
+        for (VisitInfoMation v: visitInfomationList) {
+            String vuList = "";
+            for(VisitUser vu:v.getUserList()){
+                vuList = vuList+vu.getUserName()+',';
+            }
+            vuList = vuList.substring(0,vuList.length()-1);
+            v.setUserArry(vuList);
+        }
+        return visitInfomationList;
     }
 
     /**
@@ -180,7 +188,15 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
      */
     @Override
     public List<VisitInfoMation> export(VisitInfoMation visitInfomation) {
-        List<VisitInfoMation> visitInfomationList = baseMapper.queryVisitInfomations(visitInfomation);
+        List<VisitInfoMation> visitInfomationList = baseMapper.queryVisitList(visitInfomation);
+        for (VisitInfoMation v: visitInfomationList) {
+            String vuList = "";
+            for(VisitUser vu:v.getUserList()){
+                vuList = vuList+vu.getUserName()+',';
+            }
+            vuList = vuList.substring(0,vuList.length()-1);
+            v.setUserArry(vuList);
+        }
         return visitInfomationList;
     }