Przeglądaj źródła

优化访客登记功能

wuxw 6 lat temu
rodzic
commit
89e99d6ffd

+ 0 - 1
WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.html

@@ -65,6 +65,5 @@
     </div>
 
     <vc:create name="editVisit"></vc:create>
-    <vc:create name="deleteApp"></vc:create>
 
 </div>

+ 18 - 16
java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java

@@ -15,24 +15,17 @@ import java.util.Date;
  **/
 public class VisitDto extends PageDto implements Serializable {
 
-    private Date departureTime;
+    private String departureTime;
     private String vName;
     private String visitGender;
     private String ownerId;
     private String userId;
     private String vId;
-    private Date visitTime;
+    private String visitTime;
     private String phoneNumber;
     private String visitCase;
     private String communityId;
 
-    public Date getDepartureTime() {
-        return departureTime;
-    }
-
-    public void setDepartureTime(Date departureTime) {
-        this.departureTime = departureTime;
-    }
 
     public String getvName() {
         return vName;
@@ -74,13 +67,6 @@ public class VisitDto extends PageDto implements Serializable {
         this.vId = vId;
     }
 
-    public Date getVisitTime() {
-        return visitTime;
-    }
-
-    public void setVisitTime(Date visitTime) {
-        this.visitTime = visitTime;
-    }
 
     public String getPhoneNumber() {
         return phoneNumber;
@@ -105,4 +91,20 @@ public class VisitDto extends PageDto implements Serializable {
     public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
+
+    public String getDepartureTime() {
+        return departureTime;
+    }
+
+    public void setDepartureTime(String departureTime) {
+        this.departureTime = departureTime;
+    }
+
+    public String getVisitTime() {
+        return visitTime;
+    }
+
+    public void setVisitTime(String visitTime) {
+        this.visitTime = visitTime;
+    }
 }

+ 9 - 9
java110-bean/src/main/java/com/java110/vo/api/visit/ApiVisitDataVo.java

@@ -12,9 +12,9 @@ public class ApiVisitDataVo implements Serializable {
     private String communityId;
     private String ownerId;
     private String visitCase;
-    private Date visitTime;
-    private Date departureTime;
-    private Date createTime;
+    private String visitTime;
+    private String departureTime;
+    private String createTime;
     private String statusCd = "0";
 
     public String getvId() {
@@ -81,27 +81,27 @@ public class ApiVisitDataVo implements Serializable {
         this.visitCase = visitCase;
     }
 
-    public Date getVisitTime() {
+    public String getVisitTime() {
         return visitTime;
     }
 
-    public void setVisitTime(Date visitTime) {
+    public void setVisitTime(String visitTime) {
         this.visitTime = visitTime;
     }
 
-    public Date getDepartureTime() {
+    public String getDepartureTime() {
         return departureTime;
     }
 
-    public void setDepartureTime(Date departureTime) {
+    public void setDepartureTime(String departureTime) {
         this.departureTime = departureTime;
     }
 
-    public Date getCreateTime() {
+    public String getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
 

+ 10 - 10
java110-db/src/main/resources/mapper/visit/VisitServiceDaoImplMapper.xml

@@ -22,7 +22,7 @@
         visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
         from business_visit_info t
         where 1 =1
-        <if test="departureTime !=null and departureTime != ''">
+        <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
         </if>
         <if test="vName !=null and vName != ''">
@@ -40,7 +40,7 @@
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
         </if>
-        <if test="visitTime !=null and visitTime != ''">
+        <if test="visitTime !=null ">
             and t.visit_time= #{visitTime}
         </if>
         <if test="phoneNumber !=null and phoneNumber != ''">
@@ -69,7 +69,7 @@
         ) select
         t.departure_time,t.v_name,'0',t.visit_gender,t.owner_id,t.user_id,t.v_id,t.visit_time,t.phone_number,t.visit_case,t.community_id,t.b_id
         from business_visit_info t where 1=1
-        <if test="departureTime !=null and departureTime != ''">
+        <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
         </if>
         <if test="vName !=null and vName != ''">
@@ -87,7 +87,7 @@
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
         </if>
-        <if test="visitTime !=null and visitTime != ''">
+        <if test="visitTime !=null ">
             and t.visit_time= #{visitTime}
         </if>
         <if test="phoneNumber !=null and phoneNumber != ''">
@@ -115,7 +115,7 @@
         phoneNumber,t.visit_case,t.visit_case visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
         from s_visit_info t
         where 1 =1
-        <if test="departureTime !=null and departureTime != ''">
+        <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
         </if>
         <if test="vName !=null and vName != ''">
@@ -136,7 +136,7 @@
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
         </if>
-        <if test="visitTime !=null and visitTime != ''">
+        <if test="visitTime !=null ">
             and t.visit_time= #{visitTime}
         </if>
         <if test="phoneNumber !=null and phoneNumber != ''">
@@ -164,7 +164,7 @@
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
-        <if test="departureTime !=null and departureTime != ''">
+        <if test="departureTime !=null ">
             , t.departure_time= #{departureTime}
         </if>
         <if test="vName !=null and vName != ''">
@@ -179,7 +179,7 @@
         <if test="userId !=null and userId != ''">
             , t.user_id= #{userId}
         </if>
-        <if test="visitTime !=null and visitTime != ''">
+        <if test="visitTime !=null ">
             , t.visit_time= #{visitTime}
         </if>
         <if test="phoneNumber !=null and phoneNumber != ''">
@@ -206,7 +206,7 @@
         select count(1) count
         from s_visit_info t
         where 1 =1
-        <if test="departureTime !=null and departureTime != ''">
+        <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
         </if>
         <if test="vName !=null and vName != ''">
@@ -227,7 +227,7 @@
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
         </if>
-        <if test="visitTime !=null and visitTime != ''">
+        <if test="visitTime !=null ">
             and t.visit_time= #{visitTime}
         </if>
         <if test="phoneNumber !=null and phoneNumber != ''">