Merge branch 'master' of https://github.com/java110/MicroCommunity

CommunityService/src/main/java/com/java110/community/dao/impl/VisitServiceDaoImpl.java

@@ -10,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +34,7 @@ public class VisitServiceDaoImpl extends BaseServiceDao implements IVisitService
         businessVisitInfo.put("month", DateUtil.getCurrentMonth());
         // 查询business_user 数据是否已经存在
         logger.debug("保存访客信息信息 入参 businessVisitInfo : {}",businessVisitInfo);
+        businessVisitInfo.put("visitTime",new Date());
         int saveFlag = sqlSessionTemplate.insert("visitServiceDaoImpl.saveBusinessVisitInfo",businessVisitInfo);
 
         if(saveFlag < 1){

WebService/src/main/java/com/java110/web/smo/visit/impl/AddVisitSMOImpl.java

@@ -25,8 +25,8 @@ public class AddVisitSMOImpl extends AbstractComponentSMO implements IAddVisitSM
 
     @Override
     protected void validate(IPageData pd, JSONObject paramIn) {
-        System.out.println(paramIn);
-
+        System.out.println("paramIn  "+paramIn);
+        System.out.println("pd     "+pd);
         //super.validatePageInfo(pd);
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");

WebService/src/main/resources/components/visitInfoPackage/add-visit-case/addVisitCase.html

@@ -10,7 +10,8 @@
                         <div class="form-group row">
                             <label class="col-sm-2 col-form-label">访客拜访事由</label>
                             <div class="col-sm-10">
-                                <textarea v-model="addVisitCase.visitCase" type="text" placeholder="请填写访客拜访事由" rows="3" class="form-control"></textarea>
+                                <textarea v-model="addVisitCase.visitCase" type="text" placeholder="请填写访客拜访事由" rows="3"
+                                          class="form-control"></textarea>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/visitInfoPackage/add-visit/addVisit.js

@@ -26,7 +26,6 @@
             });
 
             vc.on('addVisit', 'onIndex', function(_index){
-                console.log("侦听到addVisit的index为  "+_index);
                 // vc.component.newVisitInfo.index = _index;
                 vc.emit('addVisitSpace', 'notify', _index);
             });

WebService/src/main/resources/components/visitInfoPackage/choose-owner/chooseOwner.js

@@ -13,7 +13,6 @@
         },
         _initEvent:function(){
             vc.on('searchOwner','openSearchOwnerModel',function(_param){
-                console.log("打开业主成员界面")
                 $('#searchOwnerModel').modal('show');
                 vc.component._refreshSearchOwnerData();
                 vc.component._loadAllOwnerInfo(1,10);

WebService/src/main/resources/components/visitInfoPackage/visit-for-owner/visitForOwner.js

@@ -27,7 +27,6 @@
         },
         _initEvent:function(){
             vc.on('visitForOwner','onIndex',function(_index){
-                console.log("侦听到visitForOwner的index为  "+_index);
                 vc.emit('addVisitSpace', 'notify', _index);
                 /*if(_index == 2){
                    vc.emit($props.callBackListener,$props.callBackFunction,vc.component.viewOwnerInfo);
@@ -36,7 +35,6 @@
 
             vc.on('visitForOwner','ownerInfo',function(_info){
                 vc.component.viewOwnerInfo=_info;
-                console.log(_info);
                 vc.emit('addVisitSpace','ownerId',vc.component.viewOwnerInfo.ownerId);
             });
 

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

@@ -22,7 +22,7 @@
                             <th>访客性别</th>
                             <th>来访事由</th>
                             <th>来访时间</th>
-                            <th>离开时间</th>
+                            <!--<th>离开时间</th>-->
 <!--                            <th class="text-right">操作</th>-->
 
 
@@ -36,7 +36,7 @@
                             <td>{{visit.visitGender=='0'?'男':'女'}}</td>
                             <td>{{visit.visitCase}}</td>
                             <td>{{visit.visitTime}}</td>
-                            <td>{{visit.departureTime}}</td>
+                            <!--<td>{{visit.departureTime}}</td>-->
 <!--                            <td>-->
 <!--&lt;!&ndash;                                <div class="btn-group">&ndash;&gt;-->
 <!--&lt;!&ndash;                                    <button class="btn-white btn btn-xs" v-on:click="_openEditVisitModel(visit)">修改</button>&ndash;&gt;-->