duckweed
2019-10-08 e0c9131696c8ba61037c36f8c85e5bb67d5d9d81
修复拜访时间显示问题
12个文件已修改
46 ■■■■ 已修改文件
CommunityService/src/main/java/com/java110/community/dao/impl/VisitServiceDaoImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/java/com/java110/web/smo/visit/impl/AddVisitSMOImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/visitInfoPackage/add-visit-case/addVisitCase.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/visitInfoPackage/add-visit-case/addVisitCase.js 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/visitInfoPackage/add-visit-space/addVisitSpace.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/visitInfoPackage/add-visit/addVisit.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/visitInfoPackage/choose-owner/chooseOwner.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/visitInfoPackage/view-visit-info/viewVisitInfo.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/visitInfoPackage/visit-for-owner/visitForOwner.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/visit/VisitServiceDaoImplMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CommunityService/src/main/java/com/java110/community/dao/impl/VisitServiceDaoImpl.java
@@ -10,6 +10,7 @@
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 @@
        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 @@
    @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-case/addVisitCase.js
@@ -6,22 +6,27 @@
    vc.extends({
        data:{
            addVisitCase:{
                visitCase:""
            }
        },
        watch:{
            addVisitCase(val){
                vc.emit('addVisitSpace', 'visitCase', this.addVisitCase.visitCase);
            }
            addVisitCase:{
                handler:function (val,oldval) {
                },
                deep:true,
            },
            'addVisitCase.visitCase':function (val,oldval) {
                vc.emit('addVisitSpace', 'visitCase',val);
            },
        },
        _initMethod:function(){
        },
        _initEvent:function(){
            vc.on('addVisitCase', 'onIndex', function(_index){
                console.log("侦听到addVisitCase的index为  "+_index);
                // vc.component.addCarInfo.index = _index;
                vc.emit('addVisitSpace', 'notify', _index);
            });
WebService/src/main/resources/components/visitInfoPackage/add-visit-space/addVisitSpace.js
@@ -17,7 +17,6 @@
        _initEvent:function(){
           vc.on("addVisitSpace", "notify", function(_info){
               console.log("侦听到index为 "+_info);
                vc.component.newVisitInfo.infos[vc.component.newVisitInfo.index] = _info;
            });
            vc.on("addVisitSpace", "ownerId", function(_ownerId){
@@ -84,9 +83,8 @@
                    communityId:vc.component.newVisitInfo.infos[0]['communityId'],
                    ownerId:vc.component.newVisitInfo.infos[0]['ownerId'],
                    visitCase:vc.component.newVisitInfo.infos[0]['visitCase'],
                    visitTime:new Date()
                    visitTime:new Date().toLocaleTimeString()
                }
                console.log(param);
               vc.http.post(
                   'addVisit',
                   'save',
WebService/src/main/resources/components/visitInfoPackage/add-visit/addVisit.js
@@ -24,7 +24,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/view-visit-info/viewVisitInfo.js
@@ -19,8 +19,6 @@
        },
        _initEvent:function(){
            vc.on('viewVisitInfo','addNewVisit',function(_app){
                console.log(_app);
                vc.copyObject(_app, vc.component.viewVisitInfo);
                vc.emit('addVisitSpace','notify',vc.component.viewVisitInfo);
            });
@@ -34,7 +32,6 @@
        methods:{
            _openSelectAppInfoModel(){
                alert("打开查询访客模态框");
                // vc.emit('chooseApp','openChooseAppModel',{});
            },
            _openAddVisitInfoModel(){
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;-->
WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.js
@@ -40,7 +40,6 @@
                    param,
                    function (json, res) {
                        var _visitManageInfo = JSON.parse(json);
                        console.log(_visitManageInfo);
                        for (var k in _visitManageInfo.visits){
                            _visitManageInfo.visits[k].visitTime=new Date(_visitManageInfo.visits[k].visitTime).format('yyyy-MM-dd');
                            _visitManageInfo.visits[k].departureTime=new Date(_visitManageInfo.visits[k].departureTime).format('yyyy-MM-dd');
java110-db/src/main/resources/mapper/visit/VisitServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
    <!-- 保存访客信息信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessVisitInfo" parameterType="Map">
        insert into business_visit_info(
        departure_time,v_name,visit_gender,owner_id,user_id,v_id,phone_number,operate,visit_case,community_id,b_id
        departure_time,v_name,visit_gender,owner_id,user_id,v_id,phone_number,operate,visit_case,community_id,b_id,visit_time
        ) values (
        #{departureTime},#{vName},#{visitGender},#{ownerId},#{userId},#{vId},#{phoneNumber},#{operate},#{visitCase},#{communityId},#{bId}
        #{departureTime},#{vName},#{visitGender},#{ownerId},#{userId},#{vId},#{phoneNumber},#{operate},#{visitCase},#{communityId},#{bId},#{visitTime}
        )
    </insert>